diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index ecf71e7b59e5..d2877f9b74de 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -6,8 +6,7 @@ # PORTNAME= dnsmasq -DISTVERSION= 2.60 -PORTREVISION= 1 +DISTVERSION= 2.61 PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo index 1092d0a09183..d4e75d9fc935 100644 --- a/dns/dnsmasq/distinfo +++ b/dns/dnsmasq/distinfo @@ -1,2 +1,2 @@ -SHA256 (dnsmasq-2.60.tar.lzma) = aa5ada47e71a1fc83050d7e8569f03bc060c6a506ecc27a30832ef888e6d4c92 -SIZE (dnsmasq-2.60.tar.lzma) = 365513 +SHA256 (dnsmasq-2.61.tar.lzma) = c37fc14c3d0ee32d0418c125871665dd586cfe1a21f4b0307eb171bff41a2683 +SIZE (dnsmasq-2.61.tar.lzma) = 374461 diff --git a/dns/dnsmasq/files/patch-src__rfc2131.c b/dns/dnsmasq/files/patch-src__rfc2131.c deleted file mode 100644 index dd3174bfb035..000000000000 --- a/dns/dnsmasq/files/patch-src__rfc2131.c +++ /dev/null @@ -1,12 +0,0 @@ ---- ./src/rfc2131.c.orig 2012-03-04 21:04:22.000000000 +0100 -+++ ./src/rfc2131.c 2012-04-01 13:14:33.000000000 +0200 -@@ -2095,7 +2095,8 @@ - struct dhcp_netid_list *id_list; - - /* filter options based on tags, those we want get DHOPT_TAGOK bit set */ -- context->netid.next = NULL; -+ if (context) -+ context->netid.next = NULL; - tagif = option_filter(netid, context && context->netid.net ? &context->netid : NULL, config_opts); - - /* logging */