From a4d8c8e5caa11cb5301bedeb4aa29c880f599a2c Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
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 0000000000..270c22740e
--- /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