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

[Jan Steffens]

    Date: Saturday, July 26, 2014 @ 01:40:56
  Author: heftig
Revision: 218181

3.5.7

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

---------------+
 PKGBUILD      |    6 +++---
 fs33801.patch |   31 ++++++++++++++-----------------
 2 files changed, 17 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-25 22:47:54 UTC (rev 218180)
+++ PKGBUILD	2014-07-25 23:40:56 UTC (rev 218181)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino <igalmarino at gmail.com>
 
 pkgname=openresolv
-pkgver=3.5.6
+pkgver=3.5.7
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
@@ -15,8 +15,8 @@
 makedepends=(systemd)
 source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2"
         fs33801.patch)
-md5sums=('ac03b7a52cf0f2040cc70df641f1baff'
-         '440790d3403b2ae2c4bb1d657c7e36a4')
+md5sums=('4de84738d29d54b910f5600ffd12b62c'
+         '584f58b7d26419e725fe5495ed330f70')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: fs33801.patch
===================================================================
--- fs33801.patch	2014-07-25 22:47:54 UTC (rev 218180)
+++ fs33801.patch	2014-07-25 23:40:56 UTC (rev 218181)
@@ -1,7 +1,6 @@
-diff --git i/dnsmasq.in w/dnsmasq.in
-index 96b5593..384d9df 100644
---- i/dnsmasq.in
-+++ w/dnsmasq.in
+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="
  "
@@ -14,7 +13,7 @@
  newconf="# Generated by resolvconf$NL"
  newresolv="$newconf"
  
-@@ -182,7 +181,7 @@ if $changed; then
+@@ -182,7 +181,7 @@
  	eval $dnsmasq_restart
  fi
  if $dbus; then
@@ -23,11 +22,10 @@
  	# Send even if empty so old servers are cleared
  	if $dbus_ex; then
  		method=SetDomainServers
-diff --git i/resolvconf.conf.5.in w/resolvconf.conf.5.in
-index 81fe154..9b4f1bd 100644
---- i/resolvconf.conf.5.in
-+++ w/resolvconf.conf.5.in
-@@ -215,8 +215,8 @@ variables, documented below.
+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.
@@ -38,7 +36,7 @@
  .It Sy libc_service
  Location of the libc service.
  .It Sy libc_restart
-@@ -229,10 +229,8 @@ Command to restart the named service.
+@@ -230,10 +230,8 @@
  Command to restart the pdnsd service.
  .It Sy unbound_service
  Location of the unbound service.
@@ -48,13 +46,12 @@
 -Location of the unbound pidfile.
 +.It Sy unbound_reload
 +Command to reload the unbound service.
+ .El
  .Sh SEE ALSO
  .Xr resolv.conf 5
- and
-diff --git i/unbound.in w/unbound.in
-index 4ee0da7..5e4a326 100644
---- i/unbound.in
-+++ w/unbound.in
+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="
  "
@@ -66,7 +63,7 @@
  newconf="# Generated by resolvconf$NL"
  
  for d in $DOMAINS; do
-@@ -67,12 +66,5 @@ if [ ! -f "$unbound_conf" ] || \
+@@ -67,12 +66,5 @@
  	[ "$(cat "$unbound_conf")" != "$(printf %s "$newconf")" ]
  then
  	printf %s "$newconf" >"$unbound_conf"