From a4d8c8e5caa11cb5301bedeb4aa29c880f599a2c Mon Sep 17 00:00:00 2001 From: mbm Date: Sun, 6 Mar 2005 03:53:29 +0000 Subject: bring up to date with nbd's br2_test20.tar.bz2 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@308 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/patches/100-config.patch | 49 ++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/dnsmasq/patches/100-config.patch (limited to 'package/dnsmasq/patches') diff --git a/package/dnsmasq/patches/100-config.patch b/package/dnsmasq/patches/100-config.patch new file mode 100644 index 000000000..270c22740 --- /dev/null +++ b/package/dnsmasq/patches/100-config.patch @@ -0,0 +1,49 @@ +diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h +--- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400 ++++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400 +@@ -78,6 +78,11 @@ + /* We assume that systems which don't have IPv6 + headers don't have ntop and pton either */ + ++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) ++# undef NO_IPV6 ++# define NO_IPV6 ++#endif ++ + #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) + # define HAVE_IPV6 + # define ADDRSTRLEN INET6_ADDRSTRLEN +@@ -194,7 +199,7 @@ + /* platform dependent options. */ + + /* Must preceed __linux__ since uClinux defines __linux__ too. */ +-#if defined(__uClinux__) || defined(__UCLIBC__) ++#if defined(__uClinux__) + #undef HAVE_LINUX_IPV6_PROC + #define HAVE_GETOPT_LONG + #undef HAVE_ARC4RANDOM +@@ -208,6 +213,24 @@ + # define NO_FORK + #endif + ++#elif defined(__linux__) && defined(__UCLIBC__) ++# define HAVE_LINUX_IPV6_PROC ++# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \ ++ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21)) ++# define HAVE_GETOPT_LONG ++# else ++# undef HAVE_GETOPT_LONG ++# endif ++#undef HAVE_ARC4RANDOM ++#define HAVE_RANDOM ++#define HAVE_DEV_URANDOM ++#define HAVE_DEV_RANDOM ++#undef HAVE_SOCKADDR_SA_LEN ++#undef HAVE_PSELECT ++#if !defined(__ARCH_HAS_MMU__) ++# define NO_FORK ++#endif ++ + /* libc5 - must precede __linux__ too */ + /* Note to build a libc5 binary on a modern Debian system: + install the packages altgcc libc5 and libc5-altdev -- cgit v1.2.3 From d832dd559e5acc8464b8b80b6bc36c63f0bc9e65 Mon Sep 17 00:00:00 2001 From: nbd Date: Tue, 5 Apr 2005 00:09:10 +0000 Subject: fix ipv6 support in dnsmasq git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@563 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/patches/101-ipv6.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 package/dnsmasq/patches/101-ipv6.patch (limited to 'package/dnsmasq/patches') diff --git a/package/dnsmasq/patches/101-ipv6.patch b/package/dnsmasq/patches/101-ipv6.patch new file mode 100644 index 000000000..5cbf78174 --- /dev/null +++ b/package/dnsmasq/patches/101-ipv6.patch @@ -0,0 +1,13 @@ +--- dnsmasq-2.15.orig/src/config.h 2004-09-20 15:47:57.000000000 +0200 ++++ dnsmasq-2.15/src/config.h 2004-09-20 23:21:10.000000000 +0200 +@@ -78,8 +78,9 @@ + /* We assume that systems which don't have IPv6 + headers don't have ntop and pton either */ + +-#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) ++#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6) + # define HAVE_IPV6 ++# define IPV6_V6ONLY 26 + # define ADDRSTRLEN INET6_ADDRSTRLEN + # if defined(SOL_IPV6) + # define IPV6_LEVEL SOL_IPV6 -- cgit v1.2.3 From c80e7a81f74b2b8554da699c3bd9011d503e720f Mon Sep 17 00:00:00 2001 From: kaloz Date: Sun, 15 Jan 2006 00:02:47 +0000 Subject: upgrade to dnsmasq 2.25 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2986 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/patches/100-config.patch | 49 -------------------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/dnsmasq/patches/100-config.patch (limited to 'package/dnsmasq/patches') diff --git a/package/dnsmasq/patches/100-config.patch b/package/dnsmasq/patches/100-config.patch deleted file mode 100644 index 270c22740..000000000 --- a/package/dnsmasq/patches/100-config.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -ur dnsmasq-2.15.orig/src/config.h dnsmasq-2.15/src/config.h ---- dnsmasq-2.15.orig/src/config.h 2004-10-08 11:41:34.757371880 -0400 -+++ dnsmasq-2.15/src/config.h 2004-10-08 11:43:49.074952504 -0400 -@@ -78,6 +78,11 @@ - /* We assume that systems which don't have IPv6 - headers don't have ntop and pton either */ - -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) -+# undef NO_IPV6 -+# define NO_IPV6 -+#endif -+ - #if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6) - # define HAVE_IPV6 - # define ADDRSTRLEN INET6_ADDRSTRLEN -@@ -194,7 +199,7 @@ - /* platform dependent options. */ - - /* Must preceed __linux__ since uClinux defines __linux__ too. */ --#if defined(__uClinux__) || defined(__UCLIBC__) -+#if defined(__uClinux__) - #undef HAVE_LINUX_IPV6_PROC - #define HAVE_GETOPT_LONG - #undef HAVE_ARC4RANDOM -@@ -208,6 +213,24 @@ - # define NO_FORK - #endif - -+#elif defined(__linux__) && defined(__UCLIBC__) -+# define HAVE_LINUX_IPV6_PROC -+# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \ -+ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21)) -+# define HAVE_GETOPT_LONG -+# else -+# undef HAVE_GETOPT_LONG -+# endif -+#undef HAVE_ARC4RANDOM -+#define HAVE_RANDOM -+#define HAVE_DEV_URANDOM -+#define HAVE_DEV_RANDOM -+#undef HAVE_SOCKADDR_SA_LEN -+#undef HAVE_PSELECT -+#if !defined(__ARCH_HAS_MMU__) -+# define NO_FORK -+#endif -+ - /* libc5 - must precede __linux__ too */ - /* Note to build a libc5 binary on a modern Debian system: - install the packages altgcc libc5 and libc5-altdev -- cgit v1.2.3 From c3001723cbd07c232d514eec233336a1978ce159 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 5 Feb 2006 03:59:55 +0000 Subject: fix static domain wildcards in dnsmasq (broken by upgrade to 2.26) git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3135 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/patches/102-domain_wildcard_fix.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 package/dnsmasq/patches/102-domain_wildcard_fix.patch (limited to 'package/dnsmasq/patches') diff --git a/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/package/dnsmasq/patches/102-domain_wildcard_fix.patch new file mode 100644 index 000000000..041cd67cf --- /dev/null +++ b/package/dnsmasq/patches/102-domain_wildcard_fix.patch @@ -0,0 +1,12 @@ +diff -urN dnsmasq.old/src/forward.c dnsmasq.dev/src/forward.c +--- dnsmasq.old/src/forward.c 2006-01-16 20:34:04.000000000 +0100 ++++ dnsmasq.dev/src/forward.c 2006-02-05 04:41:37.148190000 +0100 +@@ -164,7 +164,7 @@ + if (namelen >= domainlen && + hostname_isequal(matchstart, serv->domain) && + domainlen >= matchlen && +- (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' )) ++ (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' || domainlen == 0)) + { + unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; + *type = SERV_HAS_DOMAIN; -- cgit v1.2.3 From 0bcdd9dc8f86293cb81b4f69a0f3b75fd95ccdb1 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 16 Mar 2006 21:31:14 +0000 Subject: Updated to latest upstream version, remove uneeded patch as it is now in dnsmasq source code, closes #378 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3386 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/dnsmasq/patches/102-domain_wildcard_fix.patch | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 package/dnsmasq/patches/102-domain_wildcard_fix.patch (limited to 'package/dnsmasq/patches') diff --git a/package/dnsmasq/patches/102-domain_wildcard_fix.patch b/package/dnsmasq/patches/102-domain_wildcard_fix.patch deleted file mode 100644 index 041cd67cf..000000000 --- a/package/dnsmasq/patches/102-domain_wildcard_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN dnsmasq.old/src/forward.c dnsmasq.dev/src/forward.c ---- dnsmasq.old/src/forward.c 2006-01-16 20:34:04.000000000 +0100 -+++ dnsmasq.dev/src/forward.c 2006-02-05 04:41:37.148190000 +0100 -@@ -164,7 +164,7 @@ - if (namelen >= domainlen && - hostname_isequal(matchstart, serv->domain) && - domainlen >= matchlen && -- (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' )) -+ (namelen == domainlen || *(serv->domain) == '.' || *(matchstart-1) == '.' || domainlen == 0)) - { - unsigned short sflag = serv->addr.sa.sa_family == AF_INET ? F_IPV4 : F_IPV6; - *type = SERV_HAS_DOMAIN; -- cgit v1.2.3