svn commit: r442888 - in head/dns/dnsmasq: . files
Matthias Andree
mandree at FreeBSD.org
Wed Jun 7 20:00:43 UTC 2017
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 <chris at chrisn.me.uk>
+Date: Tue Jun 6 23:02:59 2017 +0100
+
+ Fix logic of appending ".<layer>" to PXE basename
+
+ Commit f77700aa, which fixes a compiler warning, also breaks the
+ behaviour of prepending ".<layer>" to basenames in --pxe-service: in
+ situations where the basename contains a ".", the ".<layer>" suffix is
+ erroneously added, and in situations where the basename doesn't contain
+ a ".", the ".<layer>" 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));
More information about the svn-ports-all
mailing list