[arch-commits] Commit in openresolv/trunk (PKGBUILD fs33801.patch)

Jan Steffens heftig at archlinux.org
Thu Jan 1 11:25:49 UTC 2015 

    Date: Thursday, January 1, 2015 @ 12:25:49
  Author: heftig
Revision: 228321

3.6.1

Modified:
  openresolv/trunk/PKGBUILD
  openresolv/trunk/fs33801.patch

---------------+
 PKGBUILD      |    8 +++----
 fs33801.patch |   61 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-01 11:07:48 UTC (rev 228320)
+++ PKGBUILD	2015-01-01 11:25:49 UTC (rev 228321)
@@ -3,8 +3,8 @@
 # Contributor: Ignacio Galmarino <igalmarino at gmail.com>
 
 pkgname=openresolv
-pkgver=3.5.7
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="http://roy.marples.name/projects/openresolv"
@@ -15,8 +15,8 @@
 makedepends=(systemd)
 source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2"
         fs33801.patch)
-md5sums=('4de84738d29d54b910f5600ffd12b62c'
-         'f98e53fdaf0b294f154eea99caaec7a0')
+md5sums=('f385e26ec0f9cd06d8ccd45fc219002e'
+         'b6d3c06bd806de87497cb249bea954d0')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: fs33801.patch
===================================================================
--- fs33801.patch	2015-01-01 11:07:48 UTC (rev 228320)
+++ fs33801.patch	2015-01-01 11:25:49 UTC (rev 228321)
@@ -1,6 +1,6 @@
-diff -u -Nr openresolv-3.5.7/configure openresolv-3.5.7-fs33801/configure
---- openresolv-3.5.7/configure	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/configure	2014-08-25 00:26:17.733879048 +0200
+diff -u -r openresolv-3.6.1/configure openresolv-3.6.1-arch/configure
+--- openresolv-3.6.1/configure	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/configure	2015-01-01 12:20:34.805786238 +0100
 @@ -7,6 +7,7 @@
  HOST=
  TARGET=
@@ -93,10 +93,10 @@
 +echo "   VARDIR =		$VARDIR"
  echo "   MANDIR =		$MANDIR"
  echo
-diff -u -Nr openresolv-3.5.7/dnsmasq.in openresolv-3.5.7-fs33801/dnsmasq.in
---- openresolv-3.5.7/dnsmasq.in	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/dnsmasq.in	2014-08-25 00:26:17.733879048 +0200
-@@ -33,10 +33,11 @@
+diff -u -r openresolv-3.6.1/dnsmasq.in openresolv-3.6.1-arch/dnsmasq.in
+--- openresolv-3.6.1/dnsmasq.in	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/dnsmasq.in	2015-01-01 12:22:47.265204837 +0100
+@@ -33,11 +33,12 @@
  NL="
  "
  
@@ -104,6 +104,7 @@
 -[ -s "$dnsmasq_pid" ] || dnsmasq_pid=/var/run/dnsmasq/dnsmasq.pid
 +: ${dnsmasq_pid:=@RUNDIR@/dnsmasq.pid}
 +[ -s "$dnsmasq_pid" ] || : ${dnsmasq_pid:=@RUNDIR@/dnsmasq/dnsmasq.pid}
+ [ -s "$dnsmasq_pid" ] || unset dnsmasq_pid
  : ${dnsmasq_service:=dnsmasq}
  : ${dnsmasq_restart:=@RESTARTCMD ${dnsmasq_service}@}
 +: ${dnsmasq_reload:=@RELOADCMD ${dnsmasq_service} ${dnsmasq_pid}@}
@@ -110,18 +111,18 @@
  newconf="# Generated by resolvconf$NL"
  newresolv="$newconf"
  
-@@ -182,7 +183,7 @@
- 	eval $dnsmasq_restart
+@@ -184,7 +185,7 @@
  fi
  if $dbus; then
--	$changed || kill -HUP $(cat "$dnsmasq_pid")
-+	$changed || eval $dnsmasq_reload
+ 	if [ -s "$dnsmasq_pid" ]; then
+-        	$changed || kill -HUP $(cat "$dnsmasq_pid")
++        	$changed || eval $dnsmasq_reload
+ 	fi
  	# Send even if empty so old servers are cleared
  	if $dbus_ex; then
- 		method=SetDomainServers
-diff -u -Nr openresolv-3.5.7/Makefile openresolv-3.5.7-fs33801/Makefile
---- openresolv-3.5.7/Makefile	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/Makefile	2014-08-25 00:26:17.983877830 +0200
+diff -u -r openresolv-3.6.1/Makefile openresolv-3.6.1-arch/Makefile
+--- openresolv-3.6.1/Makefile	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/Makefile	2015-01-01 12:20:34.862452655 +0100
 @@ -10,11 +10,13 @@
  SBINDIR?=	/sbin
  SYSCONFDIR?=	/etc
@@ -159,10 +160,10 @@
  		$< > $@
  
  clean:
-diff -u -Nr openresolv-3.5.7/resolvconf.8.in openresolv-3.5.7-fs33801/resolvconf.8.in
---- openresolv-3.5.7/resolvconf.8.in	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/resolvconf.8.in	2014-08-25 00:26:17.983877830 +0200
-@@ -110,7 +110,7 @@
+diff -u -r openresolv-3.6.1/resolvconf.8.in openresolv-3.6.1-arch/resolvconf.8.in
+--- openresolv-3.6.1/resolvconf.8.in	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/resolvconf.8.in	2015-01-01 12:20:34.882452568 +0100
+@@ -124,7 +124,7 @@
  This only needs to be called if the initial system boot sequence does not
  automatically clean it out; for example the state directory is moved
  somewhere other than
@@ -171,10 +172,10 @@
  If used, it should only be called once as early in the system boot sequence
  as possible and before
  .Nm
-diff -u -Nr openresolv-3.5.7/resolvconf.conf.5.in openresolv-3.5.7-fs33801/resolvconf.conf.5.in
---- openresolv-3.5.7/resolvconf.conf.5.in	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/resolvconf.conf.5.in	2014-08-25 00:26:17.983877830 +0200
-@@ -218,6 +218,8 @@
+diff -u -r openresolv-3.6.1/resolvconf.conf.5.in openresolv-3.6.1-arch/resolvconf.conf.5.in
+--- openresolv-3.6.1/resolvconf.conf.5.in	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/resolvconf.conf.5.in	2015-01-01 12:20:34.882452568 +0100
+@@ -281,6 +281,8 @@
  Command to restart the dnsmasq service.
  .It Sy dnsmasq_pid
  Location of the dnsmasq pidfile.
@@ -183,7 +184,7 @@
  .It Sy libc_service
  Location of the libc service.
  .It Sy libc_restart
-@@ -234,6 +236,8 @@
+@@ -297,6 +299,8 @@
  Command to restart the unbound service.
  .It Sy unbound_pid
  Location of the unbound pidfile.
@@ -191,11 +192,11 @@
 +Command to reload the unbound service.
  .El
  .Sh SEE ALSO
- .Xr resolv.conf 5
-diff -u -Nr openresolv-3.5.7/unbound.in openresolv-3.5.7-fs33801/unbound.in
---- openresolv-3.5.7/unbound.in	2014-04-30 11:02:23.000000000 +0200
-+++ openresolv-3.5.7-fs33801/unbound.in	2014-08-25 00:26:17.983877830 +0200
-@@ -33,9 +33,10 @@
+ .Xr resolv.conf 5 ,
+diff -u -r openresolv-3.6.1/unbound.in openresolv-3.6.1-arch/unbound.in
+--- openresolv-3.6.1/unbound.in	2014-10-28 23:03:14.000000000 +0100
++++ openresolv-3.6.1-arch/unbound.in	2015-01-01 12:20:34.882452568 +0100
+@@ -35,9 +35,10 @@
  NL="
  "
  
@@ -207,7 +208,7 @@
  newconf="# Generated by resolvconf$NL"
  
  for d in $DOMAINS; do
-@@ -68,11 +69,5 @@
+@@ -75,11 +76,5 @@
  then
  	printf %s "$newconf" >"$unbound_conf"
  	# If we can't sent a HUP then force a restart

More information about the arch-commits mailing list