diff options
| author | root <root@rshg054.dnsready.net> | 2013-07-08 01:44:08 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-07-08 01:44:08 -0700 |
| commit | 5e27fc01b0a9107d2242c70f79f9bd75a5e42c28 (patch) | |
| tree | 1ac015028d71f02af5d30a805bba810ce7fb26da /extra/dnsmasq | |
| parent | 455d703ab39bf20f269631adbc2db8e6d74070ea (diff) | |
Mon Jul 8 01:44:07 PDT 2013
Diffstat (limited to 'extra/dnsmasq')
| -rw-r--r-- | extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch | 26 | ||||
| -rw-r--r-- | extra/dnsmasq/PKGBUILD | 7 |
2 files changed, 31 insertions, 2 deletions
diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch new file mode 100644 index 000000000..99f084930 --- /dev/null +++ b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch @@ -0,0 +1,26 @@ +From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon@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 + diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 38accba08..17a247520 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183176 2013-04-18 12:45:45Z dreisner $ +# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> 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 @@ install=$pkgname.install 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() { |