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

[Jan Steffens via arch-commits]

Date: Wednesday, July 29, 2020 @ 22:21:52
  Author: heftig
Revision: 392701

3.11.0-1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-29 21:11:50 UTC (rev 392700)
+++ PKGBUILD2020-07-29 22:21:52 UTC (rev 392701)
@@ -1,8 +1,8 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.10.0
+pkgver=3.11.0
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
@@ -14,7 +14,7 @@
 makedepends=(systemd)
 
source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-sha256sums=('4078bc52dee022f4a1c7594045e724af9da5ef16d670e0c08444d1830033ba06'
+sha256sums=('eaea9d1d1e07b3fe81305178d7ef6a8c9e2a9f3b751c9b52077941809058fc3c'
 '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {

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

[Jan Steffens via arch-commits]

Date: Tuesday, January 28, 2020 @ 20:01:31
  Author: heftig
Revision: 374227

3.10.0-1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-28 19:48:19 UTC (rev 374226)
+++ PKGBUILD2020-01-28 20:01:31 UTC (rev 374227)
@@ -2,8 +2,8 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.9.2
-pkgrel=2
+pkgver=3.10.0
+pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="https://roy.marples.name/projects/openresolv";
@@ -14,7 +14,7 @@
 makedepends=(systemd)
 
source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-sha256sums=('14d7e241682e5566f6b8bf4c7316c86d7a9b8e7ed48e1de4967dbf1ea84ed373'
+sha256sums=('4078bc52dee022f4a1c7594045e724af9da5ef16d670e0c08444d1830033ba06'
 '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {

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

[Felix Yan via arch-commits]

Date: Wednesday, November 13, 2019 @ 17:06:51
  Author: felixonmars
Revision: 368272

[core] mass rebuild

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-13 17:05:30 UTC (rev 368271)
+++ PKGBUILD2019-11-13 17:06:51 UTC (rev 368272)
@@ -3,7 +3,7 @@
 
 pkgname=openresolv
 pkgver=3.9.2
-pkgrel=1
+pkgrel=2
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="https://roy.marples.name/projects/openresolv";

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

[Jan Steffens via arch-commits]

Date: Thursday, September 12, 2019 @ 19:47:30
  Author: heftig
Revision: 362332

3.9.2-1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-09-12 19:47:05 UTC (rev 362331)
+++ PKGBUILD2019-09-12 19:47:30 UTC (rev 362332)
@@ -2,7 +2,7 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.9.1
+pkgver=3.9.2
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
@@ -14,7 +14,7 @@
 makedepends=(systemd)
 
source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-sha256sums=('38b8e7e131a39b1c0d4e5688618b8572adf92a5bf757ae9f272e9f81108a9ff2'
+sha256sums=('14d7e241682e5566f6b8bf4c7316c86d7a9b8e7ed48e1de4967dbf1ea84ed373'
 '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {

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

[Jan Steffens via arch-commits]

Date: Friday, July 19, 2019 @ 06:43:32
  Author: heftig
Revision: 358134

3.9.1-1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-07-19 06:40:41 UTC (rev 358133)
+++ PKGBUILD2019-07-19 06:43:32 UTC (rev 358134)
@@ -2,8 +2,8 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.9.0
-pkgrel=2
+pkgver=3.9.1
+pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="https://roy.marples.name/projects/openresolv";
@@ -14,7 +14,7 @@
 makedepends=(systemd)
 
source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-sha256sums=('51a04d39232bb797c9efeaad51a525cf50a1deefcb19a1ea5dd3475118634db8'
+sha256sums=('38b8e7e131a39b1c0d4e5688618b8572adf92a5bf757ae9f272e9f81108a9ff2'
 '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {

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

[Evangelos Foutras via arch-commits]

Date: Friday, November 9, 2018 @ 23:40:35
  Author: foutrelis
Revision: 338786

PIE/BUILDINFO rebuild

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-09 23:39:55 UTC (rev 338785)
+++ PKGBUILD2018-11-09 23:40:35 UTC (rev 338786)
@@ -3,7 +3,7 @@
 
 pkgname=openresolv
 pkgver=3.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="https://roy.marples.name/projects/openresolv";

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

[Jan Steffens]

Date: Saturday, March 4, 2017 @ 16:24:40
  Author: heftig
Revision: 289984

3.9.0-1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-04 14:16:14 UTC (rev 289983)
+++ PKGBUILD2017-03-04 16:24:40 UTC (rev 289984)
@@ -3,19 +3,19 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.8.1
+pkgver=3.9.0
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
-url="http://roy.marples.name/projects/openresolv";
+url="https://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.xz";
+source=("https://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-sha256sums=('d259d78fd92ac288f1b27959daee11be9a40d70e91af5432046164c260de1d43'
+sha256sums=('51a04d39232bb797c9efeaad51a525cf50a1deefcb19a1ea5dd3475118634db8'
 '466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {

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

[Jan Steffens]

Date: Friday, June 10, 2016 @ 16:03:49
  Author: heftig
Revision: 269290

sha256sums

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-10 12:40:52 UTC (rev 269289)
+++ PKGBUILD2016-06-10 14:03:49 UTC (rev 269290)
@@ -15,8 +15,8 @@
 makedepends=(systemd)
 
source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-md5sums=('378cac69367745c03a932559298d6b0d'
- '44a23ce63b45adfc477837cdf6fefd0c')
+sha256sums=('d259d78fd92ac288f1b27959daee11be9a40d70e91af5432046164c260de1d43'
+'466678996689463af748bcdce7ea6f9f24f59004fa4db61fdc04da9f5fff2a6a')
 
 prepare() {
   cd $pkgname-$pkgver

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

[Jan Steffens]

Date: Thursday, May 19, 2016 @ 20:09:46
  Author: heftig
Revision: 268314

3.8.1-1

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

---+
 PKGBUILD  |6 -
 fs33801.patch |  228 
 2 files changed, 21 insertions(+), 213 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-19 17:29:10 UTC (rev 268313)
+++ PKGBUILD2016-05-19 18:09:46 UTC (rev 268314)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.7.2
+pkgver=3.8.1
 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.xz";
 fs33801.patch)
-md5sums=('6452490418e6be1674c015082b3af058'
- '465be190eda1fe40f2883efe44e10603')
+md5sums=('378cac69367745c03a932559298d6b0d'
+ '44a23ce63b45adfc477837cdf6fefd0c')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: fs33801.patch
===
--- fs33801.patch   2016-05-19 17:29:10 UTC (rev 268313)
+++ fs33801.patch   2016-05-19 18:09:46 UTC (rev 268314)
@@ -1,224 +1,32 @@
-diff -u -r openresolv-3.7.0/configure openresolv-3.7.0-arch/configure
 openresolv-3.7.0/configure 2015-05-01 20:11:09.0 +0200
-+++ openresolv-3.7.0-arch/configure2015-05-08 00:31:41.584051126 +0200
-@@ -7,6 +7,7 @@
- HOST=
- TARGET=
- RESTARTCMD=
-+RELOADCMD=
- RCDIR=
- 
- for x do
-@@ -33,6 +34,7 @@
-   --target) TARGET=$var;;
-   --libdir) LIBDIR=$var;;
-   --restartcmd) RESTARTCMD=$var;;
-+  --reloadcmd) RELOADCMD=$var;;
-   --includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
-   --datadir|--infodir) ;; # ignore autotools
-   --disable-maintainer-mode|--disable-dependency-tracking) ;;
-@@ -60,7 +62,7 @@
-   echo "no"
-   RUNDIR=/var/run
+diff -u -r openresolv-3.8.1/dnsmasq.in openresolv-3.8.1-arch/dnsmasq.in
+--- openresolv-3.8.1/dnsmasq.in2016-05-19 12:36:35.0 +0200
 openresolv-3.8.1-arch/dnsmasq.in   2016-05-19 20:05:19.659940747 +0200
+@@ -190,8 +190,8 @@
fi
--fi
-+fi
- 
- : ${SED:=sed}
- 
-@@ -68,7 +70,6 @@
- : ${SBINDIR:=$PREFIX/sbin}
- : ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
- : ${STATEDIR:=/var}
--: ${RUNDIR:=$STATEDIR/run}
- : ${MANDIR:=${PREFIX:-/usr}/share/man}
- 
- eval SYSCONFDIR="$SYSCONFDIR"
-@@ -117,7 +118,7 @@
- rm -rf $CONFIG_MK
- echo "# $OS" >$CONFIG_MK
- 
--for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR; do
-+for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR RUNDIR; do
-   eval v=\$$x
-   # Make files look nice for import
-   l=$((10 - ${#x}))
-@@ -126,26 +127,30 @@
-   echo "$x=$t $v" >>$CONFIG_MK
- done
- 
--if [ -z "$RESTARTCMD" ]; then
-+if [ -z "$RESTARTCMD" -o -z "$RELOADCMD" ]; then
-   printf "Checking for systemd ... "
-   if [ -x /bin/systemctl ]; then
--  RESTARTCMD="/bin/systemctl try-restart \1"
-+  : ${RESTARTCMD:="/bin/systemctl --fail --no-block try-restart 
\1"}
-+  : ${RELOADCMD:="/bin/systemctl --fail --no-block reload \1"}
-   echo "yes"
-   elif [ -x /usr/bin/systemctl ]; then
--  RESTARTCMD="/usr/bin/systemctl try-restart \1"
-+  : ${RESTARTCMD:="/usr/bin/systemctl --fail --no-block 
try-restart \1"}
-+  : ${RELOADCMD:="/usr/bin/systemctl --fail --no-block reload \1"}
-   echo "yes"
-   else
-   echo "no"
-   fi
  fi
- 
-+: ${RELOADCMD:='[ -s "\2" ] \&\& kill -HUP \\`cat "\2"\\` 2>/dev/null'}
-+
- # Arch upgraded to systemd, so this check has to be just after systemd
- # but higher than the others
- if [ -z "$RESTARTCMD" ]; then
-   printf "Checking for Arch ... "
-   if [ -e /etc/arch-release -a -d /etc/rc.d ]; then
-   RCDIR=/etc/rc.d
--  RESTARTCMD="[ -e /var/run/daemons/\1 ] \&\& /etc/rc.d/\1 
restart"
-+  RESTARTCMD="[ -e $RUNDIR/daemons/\1 ] \&\& /etc/rc.d/\1 restart"
-   echo "yes"
-   else
-   echo "no"
-@@ -215,11 +220,13 @@
- echo "RCDIR=  $RCDIR" >>$CONFIG_MK
- # Work around bug in the dash shell as "echo 'foo \1'" does bad things
- printf "%s\n" "RESTARTCMD=$RESTARTCMD" >>$CONFIG_MK
-+printf "%s\n" "RELOADCMD= $RELOADCMD"  >>$CONFIG_MK
- 
- echo
- echo "   SYSCONFDIR = $SYSCONFDIR"
- echo "   SBINDIR =$SBINDIR"
- echo "   LIBEXECDIR = $LIBEXECDIR"
--echo "   VARDIR = $RUNDIR"
-+echo "   RUNDIR = $RUNDIR"
-+echo "   VARDIR = $VARDIR"
- echo "   MANDIR = $MANDIR"
- echo
-diff -u -r openresolv-3.7.0/dnsmasq.in openresolv-3.7.0-arch/dnsmasq.in
 openresolv-3.7.0/dnsmasq.in2015-05-01 20:11:09.0 +0200
-+++ openresolv-3.

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

[Jan Steffens]

Date: Monday, November 23, 2015 @ 01:13:29
  Author: heftig
Revision: 251892

3.7.2

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-11-22 18:33:41 UTC (rev 251891)
+++ PKGBUILD2015-11-23 00:13:29 UTC (rev 251892)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.7.1
+pkgver=3.7.2
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
@@ -15,7 +15,7 @@
 makedepends=(systemd)
 
source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-md5sums=('c3485c50efb75cd7857b288afbfb15bb'
+md5sums=('6452490418e6be1674c015082b3af058'
  '465be190eda1fe40f2883efe44e10603')
 
 prepare() {

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

[Jan Steffens]

Date: Sunday, October 4, 2015 @ 02:31:28
  Author: heftig
Revision: 248320

3.7.1

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-10-03 23:12:36 UTC (rev 248319)
+++ PKGBUILD2015-10-04 00:31:28 UTC (rev 248320)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.7.0
+pkgver=3.7.1
 pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
@@ -13,9 +13,9 @@
 provides=(resolvconf)
 depends=(bash)
 makedepends=(systemd)
-source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2";
+source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.xz";
 fs33801.patch)
-md5sums=('f2205978b524a91776156fd84d2c1a2c'
+md5sums=('c3485c50efb75cd7857b288afbfb15bb'
  '465be190eda1fe40f2883efe44e10603')
 
 prepare() {
@@ -27,6 +27,7 @@
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf 
--sbindir=/usr/bin
+  make
 }
 
 package() {

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

[Jan Steffens]

Date: Friday, May 8, 2015 @ 00:40:21
  Author: heftig
Revision: 238615

3.7.0

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

---+
 PKGBUILD  |6 +++---
 fs33801.patch |   49 +
 2 files changed, 28 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-07 20:42:09 UTC (rev 238614)
+++ PKGBUILD2015-05-07 22:40:21 UTC (rev 238615)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.6.1
+pkgver=3.7.0
 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=('f385e26ec0f9cd06d8ccd45fc219002e'
- 'b6d3c06bd806de87497cb249bea954d0')
+md5sums=('f2205978b524a91776156fd84d2c1a2c'
+ '465be190eda1fe40f2883efe44e10603')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: fs33801.patch
===
--- fs33801.patch   2015-05-07 20:42:09 UTC (rev 238614)
+++ fs33801.patch   2015-05-07 22:40:21 UTC (rev 238615)
@@ -1,6 +1,6 @@
-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.0 +0100
-+++ openresolv-3.6.1-arch/configure2015-01-01 12:20:34.805786238 +0100
+diff -u -r openresolv-3.7.0/configure openresolv-3.7.0-arch/configure
+--- openresolv-3.7.0/configure 2015-05-01 20:11:09.0 +0200
 openresolv-3.7.0-arch/configure2015-05-08 00:31:41.584051126 +0200
 @@ -7,6 +7,7 @@
  HOST=
  TARGET=
@@ -78,7 +78,7 @@
echo "yes"
else
echo "no"
-@@ -203,11 +208,13 @@
+@@ -215,11 +220,13 @@
  echo "RCDIR=  $RCDIR" >>$CONFIG_MK
  # Work around bug in the dash shell as "echo 'foo \1'" does bad things
  printf "%s\n" "RESTARTCMD=$RESTARTCMD" >>$CONFIG_MK
@@ -93,9 +93,9 @@
 +echo "   VARDIR = $VARDIR"
  echo "   MANDIR = $MANDIR"
  echo
-diff -u -r openresolv-3.6.1/dnsmasq.in openresolv-3.6.1-arch/dnsmasq.in
 openresolv-3.6.1/dnsmasq.in2014-10-28 23:03:14.0 +0100
-+++ openresolv-3.6.1-arch/dnsmasq.in   2015-01-01 12:22:47.265204837 +0100
+diff -u -r openresolv-3.7.0/dnsmasq.in openresolv-3.7.0-arch/dnsmasq.in
+--- openresolv-3.7.0/dnsmasq.in2015-05-01 20:11:09.0 +0200
 openresolv-3.7.0-arch/dnsmasq.in   2015-05-08 00:31:41.584051126 +0200
 @@ -33,11 +33,12 @@
  NL="
  "
@@ -120,10 +120,10 @@
fi
# Send even if empty so old servers are cleared
if $dbus_ex; then
-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.0 +0100
-+++ openresolv-3.6.1-arch/Makefile 2015-01-01 12:20:34.862452655 +0100
-@@ -10,11 +10,13 @@
+diff -u -r openresolv-3.7.0/Makefile openresolv-3.7.0-arch/Makefile
+--- openresolv-3.7.0/Makefile  2015-05-01 20:11:09.0 +0200
 openresolv-3.7.0-arch/Makefile 2015-05-08 00:33:56.200147440 +0200
+@@ -9,11 +9,13 @@
  SBINDIR?= /sbin
  SYSCONFDIR?=  /etc
  LIBEXECDIR?=  /libexec/resolvconf
@@ -138,7 +138,7 @@
  
  INSTALL?= install
  SED?= sed
-@@ -32,17 +34,19 @@
+@@ -31,9 +33,11 @@
  SED_SBINDIR=  -e 's:@SBINDIR@:${SBINDIR}:g'
  SED_SYSCONFDIR=   -e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
  SED_LIBEXECDIR=   -e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
@@ -148,8 +148,9 @@
  SED_RESTARTCMD=   -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g'
 +SED_RELOADCMD=-e 's:@RELOADCMD \([^ ]*\) 
\(.*\)@:${RELOADCMD}:g'
  
- .SUFFIXES: .in
- 
+ DISTPREFIX?=  ${PKG}-${VERSION}
+ DISTFILEGZ?=  ${DISTPREFIX}.tar.gz
+@@ -45,8 +49,8 @@
  all: ${TARGET}
  
  .in:
@@ -160,10 +161,10 @@
$< > $@
  
  clean:
-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.0 +0100
-+++ openresolv-3.6.1-arch/resolvconf.8.in  2015-01-01 12:20:34.882452568 
+0100
-@@ -124,7 +124,7 @@
+diff -u -r openresolv-3.7.0/resolvconf.8.in 
openresolv-3.7.0-arch/resolvconf.8.in
+--- openresolv-3.7.0/resolvconf.8.in   2015-05-01 20:11:09.0 +0200
 openresolv-3.7.0-arch/resolvconf.8.in  2015-05-08 00:31:41.620717637 
+0200
+@@ -135,7 +135,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
@@ -172,9 +173,9 @@
  If used, it should only be called once as early in the system boot sequence
  as possible and before
  .Nm
-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.0

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

[Jan Steffens]

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
===
--- PKGBUILD2015-01-01 11:07:48 UTC (rev 228320)
+++ PKGBUILD2015-01-01 11:25:49 UTC (rev 228321)
@@ -3,8 +3,8 @@
 # Contributor: Ignacio Galmarino 
 
 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.0 +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.0 +0100
 openresolv-3.6.1-arch/configure2015-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.in2014-04-30 11:02:23.0 +0200
-+++ openresolv-3.5.7-fs33801/dnsmasq.in2014-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.in2014-10-28 23:03:14.0 +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.0 +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.0 +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.0 +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.0 +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.000

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

[Jan Steffens]

Date: Monday, August 25, 2014 @ 00:34:43
  Author: heftig
Revision: 220639

Update FS#33801 patch, fixing FS#41668

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

---+
 PKGBUILD  |7 -
 fs33801.patch |  201 +++-
 2 files changed, 175 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-24 21:07:46 UTC (rev 220638)
+++ PKGBUILD2014-08-24 22:34:43 UTC (rev 220639)
@@ -4,7 +4,7 @@
 
 pkgname=openresolv
 pkgver=3.5.7
-pkgrel=1
+pkgrel=2
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="http://roy.marples.name/projects/openresolv";
@@ -16,7 +16,7 @@
 
source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2";
 fs33801.patch)
 md5sums=('4de84738d29d54b910f5600ffd12b62c'
- '584f58b7d26419e725fe5495ed330f70')
+ 'f98e53fdaf0b294f154eea99caaec7a0')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -26,8 +26,7 @@
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf 
\
---sbindir=/usr/bin
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf 
--sbindir=/usr/bin
 }
 
 package() {

Modified: fs33801.patch
===
--- fs33801.patch   2014-08-24 21:07:46 UTC (rev 220638)
+++ fs33801.patch   2014-08-24 22:34:43 UTC (rev 220639)
@@ -1,19 +1,116 @@
-diff -u -r openresolv-3.5.7/dnsmasq.in openresolv-3.5.7-systemd/dnsmasq.in
+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.0 +0200
 openresolv-3.5.7-fs33801/configure 2014-08-25 00:26:17.733879048 +0200
+@@ -7,6 +7,7 @@
+ HOST=
+ TARGET=
+ RESTARTCMD=
++RELOADCMD=
+ RCDIR=
+ 
+ for x do
+@@ -33,6 +34,7 @@
+   --target) TARGET=$var;;
+   --libdir) LIBDIR=$var;;
+   --restartcmd) RESTARTCMD=$var;;
++  --reloadcmd) RELOADCMD=$var;;
+   --includedir) eval INCLUDEDIR="$INCLUDEDIR${INCLUDEDIR:+ }$var";;
+   --datadir|--infodir) ;; # ignore autotools
+   --disable-maintainer-mode|--disable-dependency-tracking) ;;
+@@ -60,7 +62,7 @@
+   echo "no"
+   RUNDIR=/var/run
+   fi
+-fi
++fi
+ 
+ : ${SED:=sed}
+ 
+@@ -68,7 +70,6 @@
+ : ${SBINDIR:=$PREFIX/sbin}
+ : ${LIBEXECDIR:=$PREFIX/libexec/resolvconf}
+ : ${STATEDIR:=/var}
+-: ${RUNDIR:=$STATEDIR/run}
+ : ${MANDIR:=${PREFIX:-/usr}/share/man}
+ 
+ eval SYSCONFDIR="$SYSCONFDIR"
+@@ -117,7 +118,7 @@
+ rm -rf $CONFIG_MK
+ echo "# $OS" >$CONFIG_MK
+ 
+-for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR; do
++for x in SYSCONFDIR SBINDIR LIBEXECDIR VARDIR MANDIR RUNDIR; do
+   eval v=\$$x
+   # Make files look nice for import
+   l=$((10 - ${#x}))
+@@ -126,26 +127,30 @@
+   echo "$x=$t $v" >>$CONFIG_MK
+ done
+ 
+-if [ -z "$RESTARTCMD" ]; then
++if [ -z "$RESTARTCMD" -o -z "$RELOADCMD" ]; then
+   printf "Checking for systemd ... "
+   if [ -x /bin/systemctl ]; then
+-  RESTARTCMD="/bin/systemctl try-restart \1"
++  : ${RESTARTCMD:="/bin/systemctl --fail --no-block try-restart 
\1"}
++  : ${RELOADCMD:="/bin/systemctl --fail --no-block reload \1"}
+   echo "yes"
+   elif [ -x /usr/bin/systemctl ]; then
+-  RESTARTCMD="/usr/bin/systemctl try-restart \1"
++  : ${RESTARTCMD:="/usr/bin/systemctl --fail --no-block 
try-restart \1"}
++  : ${RELOADCMD:="/usr/bin/systemctl --fail --no-block reload \1"}
+   echo "yes"
+   else
+   echo "no"
+   fi
+ fi
+ 
++: ${RELOADCMD:='[ -s "\2" ] \&\& kill -HUP \\`cat "\2"\\` 2>/dev/null'}
++
+ # Arch upgraded to systemd, so this check has to be just after systemd
+ # but higher than the others
+ if [ -z "$RESTARTCMD" ]; then
+   printf "Checking for Arch ... "
+   if [ -e /etc/arch-release -a -d /etc/rc.d ]; then
+   RCDIR=/etc/rc.d
+-  RESTARTCMD="[ -e /var/run/daemons/\1 ] \&\& /etc/rc.d/\1 
restart"
++  RESTARTCMD="[ -e $RUNDIR/daemons/\1 ] \&\& /etc/rc.d/\1 restart"
+   echo "yes"
+   else
+   echo "no"
+@@ -203,11 +208,13 @@
+ echo "RCDIR=  $RCDIR" >>$CONFIG_MK
+ # Work around bug in the dash shell as "echo 'foo \1'" does bad things
+ printf "%s\n" "RESTARTCMD=$RESTARTCMD" >>$CONFIG_MK
++printf "%s\n" "RELOADCMD= $RELOADCMD"  >>$CONFIG_MK
+ 
+ echo
+ echo "   SYSCONFDIR = $SYSCONFDIR"
+ echo "   SBINDIR =$SBINDIR"
+ echo "   LIBEXECDIR = $LIBEXECDIR"
+-echo "   VARDIR = $RUNDIR"
++echo "   RUNDIR = $RUNDIR"
++echo "   VARDIR = $VARDIR"
+ echo "   MANDIR = $MANDIR"
+ echo
+diff -u -Nr openresolv-3.5.7/dnsmasq.in openresolv-3.5.7-fs33801/dnsmasq.in

[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
===
--- PKGBUILD2014-07-25 22:47:54 UTC (rev 218180)
+++ PKGBUILD2014-07-25 23:40:56 UTC (rev 218181)
@@ -3,7 +3,7 @@
 # Contributor: Ignacio Galmarino 
 
 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.in2014-04-30 11:02:23.0 +0200
 openresolv-3.5.7-systemd/dnsmasq.in2014-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.0 
+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.in2014-04-30 11:02:23.0 +0200
 openresolv-3.5.7-systemd/unbound.in2014-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"

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

[Jan Steffens]

Date: Tuesday, June 4, 2013 @ 13:27:08
  Author: heftig
Revision: 187146

3.5.5

Modified:
  openresolv/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-04 10:18:35 UTC (rev 187145)
+++ PKGBUILD2013-06-04 11:27:08 UTC (rev 187146)
@@ -3,8 +3,8 @@
 # Contributor: Ignacio Galmarino 
 
 pkgname=openresolv
-pkgver=3.5.4
-pkgrel=3
+pkgver=3.5.5
+pkgrel=1
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="http://roy.marples.name/projects/openresolv";
@@ -15,7 +15,7 @@
 makedepends=(systemd)
 
source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2";
 fs33801.patch 0001-Use-SBINDIR-instead-of-PREFIX-sbin.patch)
-md5sums=('617a52fbe6f253f231d9f78f1ea74281'
+md5sums=('31b07164b941d0ef0216b7d2a30bc573'
  '440790d3403b2ae2c4bb1d657c7e36a4'
  '6686a4e74b00c72277a17bb4b4503465')
 

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

[Jan Steffens]

Date: Monday, February 11, 2013 @ 01:24:43
  Author: heftig
Revision: 84124

Arch-specific command fixes FS#33801

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

---+
 PKGBUILD  |   18 
 fs33801.patch |   82 
 2 files changed, 94 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-11 00:01:58 UTC (rev 84123)
+++ PKGBUILD2013-02-11 00:24:43 UTC (rev 84124)
@@ -4,20 +4,26 @@
 
 pkgname=openresolv
 pkgver=3.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="resolv.conf management framework (resolvconf)"
 arch=(any)
 url="http://roy.marples.name/projects/openresolv";
 license=('custom:BSD')
 backup=(etc/resolvconf.conf)
 provides=(resolvconf)
-source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2";)
-md5sums=('617a52fbe6f253f231d9f78f1ea74281')
+source=("http://roy.marples.name/downloads/openresolv/${pkgname}-${pkgver}.tar.bz2";
+fs33801.patch)
+md5sums=('617a52fbe6f253f231d9f78f1ea74281'
+ '440790d3403b2ae2c4bb1d657c7e36a4')
 
+build() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../fs33801.patch
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf
+}
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/resolvconf
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
   mkdir -p "$pkgdir/usr/share/licenses/$pkgname"

Added: fs33801.patch
===
--- fs33801.patch   (rev 0)
+++ fs33801.patch   2013-02-11 00:24:43 UTC (rev 84124)
@@ -0,0 +1,82 @@
+diff --git i/dnsmasq.in w/dnsmasq.in
+index 96b5593..384d9df 100644
+--- i/dnsmasq.in
 w/dnsmasq.in
+@@ -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 @@ if $changed; then
+   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 --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.
+ 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
+@@ -229,10 +229,8 @@ Command to restart the named service.
+ 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.
+ .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
+@@ -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 @@ if [ ! -f "$unbound_conf" ] || \
+   [ "$(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