From owner-svn-ports-head@freebsd.org Wed Jun 7 20:00:43 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 469A1D7C67C; Wed, 7 Jun 2017 20:00:43 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F266581D13; Wed, 7 Jun 2017 20:00:42 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v57K0gdg067450; Wed, 7 Jun 2017 20:00:42 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v57K0g81067448; Wed, 7 Jun 2017 20:00:42 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201706072000.v57K0g81067448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 7 Jun 2017 20:00:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r442888 - in head/dns/dnsmasq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jun 2017 20:00:43 -0000 Author: mandree Date: Wed Jun 7 20:00:41 2017 New Revision: 442888 URL: https://svnweb.freebsd.org/changeset/ports/442888 Log: Fix up pxelogic.0 suffix logic. Regression in v2.77 caused by a patch proposed by yours truly. Reported by: Steven Shiau (via upstream dnsmasq-discuss mailing list) Obtained from: Chris Novakovich and Simon Kelley Pointyhat to: mandree@ Added: head/dns/dnsmasq/files/patch-src_rfc2131.c (contents, props changed) Modified: head/dns/dnsmasq/Makefile Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Wed Jun 7 19:57:08 2017 (r442887) +++ head/dns/dnsmasq/Makefile Wed Jun 7 20:00:41 2017 (r442888) @@ -3,7 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.77 -PORTREVISION= 0 # leave this in even if 0 to avoid PORTEPOCH bumps +PORTREVISION= 1 # leave this in even if 0 to avoid PORTEPOCH bumps PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ Added: head/dns/dnsmasq/files/patch-src_rfc2131.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsmasq/files/patch-src_rfc2131.c Wed Jun 7 20:00:41 2017 (r442888) @@ -0,0 +1,30 @@ +commit 2446514e716075cfe2be35e2a9b9de4eacdbac99 +Author: Chris Novakovic +Date: Tue Jun 6 23:02:59 2017 +0100 + + Fix logic of appending "." to PXE basename + + Commit f77700aa, which fixes a compiler warning, also breaks the + behaviour of prepending "." to basenames in --pxe-service: in + situations where the basename contains a ".", the "." suffix is + erroneously added, and in situations where the basename doesn't contain + a ".", the "." suffix is erroneously omitted. + + A patch against the git HEAD is attached that inverts this logic and + restores the expected behaviour of --pxe-service. + +--- src/rfc2131.c.orig 2017-05-22 21:58:46 UTC ++++ src/rfc2131.c +@@ -836,10 +836,10 @@ size_t dhcp_reply(struct dhcp_context *c + + if (strchr(service->basename, '.')) + snprintf((char *)mess->file, sizeof(mess->file), +- "%s.%d", service->basename, layer); ++ "%s", service->basename); + else + snprintf((char *)mess->file, sizeof(mess->file), +- "%s", service->basename); ++ "%s.%d", service->basename, layer); + + option_put(mess, end, OPTION_MESSAGE_TYPE, 1, DHCPACK); + option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr));