aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2008-06-28 21:42:54 +0000
committerJohn Crispin <john@openwrt.org>2008-06-28 21:42:54 +0000
commit7174ef488e8a4e2ad9b6d322f0dfaad98ba92c93 (patch)
tree4d8cef4b18e5e6a3ea5f7671e08434c76a3cefa4
parent537b6126ec25876cc937dcabc2f1fbfbbb9ce451 (diff)
downloadupstream-7174ef488e8a4e2ad9b6d322f0dfaad98ba92c93.tar.gz
upstream-7174ef488e8a4e2ad9b6d322f0dfaad98ba92c93.tar.bz2
upstream-7174ef488e8a4e2ad9b6d322f0dfaad98ba92c93.zip
backport a fix to suppress warning when loading dnsmasq on >=2.6.25.7. this patch can be removed when dnsmasq 2.43 is released
SVN-Revision: 11604
-rw-r--r--package/dnsmasq/patches/200-backports.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/package/dnsmasq/patches/200-backports.patch b/package/dnsmasq/patches/200-backports.patch
new file mode 100644
index 0000000000..19c52d9395
--- /dev/null
+++ b/package/dnsmasq/patches/200-backports.patch
@@ -0,0 +1,30 @@
+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)