[arch-commits] Commit in dnsmasq/trunk (2 files)

[Dave Reisner]

    Date: Sunday, July 7, 2013 @ 21:07:29
  Author: dreisner
Revision: 189771

upgpkg: dnsmasq 2.66-2

backport fix for start failure as radvd replacement without dhcpv6 enabled

Added:
  dnsmasq/trunk/0001-Fix-failure-to-start-with-ENOTSOCK.patch
Modified:
  dnsmasq/trunk/PKGBUILD

-----------------------------------------------+
 0001-Fix-failure-to-start-with-ENOTSOCK.patch |   26 ++++++++++++++++++++++++
 PKGBUILD                                      |    5 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)

Added: 0001-Fix-failure-to-start-with-ENOTSOCK.patch
===================================================================
--- 0001-Fix-failure-to-start-with-ENOTSOCK.patch	                        (rev 0)
+++ 0001-Fix-failure-to-start-with-ENOTSOCK.patch	2013-07-07 19:07:29 UTC (rev 189771)
@@ -0,0 +1,26 @@
+From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon at thekelleys.org.uk>
+Date: Fri, 17 May 2013 11:32:03 +0100
+Subject: [PATCH] Fix failure to start with ENOTSOCK
+
+---
+ CHANGELOG     | 6 ++++++
+ src/dnsmasq.c | 2 +-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/dnsmasq.c b/src/dnsmasq.c
+index 43b8cb1..b0f984d 100644
+--- a/src/dnsmasq.c
++++ b/src/dnsmasq.c
+@@ -248,7 +248,7 @@ int main (int argc, char **argv)
+ #endif
+ 
+ #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6)
+-      if (daemon->dhcp6)
++      if (daemon->doing_dhcp6)
+ 	bindtodevice(daemon->dhcp6fd);
+ #endif
+     }
+-- 
+1.8.3.2
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-07 17:49:46 UTC (rev 189770)
+++ PKGBUILD	2013-07-07 19:07:29 UTC (rev 189771)
@@ -5,7 +5,7 @@
 
 pkgname=dnsmasq
 pkgver=2.66
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
 arch=('i686' 'x86_64')
@@ -15,15 +15,18 @@
 backup=('etc/dnsmasq.conf')
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
         '0001-Fix-wrong-size-in-memset-call.patch'
+        '0001-Fix-failure-to-start-with-ENOTSOCK.patch'
         'dnsmasq.service')
 md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
          '05ccefefde68ebdebce5e40d2b3c78be'
+         '98cc950a6b0482eb7e61969dafb4f764'
          '7ac45726cabef4145db40d758cc7fedf')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
   patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
+  patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch"
 }
 
 build() {