diff options
| author | Markus Wigge <mwigge@marcant.net> | 2009-11-26 10:58:01 +0000 |
|---|---|---|
| committer | Markus Wigge <mwigge@marcant.net> | 2009-11-26 10:58:01 +0000 |
| commit | c05ba34ba7526bc90c7db606f93093a1689bcae0 (patch) | |
| tree | a3028a10da5bc0a289b4ff796f5016720e57756c | |
| parent | 4bfa2947eeca220e3cff41dbad9fbaea25245ed0 (diff) | |
| download | upstream-c05ba34ba7526bc90c7db606f93093a1689bcae0.tar.gz upstream-c05ba34ba7526bc90c7db606f93093a1689bcae0.tar.bz2 upstream-c05ba34ba7526bc90c7db606f93093a1689bcae0.zip | |
new upstream release 2.51 with some fixes, see http://www.thekelleys.org.uk/dnsmasq/CHANGELOG refreshed patches for new release
SVN-Revision: 18541
| -rw-r--r-- | package/dnsmasq/Makefile | 6 | ||||
| -rw-r--r-- | package/dnsmasq/patches/101-ipv6.patch | 8 | ||||
| -rw-r--r-- | package/dnsmasq/patches/103-ipv6_fix.patch | 14 |
3 files changed, 17 insertions, 11 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index f2f0c9677c..27f438c738 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.50 -PKG_RELEASE:=3 +PKG_VERSION:=2.51 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=f7b1e17c590e493039537434c57c9de7 +PKG_MD5SUM:=97465261a6de5258a3c3edfe51ca16a4 include $(INCLUDE_DIR)/package.mk diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index af4a81d683..945ddbba19 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,6 +1,8 @@ ---- a/src/config.h -+++ b/src/config.h -@@ -257,8 +257,9 @@ NOTES: +Index: dnsmasq-2.51/src/config.h +=================================================================== +--- dnsmasq-2.51.orig/src/config.h ++++ dnsmasq-2.51/src/config.h +@@ -270,8 +270,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/103-ipv6_fix.patch b/package/dnsmasq/patches/103-ipv6_fix.patch index 33624521d3..8269b79f01 100644 --- a/package/dnsmasq/patches/103-ipv6_fix.patch +++ b/package/dnsmasq/patches/103-ipv6_fix.patch @@ -1,5 +1,7 @@ ---- a/src/netlink.c -+++ b/src/netlink.c +Index: dnsmasq-2.51/src/netlink.c +=================================================================== +--- dnsmasq-2.51.orig/src/netlink.c ++++ dnsmasq-2.51/src/netlink.c @@ -129,6 +129,7 @@ int iface_enumerate(void *parm, int (*ip ssize_t len; static unsigned int seq = 0; @@ -31,9 +33,11 @@ } #endif } ---- a/src/network.c -+++ b/src/network.c -@@ -296,7 +296,7 @@ static int create_ipv6_listener(struct l +Index: dnsmasq-2.51/src/network.c +=================================================================== +--- dnsmasq-2.51.orig/src/network.c ++++ dnsmasq-2.51/src/network.c +@@ -302,7 +302,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) |