Date: Sunday, October 30, 2022 @ 07:51:38
Author: eworm
Revision: 459567
archrelease: copy trunk to testing-x86_64
Added:
dnsmasq/repos/testing-x86_64/PKGBUILD
(from rev 459566, dnsmasq/trunk/PKGBUILD)
dnsmasq/repos/testing-x86_64/dnsmasq-sysusers.conf
(from rev 459566, dnsmasq/trunk/dnsmasq-sysusers.conf)
dnsmasq/repos/testing-x86_64/dnsmasq.service
(from rev 459566, dnsmasq/trunk/dnsmasq.service)
dnsmasq/repos/testing-x86_64/fix-loss-of-DNS-servers-on-config-reload.patch
(from rev 459566,
dnsmasq/trunk/fix-loss-of-DNS-servers-on-config-reload.patch)
dnsmasq/repos/testing-x86_64/keys/
Deleted:
dnsmasq/repos/testing-x86_64/PKGBUILD
dnsmasq/repos/testing-x86_64/dnsmasq-sysusers.conf
dnsmasq/repos/testing-x86_64/dnsmasq.service
dnsmasq/repos/testing-x86_64/fix-loss-of-DNS-servers-on-config-reload.patch
dnsmasq/repos/testing-x86_64/keys/
------------------------------------------------+
PKGBUILD | 159 +++++++++++------------
dnsmasq-sysusers.conf | 2
dnsmasq.service | 38 ++---
fix-loss-of-DNS-servers-on-config-reload.patch | 54 +++----
4 files changed, 127 insertions(+), 126 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-30 07:51:34 UTC (rev 459566)
+++ PKGBUILD 2022-10-30 07:51:38 UTC (rev 459567)
@@ -1,79 +0,0 @@
-# Maintainer: Christian Hesse <[email protected]>
-# Maintainer: Dave Reisner <[email protected]>
-# Contributor: Paul Mattal <[email protected]>
-# Contributor: Tom Newsom <[email protected]>
-
-pkgname=dnsmasq
-pkgver=2.87
-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' 'libidn2.so' 'libdbus' 'libdbus-1.so'
- 'libnetfilter_conntrack' 'nettle' 'libnettle.so' 'libhogweed.so')
-backup=('etc/dnsmasq.conf')
-validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley
<[email protected]>
-source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
- 'fix-loss-of-DNS-servers-on-config-reload.patch'
- 'dnsmasq-sysusers.conf'
- 'dnsmasq.service')
-sha256sums=('0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a'
- 'SKIP'
- 'af922de43b4bef2de8c4191d6c155ef9fb5a48629ce14e183627d51b502bec12'
- '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
- '297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec')
-
-_build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK'
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 < ../fix-loss-of-DNS-servers-on-config-reload.patch
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- make \
- CFLAGS="$CPPFLAGS $CFLAGS" \
- LDFLAGS="$LDFLAGS" \
- COPTS="$_build_copts" \
- PREFIX=/usr \
- BINDIR=/usr/bin \
- all-i18n
-
- cd "contrib/lease-tools"
-
- make \
- CFLAGS="$CPPFLAGS $CFLAGS" \
- LDFLAGS="$LDFLAGS" \
- COPTS="$_build_copts" \
- all
-}
-
-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-i18n
-
- install -Dm0644 "dbus/dnsmasq.conf"
"$pkgdir"/usr/share/dbus-1/system.d/dnsmasq.conf
- install -Dm0644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
- install -Dm0644 "$srcdir/dnsmasq.service"
"$pkgdir"/usr/lib/systemd/system/dnsmasq.service
- install -Dm0644 "$srcdir/dnsmasq-sysusers.conf"
"$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
-
- # DNSSEC setup
- sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf
- install -Dm0644 "trust-anchors.conf"
"$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
-
- install -Dm0755 -t "$pkgdir"/usr/bin/
'contrib/lease-tools/dhcp_'{release{,6},lease_time}
- install -Dm0644 -t "$pkgdir"/usr/share/man/man1
'contrib/lease-tools/dhcp_'{release{,6},lease_time}.1
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: dnsmasq/repos/testing-x86_64/PKGBUILD (from rev 459566,
dnsmasq/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-10-30 07:51:38 UTC (rev 459567)
@@ -0,0 +1,80 @@
+# Maintainer: Christian Hesse <[email protected]>
+# Maintainer: Dave Reisner <[email protected]>
+# Contributor: Paul Mattal <[email protected]>
+# Contributor: Tom Newsom <[email protected]>
+
+pkgname=dnsmasq
+pkgver=2.87
+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' 'libidn2.so' 'libdbus' 'libdbus-1.so'
'nftables'
+ 'libnetfilter_conntrack' 'nettle' 'libnettle.so' 'libhogweed.so')
+options=('debug')
+backup=('etc/dnsmasq.conf')
+validpgpkeys=('D6EACBD6EE46B834248D111215CDDA6AE19135A2') # Simon Kelley
<[email protected]>
+source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"{,.asc}
+ 'fix-loss-of-DNS-servers-on-config-reload.patch'
+ 'dnsmasq-sysusers.conf'
+ 'dnsmasq.service')
+sha256sums=('0228c0364a7f2356fd7e7f1549937cbf3099a78d3b2eb1ba5bb0c31e2b89de7a'
+ 'SKIP'
+ 'af922de43b4bef2de8c4191d6c155ef9fb5a48629ce14e183627d51b502bec12'
+ '7f6ff6a709038ae580758f4b6a754451d7f7ce22957b88a36b97f7b643d3c2ab'
+ '297dbae8cfa3d353284820dd87cc65c37d1ef289cac3a5c3ede079413d31eeec')
+
+_build_copts='-DHAVE_DNSSEC -DHAVE_DBUS -DHAVE_LIBIDN2 -DHAVE_CONNTRACK
-DHAVE_NFTSET'
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 < ../fix-loss-of-DNS-servers-on-config-reload.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ make \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
+ LDFLAGS="$LDFLAGS" \
+ COPTS="$_build_copts" \
+ PREFIX=/usr \
+ BINDIR=/usr/bin \
+ all-i18n
+
+ cd "contrib/lease-tools"
+
+ make \
+ CFLAGS="$CPPFLAGS $CFLAGS" \
+ LDFLAGS="$LDFLAGS" \
+ COPTS="$_build_copts" \
+ all
+}
+
+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-i18n
+
+ install -Dm0644 "dbus/dnsmasq.conf"
"$pkgdir"/usr/share/dbus-1/system.d/dnsmasq.conf
+ install -Dm0644 "dnsmasq.conf.example" "$pkgdir"/etc/dnsmasq.conf
+ install -Dm0644 "$srcdir/dnsmasq.service"
"$pkgdir"/usr/lib/systemd/system/dnsmasq.service
+ install -Dm0644 "$srcdir/dnsmasq-sysusers.conf"
"$pkgdir"/usr/lib/sysusers.d/dnsmasq.conf
+
+ # DNSSEC setup
+ sed -i 's,%%PREFIX%%,/usr,' "$pkgdir"/etc/dnsmasq.conf
+ install -Dm0644 "trust-anchors.conf"
"$pkgdir"/usr/share/dnsmasq/trust-anchors.conf
+
+ install -Dm0755 -t "$pkgdir"/usr/bin/
'contrib/lease-tools/dhcp_'{release{,6},lease_time}
+ install -Dm0644 -t "$pkgdir"/usr/share/man/man1
'contrib/lease-tools/dhcp_'{release{,6},lease_time}.1
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: dnsmasq-sysusers.conf
===================================================================
--- dnsmasq-sysusers.conf 2022-10-30 07:51:34 UTC (rev 459566)
+++ dnsmasq-sysusers.conf 2022-10-30 07:51:38 UTC (rev 459567)
@@ -1 +0,0 @@
-u dnsmasq - "dnsmasq daemon" /
Copied: dnsmasq/repos/testing-x86_64/dnsmasq-sysusers.conf (from rev 459566,
dnsmasq/trunk/dnsmasq-sysusers.conf)
===================================================================
--- dnsmasq-sysusers.conf (rev 0)
+++ dnsmasq-sysusers.conf 2022-10-30 07:51:38 UTC (rev 459567)
@@ -0,0 +1 @@
+u dnsmasq - "dnsmasq daemon" /
Deleted: dnsmasq.service
===================================================================
--- dnsmasq.service 2022-10-30 07:51:34 UTC (rev 459566)
+++ dnsmasq.service 2022-10-30 07:51:38 UTC (rev 459567)
@@ -1,19 +0,0 @@
-[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
Copied: dnsmasq/repos/testing-x86_64/dnsmasq.service (from rev 459566,
dnsmasq/trunk/dnsmasq.service)
===================================================================
--- dnsmasq.service (rev 0)
+++ dnsmasq.service 2022-10-30 07:51:38 UTC (rev 459567)
@@ -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
Deleted: fix-loss-of-DNS-servers-on-config-reload.patch
===================================================================
--- fix-loss-of-DNS-servers-on-config-reload.patch 2022-10-30 07:51:34 UTC
(rev 459566)
+++ fix-loss-of-DNS-servers-on-config-reload.patch 2022-10-30 07:51:38 UTC
(rev 459567)
@@ -1,27 +0,0 @@
-From 930428fb970f4991e5c2933fd5a5d2504c18a551 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <[email protected]>
-Date: Mon, 17 Oct 2022 21:15:43 +0100
-Subject: Fix loss of DNS servers on config reload.
-
-A bug, introduced in 2.87, which could result in DNS
-servers being removed from the configuration when reloading
-server configuration from DBus, or re-reading /etc/resolv.conf
-Only servers from the same source should be replaced, but some
-servers from other sources (ie hard coded or another dynamic source)
-could mysteriously disappear.
----
-diff --git a/src/domain-match.c b/src/domain-match.c
-index f7db0fe..76a1109 100644
---- a/src/domain-match.c
-+++ b/src/domain-match.c
-@@ -683,7 +683,9 @@ int add_update_server(int flags,
- serv->next = NULL;
- }
- break;
-- }
-+ }
-+ else
-+ up = &serv->next;
- }
-
- if (serv)
Copied:
dnsmasq/repos/testing-x86_64/fix-loss-of-DNS-servers-on-config-reload.patch
(from rev 459566, dnsmasq/trunk/fix-loss-of-DNS-servers-on-config-reload.patch)
===================================================================
--- fix-loss-of-DNS-servers-on-config-reload.patch
(rev 0)
+++ fix-loss-of-DNS-servers-on-config-reload.patch 2022-10-30 07:51:38 UTC
(rev 459567)
@@ -0,0 +1,27 @@
+From 930428fb970f4991e5c2933fd5a5d2504c18a551 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <[email protected]>
+Date: Mon, 17 Oct 2022 21:15:43 +0100
+Subject: Fix loss of DNS servers on config reload.
+
+A bug, introduced in 2.87, which could result in DNS
+servers being removed from the configuration when reloading
+server configuration from DBus, or re-reading /etc/resolv.conf
+Only servers from the same source should be replaced, but some
+servers from other sources (ie hard coded or another dynamic source)
+could mysteriously disappear.
+---
+diff --git a/src/domain-match.c b/src/domain-match.c
+index f7db0fe..76a1109 100644
+--- a/src/domain-match.c
++++ b/src/domain-match.c
+@@ -683,7 +683,9 @@ int add_update_server(int flags,
+ serv->next = NULL;
+ }
+ break;
+- }
++ }
++ else
++ up = &serv->next;
+ }
+
+ if (serv)
