diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-06-13 16:46:42 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-06-13 16:46:42 +0000 |
| commit | b5141ea359b507cc7e4ec0bc841126ee778b8f81 (patch) | |
| tree | 608206f2507e13790e3cd14c85e1056e7a0a94ed /package | |
| parent | f3f5cfd4ee440de27319265513d202c159eb8a7a (diff) | |
| download | upstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.tar.gz upstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.tar.bz2 upstream-b5141ea359b507cc7e4ec0bc841126ee778b8f81.zip | |
Update to version 2.49 Fixes #5331 and #5286
SVN-Revision: 16436
Diffstat (limited to 'package')
| -rw-r--r-- | package/dnsmasq/Makefile | 6 | ||||
| -rw-r--r-- | package/dnsmasq/patches/101-ipv6.patch | 8 | ||||
| -rw-r--r-- | package/dnsmasq/patches/102-rtnetlink.patch | 14 | ||||
| -rw-r--r-- | package/dnsmasq/patches/103-ipv6_fix.patch | 8 |
4 files changed, 10 insertions, 26 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 1b030d1ad0..3444efefff 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.47 -PKG_RELEASE:=3 +PKG_VERSION:=2.49 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=4524081e56d0b935717d493e8e8d3e11 +PKG_MD5SUM:=7ccc861d8a733474f9c0a0a127006ee9 include $(INCLUDE_DIR)/package.mk diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index 682447c8d4..af4a81d683 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,8 +1,6 @@ -Index: dnsmasq-2.47/src/config.h -=================================================================== ---- dnsmasq-2.47.orig/src/config.h 2009-02-15 19:05:25.000000000 +0200 -+++ dnsmasq-2.47/src/config.h 2009-02-15 19:05:25.000000000 +0200 -@@ -282,8 +282,9 @@ +--- a/src/config.h ++++ b/src/config.h +@@ -257,8 +257,9 @@ NOTES: /* We assume that systems which don't have IPv6 headers don't have ntop and pton either */ diff --git a/package/dnsmasq/patches/102-rtnetlink.patch b/package/dnsmasq/patches/102-rtnetlink.patch deleted file mode 100644 index 932c7e66bf..0000000000 --- a/package/dnsmasq/patches/102-rtnetlink.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ur dnsmasq-2.47.orig/src/netlink.c dnsmasq-2.47/src/netlink.c ---- dnsmasq-2.47.orig/src/netlink.c 2009-02-15 19:05:25.000000000 +0200 -+++ dnsmasq-2.47/src/netlink.c 2008-02-15 19:05:25.000000000 +0200 -@@ -21,6 +21,10 @@ - #include <linux/types.h> - #include <linux/netlink.h> - #include <linux/rtnetlink.h> -+#ifndef IFA_RTA -+# include "linux/if_addr.h" -+# define IFA_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) -+#endif - - /* linux 2.6.19 buggers up the headers, patch it up here. */ - #ifndef IFA_RTA diff --git a/package/dnsmasq/patches/103-ipv6_fix.patch b/package/dnsmasq/patches/103-ipv6_fix.patch index 28a272f84b..33624521d3 100644 --- a/package/dnsmasq/patches/103-ipv6_fix.patch +++ b/package/dnsmasq/patches/103-ipv6_fix.patch @@ -1,6 +1,6 @@ --- a/src/netlink.c +++ b/src/netlink.c -@@ -116,6 +116,7 @@ +@@ -129,6 +129,7 @@ int iface_enumerate(void *parm, int (*ip ssize_t len; static unsigned int seq = 0; int family = AF_INET; @@ -8,7 +8,7 @@ struct { struct nlmsghdr nlh; -@@ -187,9 +188,12 @@ +@@ -207,9 +208,12 @@ int iface_enumerate(void *parm, int (*ip rta = RTA_NEXT(rta, len1); } @@ -22,7 +22,7 @@ } #ifdef HAVE_IPV6 else if (ifa->ifa_family == AF_INET6) -@@ -205,7 +209,7 @@ +@@ -225,7 +229,7 @@ int iface_enumerate(void *parm, int (*ip if (addrp && ipv6_callback) if (!((*ipv6_callback)(addrp, ifa->ifa_index, ifa->ifa_index, parm))) @@ -33,7 +33,7 @@ } --- a/src/network.c +++ b/src/network.c -@@ -278,7 +278,7 @@ +@@ -296,7 +296,7 @@ static int create_ipv6_listener(struct l bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 || listen(tcpfd, 5) == -1 || bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) |