qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:55:55 +02:00
Code

[dnsmasq] Update to version 2.49

Browse Source 
Fixes #5331 and #5286


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16436 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke 2009-06-13 16:46:42 +00:00
parent 270465f3a0
commit 5b54b4b093
4 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/dnsmasq/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.47 PKG_VERSION:=2.49
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
PKG_MD5SUM:=4524081e56d0b935717d493e8e8d3e11 PKG_MD5SUM:=7ccc861d8a733474f9c0a0a127006ee9
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

8
package/dnsmasq/patches/101-ipv6.patch
View File

@ -1,8 +1,6 @@
Index: dnsmasq-2.47/src/config.h --- a/src/config.h
=================================================================== +++ b/src/config.h
--- dnsmasq-2.47.orig/src/config.h 2009-02-15 19:05:25.000000000 +0200 @@ -257,8 +257,9 @@ NOTES:
+++ dnsmasq-2.47/src/config.h 2009-02-15 19:05:25.000000000 +0200
@@ -282,8 +282,9 @@
/* We assume that systems which don't have IPv6 /* We assume that systems which don't have IPv6
headers don't have ntop and pton either */ headers don't have ntop and pton either */

14
package/dnsmasq/patches/102-rtnetlink.patch
View File

@ -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

8
package/dnsmasq/patches/103-ipv6_fix.patch
View File

@ -1,6 +1,6 @@
--- a/src/netlink.c --- a/src/netlink.c
+++ b/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; ssize_t len;
static unsigned int seq = 0; static unsigned int seq = 0;
int family = AF_INET; int family = AF_INET;
@ -8,7 +8,7 @@
struct { struct {
struct nlmsghdr nlh; struct nlmsghdr nlh;
@@ -187,9 +188,12 @@ @@ -207,9 +208,12 @@ int iface_enumerate(void *parm, int (*ip
rta = RTA_NEXT(rta, len1); rta = RTA_NEXT(rta, len1);
} }
@ -22,7 +22,7 @@
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
else if (ifa->ifa_family == AF_INET6) 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 (addrp && ipv6_callback)
if (!((*ipv6_callback)(addrp, ifa->ifa_index, ifa->ifa_index, parm))) if (!((*ipv6_callback)(addrp, ifa->ifa_index, ifa->ifa_index, parm)))
@ -33,7 +33,7 @@
} }
--- a/src/network.c --- a/src/network.c
+++ b/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 || bind(tcpfd, (struct sockaddr *)&addr, sa_len(&addr)) == -1 ||
listen(tcpfd, 5) == -1 || listen(tcpfd, 5) == -1 ||
bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1) bind(fd, (struct sockaddr *)&addr, sa_len(&addr)) == -1)