diff options
| -rw-r--r-- | dns/dnsmasq-devel/Makefile | 8 | ||||
| -rw-r--r-- | dns/dnsmasq-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/dnsmasq-devel/files/patch-src_edns0.c | 11 | ||||
| -rw-r--r-- | dns/dnsmasq-devel/files/patch-src_forward.c | 20 |
4 files changed, 38 insertions, 7 deletions
diff --git a/dns/dnsmasq-devel/Makefile b/dns/dnsmasq-devel/Makefile index f048accc1c9d..16b560893bfe 100644 --- a/dns/dnsmasq-devel/Makefile +++ b/dns/dnsmasq-devel/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.77test5 -PORTEPOCH= 1 +DISTVERSION= 2.77rc4 +PORTEPOCH= 2 CATEGORIES= dns ipv6 -#MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ -MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/test-releases/ +MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/release-candidates/ +#MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/test-releases/ PKGNAMESUFFIX= -devel MAINTAINER= mandree@FreeBSD.org diff --git a/dns/dnsmasq-devel/distinfo b/dns/dnsmasq-devel/distinfo index a2807e341854..f9bb4196c548 100644 --- a/dns/dnsmasq-devel/distinfo +++ b/dns/dnsmasq-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1493933562 -SHA256 (dnsmasq-2.77test5.tar.xz) = 5d57d575944769f4c6142ac3d6e81c3e60f20f6817d52f18df8056b6e0a9112d -SIZE (dnsmasq-2.77test5.tar.xz) = 502964 +TIMESTAMP = 1495362006 +SHA256 (dnsmasq-2.77rc4.tar.xz) = e357de7faa5fb34098635b7f6000a16cc7aa703a9c41de9d392b4ef594eb1abb +SIZE (dnsmasq-2.77rc4.tar.xz) = 503480 diff --git a/dns/dnsmasq-devel/files/patch-src_edns0.c b/dns/dnsmasq-devel/files/patch-src_edns0.c new file mode 100644 index 000000000000..aba513dacc61 --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-src_edns0.c @@ -0,0 +1,11 @@ +--- src/edns0.c.orig 2017-05-12 14:16:02 UTC ++++ src/edns0.c +@@ -304,7 +304,7 @@ static size_t calc_subnet_opt(struct sub + /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */ + + int len; +- void *addrp; ++ void *addrp = NULL; + int sa_family = source->sa.sa_family; + + opt->source_netmask = 0; diff --git a/dns/dnsmasq-devel/files/patch-src_forward.c b/dns/dnsmasq-devel/files/patch-src_forward.c new file mode 100644 index 000000000000..07d050da8de9 --- /dev/null +++ b/dns/dnsmasq-devel/files/patch-src_forward.c @@ -0,0 +1,20 @@ +--- src/forward.c.orig 2017-05-12 14:16:02 UTC ++++ src/forward.c +@@ -899,7 +899,7 @@ void reply_query(int fd, int family, tim + status = dnssec_validate_ds(now, header, n, daemon->namebuff, daemon->keyname, forward->class); + else + status = dnssec_validate_reply(now, header, n, daemon->namebuff, daemon->keyname, &forward->class, +- option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags && SERV_DO_DNSSEC), NULL, NULL); ++ option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags & SERV_DO_DNSSEC), NULL, NULL); + } + + /* Can't validate, as we're missing key data. Put this +@@ -1477,7 +1477,7 @@ static int tcp_key_recurse(time_t now, i + new_status = dnssec_validate_ds(now, header, n, name, keyname, class); + else + new_status = dnssec_validate_reply(now, header, n, name, keyname, &class, +- option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags && SERV_DO_DNSSEC), NULL, NULL); ++ option_bool(OPT_DNSSEC_NO_SIGN) && (server->flags & SERV_DO_DNSSEC), NULL, NULL); + + if (new_status != STAT_NEED_DS && new_status != STAT_NEED_KEY) + break; |