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

Jan Steffens heftig at archlinux.org
Fri Jul 25 23:41:26 UTC 2014


    Date: Saturday, July 26, 2014 @ 01:41:26
  Author: heftig
Revision: 218182

archrelease: copy trunk to testing-any

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

---------------+
 PKGBUILD      |   38 ++++++++++++++++++++++++++
 fs33801.patch |   79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)

Copied: openresolv/repos/testing-any/PKGBUILD (from rev 218181, openresolv/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2014-07-25 23:41:26 UTC (rev 218182)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ignacio Galmarino <igalmarino at gmail.com>
+
+pkgname=openresolv
+pkgver=3.5.7
+pkgrel=1
+pkgdesc="resolv.conf management framework (resolvconf)"
+arch=(any)
+url="http://roy.marples.name/projects/openresolv"
+license=('custom:BSD')
+backup=(etc/resolvconf.conf)
+provides=(resolvconf)
+depends=(bash)
+makedepends=(systemd)
+source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2"
+        fs33801.patch)
+md5sums=('4de84738d29d54b910f5600ffd12b62c'
+         '584f58b7d26419e725fe5495ed330f70')
+
+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
+}
+
+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 218181, openresolv/trunk/fs33801.patch)
===================================================================
--- testing-any/fs33801.patch	                        (rev 0)
+++ testing-any/fs33801.patch	2014-07-25 23:41:26 UTC (rev 218182)
@@ -0,0 +1,79 @@
+diff -u -r openresolv-3.5.7/dnsmasq.in openresolv-3.5.7-systemd/dnsmasq.in
+--- openresolv-3.5.7/dnsmasq.in	2014-04-30 11:02:23.000000000 +0200
++++ openresolv-3.5.7-systemd/dnsmasq.in	2014-07-26 01:36:58.217567587 +0200
+@@ -33,10 +33,9 @@
+ NL="
+ "
+ 
+-: ${dnsmasq_pid:=/var/run/dnsmasq.pid}
+-[ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
+ : ${dnsmasq_service:=dnsmasq}
+ : ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
++: ${dnsmasq_reload:=/usr/bin/systemctl reload ${dnsmasq_service}}
+ newconf="# Generated by resolvconf$NL"
+ newresolv="$newconf"
+ 
+@@ -182,7 +181,7 @@
+ 	eval $dnsmasq_restart
+ fi
+ if $dbus; then
+-	$changed || kill -HUP $(cat "$dnsmasq_pid")
++	$changed || eval $dnsmasq_reload
+ 	# Send even if empty so old servers are cleared
+ 	if $dbus_ex; then
+ 		method=SetDomainServers
+diff -u -r openresolv-3.5.7/resolvconf.conf.5.in openresolv-3.5.7-systemd/resolvconf.conf.5.in
+--- openresolv-3.5.7/resolvconf.conf.5.in	2014-04-30 11:02:23.000000000 +0200
++++ openresolv-3.5.7-systemd/resolvconf.conf.5.in	2014-07-26 01:37:46.080706147 +0200
+@@ -216,8 +216,8 @@
+ Location of the dnsmasq service.
+ .It Sy dnsmasq_restart
+ Command to restart the dnsmasq service.
+-.It Sy dnsmasq_pid
+-Location of the dnsmasq pidfile.
++.It Sy dnsmasq_reload
++Command to reload the dnsmasq service.
+ .It Sy libc_service
+ Location of the libc service.
+ .It Sy libc_restart
+@@ -230,10 +230,8 @@
+ Command to restart the pdnsd service.
+ .It Sy unbound_service
+ Location of the unbound service.
+-.It Sy unbound_restart
+-Command to restart the unbound service.
+-.It Sy unbound_pid
+-Location of the unbound pidfile.
++.It Sy unbound_reload
++Command to reload the unbound service.
+ .El
+ .Sh SEE ALSO
+ .Xr resolv.conf 5
+diff -u -r openresolv-3.5.7/unbound.in openresolv-3.5.7-systemd/unbound.in
+--- openresolv-3.5.7/unbound.in	2014-04-30 11:02:23.000000000 +0200
++++ openresolv-3.5.7-systemd/unbound.in	2014-07-26 01:36:58.217567587 +0200
+@@ -33,9 +33,8 @@
+ NL="
+ "
+ 
+-: ${unbound_pid:=/var/run/unbound.pid}
+ : ${unbound_service:=unbound}
+-: ${unbound_restart:=@RESTARTCMD ${unbound_service}@}
++: ${unbound_reload:=/usr/bin/systemctl reload-or-try-restart ${unbound_service}}
+ newconf="# Generated by resolvconf$NL"
+ 
+ for d in $DOMAINS; do
+@@ -67,12 +66,5 @@
+ 	[ "$(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
+-			eval $unbound_restart
+-		fi
+-	else
+-		eval $unbound_restart
+-	fi
++	eval $unbound_reload
+ fi




More information about the arch-commits mailing list