diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2017-10-04 13:56:25 -0300 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2017-10-04 13:56:25 -0300 |
| commit | ffdd2fc033d00eac5754ba21a212d2dd4fa04afe (patch) | |
| tree | 20e65e5a94b8189a49a415291d0d23339cc34d66 | |
| parent | 813846518bb409f778cbbbccae87240a3414e6d4 (diff) | |
| download | FreeBSD-ports-ffdd2fc033d00eac5754ba21a212d2dd4fa04afe.zip FreeBSD-ports-ffdd2fc033d00eac5754ba21a212d2dd4fa04afe.tar.gz | |
Revert "Revert "dns/dnsmasq: Security update to 2.78""
This reverts commit b47db602760b16392f7cbe55f568c1ee1e9cdfc9.
| -rw-r--r-- | dns/dnsmasq/Makefile | 4 | ||||
| -rw-r--r-- | dns/dnsmasq/distinfo | 6 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-src_rfc2131.c | 30 |
3 files changed, 5 insertions, 35 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index d67fc6e..703f1ba 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.77 -PORTREVISION= 1 # leave this in even if 0 to avoid PORTEPOCH bumps +DISTVERSION= 2.78 +PORTREVISION= 0 # leave this in even if 0 to avoid PORTEPOCH bumps PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo index c6427e8..5c4fa7f 100644 --- a/dns/dnsmasq/distinfo +++ b/dns/dnsmasq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1496338430 -SHA256 (dnsmasq-2.77.tar.xz) = 6eac3b1c50ae25170e3ff8c96ddb55236cf45007633fdb8a35b1f3e02f5f8b8a -SIZE (dnsmasq-2.77.tar.xz) = 487244 +TIMESTAMP = 1506953238 +SHA256 (dnsmasq-2.78.tar.xz) = 89949f438c74b0c7543f06689c319484bd126cc4b1f8c745c742ab397681252b +SIZE (dnsmasq-2.78.tar.xz) = 489172 diff --git a/dns/dnsmasq/files/patch-src_rfc2131.c b/dns/dnsmasq/files/patch-src_rfc2131.c deleted file mode 100644 index 2e4ab8d..0000000 --- a/dns/dnsmasq/files/patch-src_rfc2131.c +++ /dev/null @@ -1,30 +0,0 @@ -commit 2446514e716075cfe2be35e2a9b9de4eacdbac99 -Author: Chris Novakovic <chris@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)); |
