Date: Friday, October 25, 2013 @ 16:32:42 Author: dreisner Revision: 197411
archrelease: copy trunk to extra-i686, extra-x86_64 Added: dnsmasq/repos/extra-i686/PKGBUILD (from rev 197410, dnsmasq/trunk/PKGBUILD) dnsmasq/repos/extra-i686/dnsmasq.install (from rev 197410, dnsmasq/trunk/dnsmasq.install) dnsmasq/repos/extra-i686/dnsmasq.service (from rev 197410, dnsmasq/trunk/dnsmasq.service) dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 197410, dnsmasq/trunk/PKGBUILD) dnsmasq/repos/extra-x86_64/dnsmasq.install (from rev 197410, dnsmasq/trunk/dnsmasq.install) dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 197410, dnsmasq/trunk/dnsmasq.service) Deleted: dnsmasq/repos/extra-i686/0001-Fix-failure-to-start-with-ENOTSOCK.patch dnsmasq/repos/extra-i686/0001-Fix-wrong-size-in-memset-call.patch dnsmasq/repos/extra-i686/PKGBUILD dnsmasq/repos/extra-i686/dnsmasq.install dnsmasq/repos/extra-i686/dnsmasq.service dnsmasq/repos/extra-x86_64/0001-Fix-failure-to-start-with-ENOTSOCK.patch dnsmasq/repos/extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch dnsmasq/repos/extra-x86_64/PKGBUILD dnsmasq/repos/extra-x86_64/dnsmasq.install dnsmasq/repos/extra-x86_64/dnsmasq.service ------------------------------------------------------------+ /PKGBUILD | 90 +++++++++++ /dnsmasq.install | 42 +++++ /dnsmasq.service | 30 +++ extra-i686/0001-Fix-failure-to-start-with-ENOTSOCK.patch | 26 --- extra-i686/0001-Fix-wrong-size-in-memset-call.patch | 26 --- extra-i686/PKGBUILD | 52 ------ extra-i686/dnsmasq.install | 21 -- extra-i686/dnsmasq.service | 15 - extra-x86_64/0001-Fix-failure-to-start-with-ENOTSOCK.patch | 26 --- extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch | 26 --- extra-x86_64/PKGBUILD | 52 ------ extra-x86_64/dnsmasq.install | 21 -- extra-x86_64/dnsmasq.service | 15 - 13 files changed, 162 insertions(+), 280 deletions(-) Deleted: extra-i686/0001-Fix-failure-to-start-with-ENOTSOCK.patch =================================================================== --- extra-i686/0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-i686/0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 14:32:42 UTC (rev 197411) @@ -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: extra-i686/0001-Fix-wrong-size-in-memset-call.patch =================================================================== --- extra-i686/0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-i686/0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 14:32:42 UTC (rev 197411) @@ -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 - Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-i686/PKGBUILD 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=dnsmasq -pkgver=2.66 -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') -license=('GPL') -depends=('glibc' 'dbus-core') -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() { - 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" -} - -package() { - cd "$pkgname-$pkgver" - - make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install - - install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf - install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service -} - -# vim: ts=2 sw=2 et ft=sh Copied: dnsmasq/repos/extra-i686/PKGBUILD (from rev 197410, dnsmasq/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=dnsmasq +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') +license=('GPL') +depends=('glibc' 'dbus-core') +install=$pkgname.install +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" + 'dnsmasq.service') +md5sums=('3560068c6cc644a01924fa089a70bb9c' + '7ac45726cabef4145db40d758cc7fedf') + +prepare() { + 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 +} + +build() { + cd "$pkgname-$pkgver" + + make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" +} + +package() { + cd "$pkgname-$pkgver" + + make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install + + install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf + install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service +} + +# vim: ts=2 sw=2 et ft=sh Deleted: extra-i686/dnsmasq.install =================================================================== --- extra-i686/dnsmasq.install 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-i686/dnsmasq.install 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,21 +0,0 @@ -#!/bin/sh - -add_dnsmasq_user() { - if ! getent passwd dnsmasq >/dev/null; then - useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq - fi -} - -post_install() { - add_dnsmasq_user -} - -post_upgrade() { - add_dnsmasq_user -} - -post_remove() { - if getent passwd dnsmasq >/dev/null; then - userdel dnsmasq - fi -} Copied: dnsmasq/repos/extra-i686/dnsmasq.install (from rev 197410, dnsmasq/trunk/dnsmasq.install) =================================================================== --- extra-i686/dnsmasq.install (rev 0) +++ extra-i686/dnsmasq.install 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,21 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} + +post_remove() { + if getent passwd dnsmasq >/dev/null; then + userdel dnsmasq + fi +} Deleted: extra-i686/dnsmasq.service =================================================================== --- extra-i686/dnsmasq.service 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-i686/dnsmasq.service 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,15 +0,0 @@ -[Unit] -Description=A lightweight DHCP and caching DNS server -After=network.target -Documentation=man:dnsmasq(8) - -[Service] -Type=dbus -BusName=uk.org.thekelleys.dnsmasq -ExecStartPre=/usr/bin/dnsmasq --test -ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target -Alias=dbus-uk.org.thekelleys.dnsmasq Copied: dnsmasq/repos/extra-i686/dnsmasq.service (from rev 197410, dnsmasq/trunk/dnsmasq.service) =================================================================== --- extra-i686/dnsmasq.service (rev 0) +++ extra-i686/dnsmasq.service 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,15 @@ +[Unit] +Description=A lightweight DHCP and caching DNS server +After=network.target +Documentation=man:dnsmasq(8) + +[Service] +Type=dbus +BusName=uk.org.thekelleys.dnsmasq +ExecStartPre=/usr/bin/dnsmasq --test +ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target +Alias=dbus-uk.org.thekelleys.dnsmasq Deleted: extra-x86_64/0001-Fix-failure-to-start-with-ENOTSOCK.patch =================================================================== --- extra-x86_64/0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-x86_64/0001-Fix-failure-to-start-with-ENOTSOCK.patch 2013-10-25 14:32:42 UTC (rev 197411) @@ -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: extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch =================================================================== --- extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-x86_64/0001-Fix-wrong-size-in-memset-call.patch 2013-10-25 14:32:42 UTC (rev 197411) @@ -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 - Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-x86_64/PKGBUILD 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> -# Contributor: Paul Mattal <p...@archlinux.org> -# Contributor: Tom Newsom <jeeps...@gmx.co.uk> - -pkgname=dnsmasq -pkgver=2.66 -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') -license=('GPL') -depends=('glibc' 'dbus-core') -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() { - 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" -} - -package() { - cd "$pkgname-$pkgver" - - make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install - - install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf - install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service -} - -# vim: ts=2 sw=2 et ft=sh Copied: dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 197410, dnsmasq/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=dnsmasq +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') +license=('GPL') +depends=('glibc' 'dbus-core') +install=$pkgname.install +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" + 'dnsmasq.service') +md5sums=('3560068c6cc644a01924fa089a70bb9c' + '7ac45726cabef4145db40d758cc7fedf') + +prepare() { + 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 +} + +build() { + cd "$pkgname-$pkgver" + + make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS" +} + +package() { + cd "$pkgname-$pkgver" + + make BINDIR=/usr/bin PREFIX=/usr DESTDIR="$pkgdir" install + + install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf + install -Dm644 "$srcdir/dnsmasq.service" "$pkgdir"/usr/lib/systemd/system/dnsmasq.service +} + +# vim: ts=2 sw=2 et ft=sh Deleted: extra-x86_64/dnsmasq.install =================================================================== --- extra-x86_64/dnsmasq.install 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-x86_64/dnsmasq.install 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,21 +0,0 @@ -#!/bin/sh - -add_dnsmasq_user() { - if ! getent passwd dnsmasq >/dev/null; then - useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq - fi -} - -post_install() { - add_dnsmasq_user -} - -post_upgrade() { - add_dnsmasq_user -} - -post_remove() { - if getent passwd dnsmasq >/dev/null; then - userdel dnsmasq - fi -} Copied: dnsmasq/repos/extra-x86_64/dnsmasq.install (from rev 197410, dnsmasq/trunk/dnsmasq.install) =================================================================== --- extra-x86_64/dnsmasq.install (rev 0) +++ extra-x86_64/dnsmasq.install 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,21 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /sbin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} + +post_remove() { + if getent passwd dnsmasq >/dev/null; then + userdel dnsmasq + fi +} Deleted: extra-x86_64/dnsmasq.service =================================================================== --- extra-x86_64/dnsmasq.service 2013-10-25 14:32:11 UTC (rev 197410) +++ extra-x86_64/dnsmasq.service 2013-10-25 14:32:42 UTC (rev 197411) @@ -1,15 +0,0 @@ -[Unit] -Description=A lightweight DHCP and caching DNS server -After=network.target -Documentation=man:dnsmasq(8) - -[Service] -Type=dbus -BusName=uk.org.thekelleys.dnsmasq -ExecStartPre=/usr/bin/dnsmasq --test -ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target -Alias=dbus-uk.org.thekelleys.dnsmasq Copied: dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 197410, dnsmasq/trunk/dnsmasq.service) =================================================================== --- extra-x86_64/dnsmasq.service (rev 0) +++ extra-x86_64/dnsmasq.service 2013-10-25 14:32:42 UTC (rev 197411) @@ -0,0 +1,15 @@ +[Unit] +Description=A lightweight DHCP and caching DNS server +After=network.target +Documentation=man:dnsmasq(8) + +[Service] +Type=dbus +BusName=uk.org.thekelleys.dnsmasq +ExecStartPre=/usr/bin/dnsmasq --test +ExecStart=/usr/bin/dnsmasq -k --enable-dbus --user=dnsmasq --pid-file +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target +Alias=dbus-uk.org.thekelleys.dnsmasq