[arch-commits] Commit in openresolv/repos (3 files)

[Jan Steffens]

    Date: Wednesday, July 29, 2020 @ 22:29:11
  Author: heftig
Revision: 392706

archrelease: copy trunk to testing-any

Added:
  openresolv/repos/testing-any/
  openresolv/repos/testing-any/PKGBUILD
    (from rev 392703, openresolv/trunk/PKGBUILD)
  openresolv/repos/testing-any/fs33801.patch
    (from rev 392703, openresolv/trunk/fs33801.patch)

---------------+
 PKGBUILD      |   37 +++++++++++++++++++++++++++++++++++++
 fs33801.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

Copied: openresolv/repos/testing-any/PKGBUILD (from rev 392703, openresolv/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2020-07-29 22:29:11 UTC (rev 392706)
@@ -0,0 +1,37 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Ignacio Galmarino <igalmarino at gmail.com>
+
+pkgname=openresolv
+pkgver=3.11.0
+pkgrel=1
+pkgdesc="resolv.conf management framework (resolvconf)"
+arch=(any)
+url="https://roy.marples.name/projects/openresolv"
+license=('custom:BSD')
+backup=(etc/resolvconf.conf)
+provides=(resolvconf)
+depends=(bash)
+makedepends=(systemd)
+source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz"
+        fs33801.patch)
+sha256sums=('eaea9d1d1e07b3fe81305178d7ef6a8c9e2a9f3b751c9b52077941809058fc3c'
+            '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fs33801.patch
+  sed -n '2,25{s:^# \?::;p}' resolvconf.in >LICENSE 
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf --sbindir=/usr/bin
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Copied: openresolv/repos/testing-any/fs33801.patch (from rev 392703, openresolv/trunk/fs33801.patch)
===================================================================
--- testing-any/fs33801.patch	                        (rev 0)
+++ testing-any/fs33801.patch	2020-07-29 22:29:11 UTC (rev 392706)
@@ -0,0 +1,32 @@
+diff -u -r openresolv-3.8.1/dnsmasq.in openresolv-3.8.1-arch/dnsmasq.in
+--- openresolv-3.8.1/dnsmasq.in	2016-05-19 12:36:35.000000000 +0200
++++ openresolv-3.8.1-arch/dnsmasq.in	2016-05-19 20:05:19.659940747 +0200
+@@ -190,8 +190,8 @@
+ 	fi
+ fi
+ if $dbus; then
+-	if [ -s "$dnsmasq_pid" ]; then
+-        	$changed || kill -HUP $(cat "$dnsmasq_pid")
++	if $changed && systemctl --quiet is-active dnsmasq; then
++		systemctl reload dnsmasq
+ 	fi
+ 	# Send even if empty so old servers are cleared
+ 	if $dbus_ex; then
+diff -u -r openresolv-3.8.1/unbound.in openresolv-3.8.1-arch/unbound.in
+--- openresolv-3.8.1/unbound.in	2016-05-19 12:36:35.000000000 +0200
++++ openresolv-3.8.1-arch/unbound.in	2016-05-19 20:04:20.207722679 +0200
+@@ -86,12 +86,7 @@
+ 	[ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
+ then
+ 	printf %s "$newconf" >"$unbound_conf"
+-	# If we can't sent a HUP then force a restart
+-	if [ -s "$unbound_pid" ]; then
+-		if ! kill -HUP $(cat "$unbound_pid") 2>/dev/null; then
+-			restart_unbound
+-		fi
+-	else
+-		restart_unbound
++	if systemctl --quiet is-active unbound; then
++		systemctl reload unbound
+ 	fi
+ fi