Date: Thursday, April 18, 2013 @ 14:44:42 Author: dreisner Revision: 183175
upgpkg: dnsmasq 2.66-1 - backport fix for bug in ipset module - build explicitly with flags - remove bogus backup entry Added: dnsmasq/trunk/0001-Fix-wrong-size-in-memset-call.patch Modified: dnsmasq/trunk/PKGBUILD ------------------------------------------+ 0001-Fix-wrong-size-in-memset-call.patch | 26 ++++++++++++++++++++++++++ PKGBUILD | 19 +++++++++++++------ 2 files changed, 39 insertions(+), 6 deletions(-) Added: 0001-Fix-wrong-size-in-memset-call.patch =================================================================== --- 0001-Fix-wrong-size-in-memset-call.patch (rev 0) +++ 0001-Fix-wrong-size-in-memset-call.patch 2013-04-18 12:44:42 UTC (rev 183175) @@ -0,0 +1,26 @@ +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-04-18 12:38:02 UTC (rev 183174) +++ PKGBUILD 2013-04-18 12:44:42 UTC (rev 183175) @@ -4,7 +4,7 @@ # Contributor: Tom Newsom <jeeps...@gmx.co.uk> pkgname=dnsmasq -pkgver=2.65 +pkgver=2.66 pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" @@ -12,13 +12,20 @@ license=('GPL') depends=('glibc' 'dbus-core') install=$pkgname.install -backup=('etc/dnsmasq.conf' - 'etc/conf.d/dnsmasq') -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" + '0001-Fix-wrong-size-in-memset-call.patch' 'dnsmasq.service') -md5sums=('a91534a5d6f053d5c80f67ef502afa34' +md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20' + '05ccefefde68ebdebce5e40d2b3c78be' '7ac45726cabef4145db40d758cc7fedf') +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch" +} + build() { cd "$pkgname-$pkgver" @@ -26,7 +33,7 @@ # compile time opts report properly on startup. yuck. sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h - make + make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" } package() {