Date: Wednesday, June 17, 2015 @ 00:43:17 Author: dreisner Revision: 240966
archrelease: copy trunk to extra-i686, extra-x86_64 Added: dnsmasq/repos/extra-i686/PKGBUILD (from rev 240965, dnsmasq/trunk/PKGBUILD) dnsmasq/repos/extra-i686/dnsmasq.install (from rev 240965, dnsmasq/trunk/dnsmasq.install) dnsmasq/repos/extra-i686/dnsmasq.service (from rev 240965, dnsmasq/trunk/dnsmasq.service) dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 240965, dnsmasq/trunk/PKGBUILD) dnsmasq/repos/extra-x86_64/dnsmasq.install (from rev 240965, dnsmasq/trunk/dnsmasq.install) dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 240965, dnsmasq/trunk/dnsmasq.service) Deleted: dnsmasq/repos/extra-i686/PKGBUILD dnsmasq/repos/extra-i686/dnsmasq.install dnsmasq/repos/extra-i686/dnsmasq.service dnsmasq/repos/extra-x86_64/PKGBUILD dnsmasq/repos/extra-x86_64/dnsmasq.install dnsmasq/repos/extra-x86_64/dnsmasq.service ------------------------------+ /PKGBUILD | 102 +++++++++++++++++++++++++++++++++++++++++ /dnsmasq.install | 30 ++++++++++++ /dnsmasq.service | 28 +++++++++++ extra-i686/PKGBUILD | 44 ----------------- extra-i686/dnsmasq.install | 21 -------- extra-i686/dnsmasq.service | 14 ----- extra-x86_64/PKGBUILD | 44 ----------------- extra-x86_64/dnsmasq.install | 21 -------- extra-x86_64/dnsmasq.service | 14 ----- 9 files changed, 160 insertions(+), 158 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-i686/PKGBUILD 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,44 +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.72 -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' 'libdbus' 'gmp' 'nettle') -install=$pkgname.install -backup=('etc/dnsmasq.conf') -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - 'dnsmasq.service') -md5sums=('0256e0a71e27c8d8a5c89a0d18f3cfe2' - 'b87f68013c3e8b4bb37117de968d4603') - -build() { - cd "$pkgname-$pkgver" - - make \ - CFLAGS="$CPPFLAGS $CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" -} - -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 - - # DNSSEC setup - sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf -} - -# vim: ts=2 sw=2 et ft=sh Copied: dnsmasq/repos/extra-i686/PKGBUILD (from rev 240965, dnsmasq/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=dnsmasq +pkgver=2.73 +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' 'libdbus' 'gmp' 'nettle') +install=$pkgname.install +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc} + 'dnsmasq.service') +md5sums=('b8bfe96d22945c8cf4466826ba9b21bd' + 'SKIP' + 'b87f68013c3e8b4bb37117de968d4603') +validpgpkeys=('269322E7D9255916E0394DD628FC869A289B82B7') # Simon Kelley + +build_copts="-DHAVE_DNSSEC -DHAVE_DBUS" + +build() { + cd "$pkgname-$pkgver" + + make \ + CFLAGS="$CPPFLAGS $CFLAGS" \ + LDFLAGS="$LDFLAGS" \ + COPTS="$build_copts" +} + +package() { + cd "$pkgname-$pkgver" + + # need to pass COPTS here to avoid rebuilding the binary. + make \ + COPTS="$build_copts" \ + 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 + + # DNSSEC setup + sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf + install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf +} + +# vim: ts=2 sw=2 et ft=sh Deleted: extra-i686/dnsmasq.install =================================================================== --- extra-i686/dnsmasq.install 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-i686/dnsmasq.install 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,21 +0,0 @@ -#!/bin/sh - -add_dnsmasq_user() { - if ! getent passwd dnsmasq >/dev/null; then - useradd -r -d / -c 'dnsmasq daemon' -s /usr/bin/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 240965, dnsmasq/trunk/dnsmasq.install) =================================================================== --- extra-i686/dnsmasq.install (rev 0) +++ extra-i686/dnsmasq.install 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,15 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /usr/bin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} Deleted: extra-i686/dnsmasq.service =================================================================== --- extra-i686/dnsmasq.service 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-i686/dnsmasq.service 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,14 +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 Copied: dnsmasq/repos/extra-i686/dnsmasq.service (from rev 240965, dnsmasq/trunk/dnsmasq.service) =================================================================== --- extra-i686/dnsmasq.service (rev 0) +++ extra-i686/dnsmasq.service 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,14 @@ +[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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-x86_64/PKGBUILD 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,44 +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.72 -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' 'libdbus' 'gmp' 'nettle') -install=$pkgname.install -backup=('etc/dnsmasq.conf') -source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz" - 'dnsmasq.service') -md5sums=('0256e0a71e27c8d8a5c89a0d18f3cfe2' - 'b87f68013c3e8b4bb37117de968d4603') - -build() { - cd "$pkgname-$pkgver" - - make \ - CFLAGS="$CPPFLAGS $CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" -} - -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 - - # DNSSEC setup - sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf - install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf -} - -# vim: ts=2 sw=2 et ft=sh Copied: dnsmasq/repos/extra-x86_64/PKGBUILD (from rev 240965, dnsmasq/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Paul Mattal <p...@archlinux.org> +# Contributor: Tom Newsom <jeeps...@gmx.co.uk> + +pkgname=dnsmasq +pkgver=2.73 +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' 'libdbus' 'gmp' 'nettle') +install=$pkgname.install +backup=('etc/dnsmasq.conf') +source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc} + 'dnsmasq.service') +md5sums=('b8bfe96d22945c8cf4466826ba9b21bd' + 'SKIP' + 'b87f68013c3e8b4bb37117de968d4603') +validpgpkeys=('269322E7D9255916E0394DD628FC869A289B82B7') # Simon Kelley + +build_copts="-DHAVE_DNSSEC -DHAVE_DBUS" + +build() { + cd "$pkgname-$pkgver" + + make \ + CFLAGS="$CPPFLAGS $CFLAGS" \ + LDFLAGS="$LDFLAGS" \ + COPTS="$build_copts" +} + +package() { + cd "$pkgname-$pkgver" + + # need to pass COPTS here to avoid rebuilding the binary. + make \ + COPTS="$build_copts" \ + 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 + + # DNSSEC setup + sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf + install -Dm644 "trust-anchors.conf" "$pkgdir"/usr/share/dnsmasq/trust-anchors.conf +} + +# vim: ts=2 sw=2 et ft=sh Deleted: extra-x86_64/dnsmasq.install =================================================================== --- extra-x86_64/dnsmasq.install 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-x86_64/dnsmasq.install 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,21 +0,0 @@ -#!/bin/sh - -add_dnsmasq_user() { - if ! getent passwd dnsmasq >/dev/null; then - useradd -r -d / -c 'dnsmasq daemon' -s /usr/bin/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 240965, dnsmasq/trunk/dnsmasq.install) =================================================================== --- extra-x86_64/dnsmasq.install (rev 0) +++ extra-x86_64/dnsmasq.install 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,15 @@ +#!/bin/sh + +add_dnsmasq_user() { + if ! getent passwd dnsmasq >/dev/null; then + useradd -r -d / -c 'dnsmasq daemon' -s /usr/bin/nologin dnsmasq + fi +} + +post_install() { + add_dnsmasq_user +} + +post_upgrade() { + add_dnsmasq_user +} Deleted: extra-x86_64/dnsmasq.service =================================================================== --- extra-x86_64/dnsmasq.service 2015-06-16 22:42:45 UTC (rev 240965) +++ extra-x86_64/dnsmasq.service 2015-06-16 22:43:17 UTC (rev 240966) @@ -1,14 +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 Copied: dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 240965, dnsmasq/trunk/dnsmasq.service) =================================================================== --- extra-x86_64/dnsmasq.service (rev 0) +++ extra-x86_64/dnsmasq.service 2015-06-16 22:43:17 UTC (rev 240966) @@ -0,0 +1,14 @@ +[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