diff options
| author | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-18 15:32:42 +0000 |
|---|---|---|
| committer | cyrus <cyrus@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-07-18 15:32:42 +0000 |
| commit | 642c45260c1fcb8752fe6a27955598e238cb3a56 (patch) | |
| tree | 603339041a6526f4b31153ed7c96ece17496e9fd /package/dnsmasq/patches | |
| parent | c0768b17cb826df7372947fc937b9ff9457f33a9 (diff) | |
Updated Dnsmasq to 2.43
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11862 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dnsmasq/patches')
| -rw-r--r-- | package/dnsmasq/patches/101-ipv6.patch | 9 | ||||
| -rw-r--r-- | package/dnsmasq/patches/200-backports.patch | 30 |
2 files changed, 5 insertions, 34 deletions
diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch index e11c98008..2f973461a 100644 --- a/package/dnsmasq/patches/101-ipv6.patch +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -1,7 +1,8 @@ -diff -ur dnsmasq-2.42.orig/src/config.h dnsmasq-2.42/src/config.h ---- dnsmasq-2.42.orig/src/config.h 2008-06-03 16:38:25.000000000 +0200 -+++ dnsmasq-2.42/src/config.h 2008-06-03 16:38:43.000000000 +0200 -@@ -322,8 +322,9 @@ +Index: dnsmasq-2.43/src/config.h +=================================================================== +--- dnsmasq-2.43.orig/src/config.h 2008-07-18 16:36:53.000000000 +0200 ++++ dnsmasq-2.43/src/config.h 2008-07-18 16:37:40.000000000 +0200 +@@ -288,8 +288,9 @@ /* We assume that systems which don't have IPv6 headers don't have ntop and pton either */ diff --git a/package/dnsmasq/patches/200-backports.patch b/package/dnsmasq/patches/200-backports.patch deleted file mode 100644 index 19c52d939..000000000 --- a/package/dnsmasq/patches/200-backports.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: dnsmasq-2.42/src/dnsmasq.c -=================================================================== ---- dnsmasq-2.42.orig/src/dnsmasq.c 2008-06-28 23:37:18.000000000 +0200 -+++ dnsmasq-2.42/src/dnsmasq.c 2008-06-28 23:37:20.000000000 +0200 -@@ -297,8 +297,11 @@ - capget(hdr, NULL); - if (hdr->version != LINUX_CAPABILITY_VERSION_1) - { -- /* if not version 1, use version 2 */ -- hdr->version = LINUX_CAPABILITY_VERSION_2; -+ /* if unknown version, use largest supported version (3) -+ * backported fix from 2.43 to suppress kernel warning -+ */ -+ if (hdr->version != LINUX_CAPABILITY_VERSION_2) -+ hdr->version = LINUX_CAPABILITY_VERSION_3; - capsize = 2; - } - hdr->pid = 0; /* this process */ -Index: dnsmasq-2.42/src/dnsmasq.h -=================================================================== ---- dnsmasq-2.42.orig/src/dnsmasq.h 2008-06-28 23:37:48.000000000 +0200 -+++ dnsmasq-2.42/src/dnsmasq.h 2008-06-28 23:37:55.000000000 +0200 -@@ -100,6 +100,7 @@ - extern int capget(cap_user_header_t header, cap_user_data_t data); - #define LINUX_CAPABILITY_VERSION_1 0x19980330 - #define LINUX_CAPABILITY_VERSION_2 0x20071026 -+#define LINUX_CAPABILITY_VERSION_3 0x20080522 - - #include <sys/prctl.h> - #elif defined(HAVE_SOLARIS_PRIVS) |