diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2004-03-06 22:57:23 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2004-03-06 22:57:23 +0000 |
| commit | 6b2ca0199e3a0e3330b3f71292706f878e58d401 (patch) | |
| tree | 8dc454a7d4fd8da1c2ce7f9d9f8eb9d9b27d67c3 | |
| parent | b228a0ca962b958700d9b5de4ca2f81004c0bd13 (diff) | |
| download | buildroot-novena-6b2ca0199e3a0e3330b3f71292706f878e58d401.tar.gz buildroot-novena-6b2ca0199e3a0e3330b3f71292706f878e58d401.zip | |
Missed a bugfix patch. Also, allow multiple patches.
| -rw-r--r-- | make/dnsmasq1.mk | 2 | ||||
| -rw-r--r-- | sources/dnsmasq1-100-bugfix.patch (renamed from sources/dnsmasq1.patch) | 13 |
2 files changed, 14 insertions, 1 deletions
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.patch b/sources/dnsmasq1-100-bugfix.patch index 0635ed30d..c676a1a39 100644 --- a/sources/dnsmasq1.patch +++ b/sources/dnsmasq1-100-bugfix.patch @@ -10,3 +10,16 @@ #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) |