summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorfhajny <fhajny>2013-05-28 09:32:00 +0000
committerfhajny <fhajny>2013-05-28 09:32:00 +0000
commit68fffd523ea4a8f8b61c53d8b2b0d44e4e72d7a9 (patch)
tree8635fcbebfb9d02983a81762a7eeeec00828377b /net
parentd04e8210d0a04e789b7228246cb97dfccfa563e2 (diff)
downloadpkgsrc-68fffd523ea4a8f8b61c53d8b2b0d44e4e72d7a9.tar.gz
Update dnsmasq to 2.66.
Changes in 2.66 - Add the ability to act as an authoritative DNS server - Add "constructed DHCP ranges" for DHCPv6 - Fix crash on startup on Solaris 11 - Add code to make behaviour for TCP DNS requests when a request arrives for an allowed address, but via a banned interface - Don't send the default DHCP option advertising dnsmasq as the local DNS server if dnsmasq is configured to not act as DNS server, or it's configured to a non-standard port. - Add DNSMASQ_CIRCUIT_ID, DNSMASQ_SUBCRIBER_ID, DNSMASQ_REMOTE_ID variables to the environment of the lease-change script - Fixed crash whilst handling DHCPv6 information-requests - Add --ipset option - Don't erroneously reject some option names in --dhcp-match options - Allow a trailing '*' wildcard in all interface-name configurations - Handle the situation where libc headers define SO_REUSEPORT, but the kernel in use doesn't - Update Polish translation - Fix crash if the configured DHCP lease limit is reached - Update the French translation Changes in 2.65: - Fix regression which broke forwarding of queries sent via TCP which are not for A and AAAA and which were directed to non-default servers - Fix failure to build with DHCP support excluded - Fix nasty regression in 2.64 which completely broke cacheing See full changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOG
Diffstat (limited to 'net')
-rw-r--r--net/dnsmasq/Makefile5
-rw-r--r--net/dnsmasq/distinfo9
-rw-r--r--net/dnsmasq/patches/patch-src_bpf.c27
3 files changed, 6 insertions, 35 deletions
diff --git a/net/dnsmasq/Makefile b/net/dnsmasq/Makefile
index 9aea249ba4e..ed5647752e9 100644
--- a/net/dnsmasq/Makefile
+++ b/net/dnsmasq/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2013/04/04 12:38:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2013/05/28 09:32:00 fhajny Exp $
#
-DISTNAME= dnsmasq-2.64
-PKGREVISION= 1
+DISTNAME= dnsmasq-2.66
CATEGORIES= net
MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/
LICENSE= gnu-gpl-v3
diff --git a/net/dnsmasq/distinfo b/net/dnsmasq/distinfo
index 89c05c8f289..65f1bbd755b 100644
--- a/net/dnsmasq/distinfo
+++ b/net/dnsmasq/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.18 2013/04/04 12:38:59 jperkin Exp $
+$NetBSD: distinfo,v 1.19 2013/05/28 09:32:00 fhajny Exp $
-SHA1 (dnsmasq-2.64.tar.gz) = 48368c2a4d75110d4b2d40d1ba6a821e7b3c1b0b
-RMD160 (dnsmasq-2.64.tar.gz) = 84e5464259f7c697aec3adc199f9af462ef63fb9
-Size (dnsmasq-2.64.tar.gz) = 536724 bytes
-SHA1 (patch-src_bpf.c) = 4342823f90ad848d5cfef07ea6d82165676c1d64
+SHA1 (dnsmasq-2.66.tar.gz) = fb6b1690de53014a8e6c8bfa6f1653062b965741
+RMD160 (dnsmasq-2.66.tar.gz) = fd5492852a933b54bb38f9e0c531c6c6e4325862
+Size (dnsmasq-2.66.tar.gz) = 574715 bytes
diff --git a/net/dnsmasq/patches/patch-src_bpf.c b/net/dnsmasq/patches/patch-src_bpf.c
deleted file mode 100644
index 4b7719e6acc..00000000000
--- a/net/dnsmasq/patches/patch-src_bpf.c
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-src_bpf.c,v 1.1 2013/04/04 12:38:59 jperkin Exp $
-
-Pull in upstream fixes for interface enumeration.
-
---- src/bpf.c.orig 2012-12-03 14:05:59.000000000 +0000
-+++ src/bpf.c
-@@ -111,7 +111,7 @@ int iface_enumerate(int family, void *pa
- {
- int iface_index = if_nametoindex(addrs->ifa_name);
-
-- if (iface_index == 0)
-+ if (iface_index == 0 || !addrs->ifa_addr || !addrs->ifa_netmask)
- continue;
-
- if (family == AF_INET)
-@@ -119,7 +119,10 @@ int iface_enumerate(int family, void *pa
- struct in_addr addr, netmask, broadcast;
- addr = ((struct sockaddr_in *) addrs->ifa_addr)->sin_addr;
- netmask = ((struct sockaddr_in *) addrs->ifa_netmask)->sin_addr;
-- broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr;
-+ if (addrs->ifa_broadaddr)
-+ broadcast = ((struct sockaddr_in *) addrs->ifa_broadaddr)->sin_addr;
-+ else
-+ broadcast.s_addr = 0;
- if (!((*callback)(addr, iface_index, netmask, broadcast, parm)))
- goto err;
- }