[arch-commits] Commit in dnsmasq/repos/extra-x86_64 (6 files)
Christian Hesse
eworm at archlinux.org
Fri Apr 17 19:01:02 UTC 2020
Date: Friday, April 17, 2020 @ 19:01:01
Author: eworm
Revision: 380469
archrelease: copy trunk to extra-x86_64
Added:
dnsmasq/repos/extra-x86_64/PKGBUILD
(from rev 380468, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/extra-x86_64/dnsmasq-sysusers.conf
(from rev 380468, dnsmasq/trunk/dnsmasq-sysusers.conf)
dnsmasq/repos/extra-x86_64/dnsmasq.service
(from rev 380468, dnsmasq/trunk/dnsmasq.service)
Deleted:
dnsmasq/repos/extra-x86_64/PKGBUILD
dnsmasq/repos/extra-x86_64/dnsmasq-sysusers.conf
dnsmasq/repos/extra-x86_64/dnsmasq.service
-----------------------+
PKGBUILD | 118 ++++++++++++++++++++++++------------------------
dnsmasq-sysusers.conf | 2
dnsmasq.service | 36 +++++++-------
3 files changed, 79 insertions(+), 77 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-17 19:00:56 UTC (rev 380468)
+++ PKGBUILD 2020-04-17 19:01:01 UTC (rev 380469)
@@ -1,59 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=dnsmasq
-pkgver=2.81
-pkgrel=2
-pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
-url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
-arch=('x86_64')
-license=('GPL')
-depends=('glibc' 'gmp' 'libidn2' 'libdbus' 'libnetfilter_conntrack' 'nettle')
-backup=('etc/dnsmasq.conf')
-validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
- 'dnsmasq-sysusers.conf'
- 'dnsmasq.service')
-sha256sums=('749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb'
- 'SKIP'
- '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
- '751bc5931e91ffa271f659b740836ab8a733ee8c8826410adb31fdd0ecd49c58')
-
-_build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK'
-
-build() {
- cd "$pkgname-$pkgver"
-
- make \
- CFLAGS="$CPPFLAGS $CFLAGS" \
- LDFLAGS="$LDFLAGS" \
- COPTS="$_build_copts" \
- PREFIX=/usr \
- BINDIR=/usr/bin \
- all-i18n
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- # need to pass COPTS here to avoid rebuilding the binary.
- make \
- COPTS="$_build_copts" \
- PREFIX=/usr \
- BINDIR=/usr/bin \
- DESTDIR="$pkgdir" \
- install install-i18n
-
- install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/usr/share/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
- install -Dm644 "$srcdir/dnsmasq-sysusers.conf" "$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
-
- # 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 380468, dnsmasq/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-17 19:01:01 UTC (rev 380469)
@@ -0,0 +1,59 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+
+pkgname=dnsmasq
+pkgver=2.81
+pkgrel=3
+pkgdesc='Lightweight, easy to configure DNS forwarder and DHCP server'
+url='http://www.thekelleys.org.uk/dnsmasq/doc.html'
+arch=('x86_64')
+license=('GPL')
+depends=('glibc' 'gmp' 'libidn2' 'libdbus' 'libnetfilter_conntrack' 'nettle')
+backup=('etc/dnsmasq.conf')
+validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley <simon at thekelleys.org.uk>
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+ 'dnsmasq-sysusers.conf'
+ 'dnsmasq.service')
+sha256sums=('749ca903537c5197c26444ac24b0dce242cf42595fdfe6b9a5b9e4c7ad32f8fb'
+ 'SKIP'
+ '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
+ '297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec')
+
+_build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK'
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ make \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
+ LDFLAGS="$LDFLAGS" \
+ COPTS="$_build_copts" \
+ PREFIX=/usr \
+ BINDIR=/usr/bin \
+ all-i18n
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ # need to pass COPTS here to avoid rebuilding the binary.
+ make \
+ COPTS="$_build_copts" \
+ PREFIX=/usr \
+ BINDIR=/usr/bin \
+ DESTDIR="$pkgdir" \
+ install install-i18n
+
+ install -Dm644 "dbus/dnsmasq.conf" "$pkgdir"/usr/share/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
+ install -Dm644 "$srcdir/dnsmasq-sysusers.conf" "$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
+
+ # 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: dnsmasq-sysusers.conf
===================================================================
--- dnsmasq-sysusers.conf 2020-04-17 19:00:56 UTC (rev 380468)
+++ dnsmasq-sysusers.conf 2020-04-17 19:01:01 UTC (rev 380469)
@@ -1 +0,0 @@
-u dnsmasq - "dnsmasq daemon" /
Copied: dnsmasq/repos/extra-x86_64/dnsmasq-sysusers.conf (from rev 380468, dnsmasq/trunk/dnsmasq-sysusers.conf)
===================================================================
--- dnsmasq-sysusers.conf (rev 0)
+++ dnsmasq-sysusers.conf 2020-04-17 19:01:01 UTC (rev 380469)
@@ -0,0 +1 @@
+u dnsmasq - "dnsmasq daemon" /
Deleted: dnsmasq.service
===================================================================
--- dnsmasq.service 2020-04-17 19:00:56 UTC (rev 380468)
+++ dnsmasq.service 2020-04-17 19:01:01 UTC (rev 380469)
@@ -1,17 +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
-Restart=on-failure
-PrivateDevices=true
-ProtectSystem=full
-
-[Install]
-WantedBy=multi-user.target
Copied: dnsmasq/repos/extra-x86_64/dnsmasq.service (from rev 380468, dnsmasq/trunk/dnsmasq.service)
===================================================================
--- dnsmasq.service (rev 0)
+++ dnsmasq.service 2020-04-17 19:01:01 UTC (rev 380469)
@@ -0,0 +1,19 @@
+[Unit]
+Description=dnsmasq - A lightweight DHCP and caching DNS server
+Documentation=man:dnsmasq(8)
+After=network.target
+Before=network-online.target nss-lookup.target
+Wants=nss-lookup.target
+
+[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
+Restart=on-failure
+PrivateDevices=true
+ProtectSystem=full
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list