From 6b2ca0199e3a0e3330b3f71292706f878e58d401 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Sat, 6 Mar 2004 22:57:23 +0000
Subject: Missed a bugfix patch.  Also, allow multiple patches.

---
 make/dnsmasq1.mk                  |  2 +-
 sources/dnsmasq1-100-bugfix.patch | 25 +++++++++++++++++++++++++
 sources/dnsmasq1.patch            | 12 ------------
 3 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 sources/dnsmasq1-100-bugfix.patch
 delete mode 100644 sources/dnsmasq1.patch

diff --git a/make/dnsmasq1.mk b/make/dnsmasq1.mk
index 1da42d4bf..b6160b1a6 100644
--- a/make/dnsmasq1.mk
+++ b/make/dnsmasq1.mk
@@ -15,7 +15,7 @@ $(DL_DIR)/$(DNSMASQ1_SOURCE):
 
 $(DNSMASQ1_DIR)/.source: $(DL_DIR)/$(DNSMASQ1_SOURCE)
 	zcat $(DL_DIR)/$(DNSMASQ1_SOURCE) | tar -C $(BUILD_DIR) -xvf -
-	patch -p1 -d $(DNSMASQ1_DIR) < $(SOURCE_DIR)/dnsmasq1.patch 
+	$(SOURCE_DIR)/patch-kernel.sh $(DNSMASQ1_DIR) $(SOURCE_DIR) dnsmasq1-*.patch
 	touch $(DNSMASQ1_DIR)/.source
 
 $(DNSMASQ1_DIR)/$(DNSMASQ1_BINARY): $(DNSMASQ1_DIR)/.source
diff --git a/sources/dnsmasq1-100-bugfix.patch b/sources/dnsmasq1-100-bugfix.patch
new file mode 100644
index 000000000..c676a1a39
--- /dev/null
+++ b/sources/dnsmasq1-100-bugfix.patch
@@ -0,0 +1,25 @@
+--- dnsmasq-1.18/config.h.dist	2004-03-01 22:25:12.000000000 -0600
++++ dnsmasq-1.18/config.h	2004-03-01 22:26:50.000000000 -0600
+@@ -126,7 +126,9 @@
+ 
+ /* Must preceed __linux__ since uClinux defines __linux__ too. */
+ #if defined(__uClinux__) || defined(__UCLIBC__)
++#ifndef __UCLIBC_HAS_IPV6__
+ #undef HAVE_LINUX_IPV6_PROC
++#endif
+ #define HAVE_GETOPT_LONG
+ #undef HAVE_ARC4RANDOM
+ #define HAVE_RANDOM
+diff -x CVS -urN dnsmasq-1.18/option.c dnsmasq.old/option.c
+--- dnsmasq-1.18/option.c	2003-11-05 08:22:18.000000000 -0600
++++ dnsmasq.old/option.c	2004-01-05 23:40:11.000000000 -0600
+@@ -578,8 +578,8 @@
+ #ifdef HAVE_IPV6
+ 	    else if (tmp->source_addr.sa.sa_family == AF_INET6)
+ 	      tmp->source_addr.in6.sin6_port = htons(*query_port);
+-	  }
+ #endif  
++	  }
+     }
+   
+   if (*if_addrs)
diff --git a/sources/dnsmasq1.patch b/sources/dnsmasq1.patch
deleted file mode 100644
index 0635ed30d..000000000
--- a/sources/dnsmasq1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- dnsmasq-1.18/config.h.dist	2004-03-01 22:25:12.000000000 -0600
-+++ dnsmasq-1.18/config.h	2004-03-01 22:26:50.000000000 -0600
-@@ -126,7 +126,9 @@
- 
- /* Must preceed __linux__ since uClinux defines __linux__ too. */
- #if defined(__uClinux__) || defined(__UCLIBC__)
-+#ifndef __UCLIBC_HAS_IPV6__
- #undef HAVE_LINUX_IPV6_PROC
-+#endif
- #define HAVE_GETOPT_LONG
- #undef HAVE_ARC4RANDOM
- #define HAVE_RANDOM
-- 
cgit v1.2.3