[PATCH] dnsmasq 2.75: latest patch

[Matthias Fischer <matthias.fischer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2951 bytes --]

One (small) latecoming arp-patch, don't know if this is important,
maybe "just for the records"...

Download:
http://people.ipfire.org/~mfischer/dnsmasq_275_2016_01_15
MD5: a47e090fe132c155f2d041ab4272c52b

This is the compiled binary, nothing more is needed.

Copy to '/usr/sbin'
Stop 'dnsmasq' (/etc/init.d/dnsmasq stop)
Rename (don't forget backing up the *old* version!)
Start 'dnsmasq' (/etc/init.d/dnsmasq start).

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
 lfs/dnsmasq                                 |  1 +
 src/patches/dnsmasq/049-arp_c_tidy_up.patch | 34 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 src/patches/dnsmasq/049-arp_c_tidy_up.patch

diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index 0affcf5..bdfb1f8 100644
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -121,6 +121,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/046-DNSSEC_Handle_non-root_trust_anchors_and_check_we_have_a_root-trust_anchor.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/047-Fix_bad_cache-size_calculation_when_hosts-file_read_fails.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/048-Disable_DNSSEC_for_server_domain_servers_unless_trust-anchor_provided.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/049-arp_c_tidy_up.patch
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
 
 	cd $(DIR_APP) && sed -i src/config.h \
diff --git a/src/patches/dnsmasq/049-arp_c_tidy_up.patch b/src/patches/dnsmasq/049-arp_c_tidy_up.patch
new file mode 100644
index 0000000..2847eec
--- /dev/null
+++ b/src/patches/dnsmasq/049-arp_c_tidy_up.patch
@@ -0,0 +1,34 @@
+From bb58f63ce598763231fbf320bace1dbd777afd37 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon(a)thekelleys.org.uk>
+Date: Thu, 14 Jan 2016 19:23:10 +0000
+Subject: [PATCH] arp.c tidy up.
+
+---
+ src/arp.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/arp.c b/src/arp.c
+index 73a0250..968455c 100644
+--- a/src/arp.c
++++ b/src/arp.c
+@@ -132,7 +132,7 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now)
+ 	  }
+ #endif
+ 	
+-	/* Only accept poitive entries unless in lazy mode. */
++	/* Only accept positive entries unless in lazy mode. */
+ 	if (arp->status != ARP_EMPTY || lazy || updated)
+ 	  {
+ 	    if (mac && arp->hwlen != 0)
+@@ -148,7 +148,7 @@ int find_mac(union mysockaddr *addr, unsigned char *mac, int lazy, time_t now)
+        last = now;
+ 
+        /* Mark all non-negative entries */
+-       for (arp = arps, up = &arps; arp; arp = arp->next)
++       for (arp = arps; arp; arp = arp->next)
+ 	 if (arp->status != ARP_EMPTY)
+ 	   arp->status = ARP_MARK;
+        
+-- 
+1.7.10.4
+
-- 
2.7.0