Date: Friday, October 25, 2013 @ 16:32:11 Author: dreisner Revision: 197410
upgpkg: dnsmasq 2.67-1 Modified: dnsmasq/trunk/PKGBUILD Deleted: dnsmasq/trunk/0001-Fix-failure-to-start-with-ENOTSOCK.patch dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch -----------------------------------------------+ 0001-Fix-failure-to-start-with-ENOTSOCK.patch | 26 ------------------------ 0001-Fix-wrong-size-in-memset-call.patch | 26 ------------------------ PKGBUILD | 19 +++++------------ 3 files changed, 6 insertions(+), 65 deletions(-) Deleted: 0001-Fix-failure-to-start-with-ENOTSOCK.patch =================================================================== --- 0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 13:13:16 UTC (rev 197409) +++ 0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 14:32:11 UTC (rev 197410) @@ -1,26 +0,0 @@ -From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <si...@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 - Deleted: 0001-Fix-wrong-size-in-memset-call.patch =================================================================== --- 0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 13:13:16 UTC (rev 197409) +++ 0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 14:32:11 UTC (rev 197410) @@ -1,26 +0,0 @@ -From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001 -From: Simon Kelley <si...@thekelleys.org.uk> -Date: Thu, 18 Apr 2013 09:47:49 +0100 -Subject: [PATCH] Fix wrong size in memset() call. - -Thanks to Dave Reisner. ---- - src/ipset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/ipset.c b/src/ipset.c -index a34ed96..f175fa4 100644 ---- a/src/ipset.c -+++ b/src/ipset.c -@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr, - return -1; - } - -- memset(buffer, 0, sizeof(buffer)); -+ memset(buffer, 0, BUFF_SZ); - - nlh = (struct nlmsghdr *)buffer; - nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr)); --- -1.8.2.1 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-25 13:13:16 UTC (rev 197409) +++ PKGBUILD 2013-10-25 14:32:11 UTC (rev 197410) @@ -4,8 +4,8 @@ # Contributor: Tom Newsom <jeeps...@gmx.co.uk> pkgname=dnsmasq -pkgver=2.66 -pkgrel=2 +pkgver=2.67 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html"; arch=('i686' 'x86_64') @@ -14,28 +14,21 @@ 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' +md5sums=('3560068c6cc644a01924fa089a70bb9c' '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" + # link against dbus. this ugliness is needed to ensure that the + # compile time opts report properly on startup. yuck. + sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h } build() { cd "$pkgname-$pkgver" - # link against dbus. this ugliness is needed to ensure that the - # compile time opts report properly on startup. yuck. - sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" }
