openresolv: update to 3.5.7.

srcpkgs/openresolv/patches/SBINDIR-instead-of-PREFIX-sbin.patch

@@ -1,135 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 7865a5f..0e4780f 100644
---- Makefile
-+++ Makefile
-@@ -17,7 +17,7 @@ TARGET=		${RESOLVCONF} ${SUBSCRIBERS}
- SRCS=		${TARGET:C,$,.in,} # pmake
- SRCS:=		${TARGET:=.in} # gmake
- 
--SED_PREFIX=		-e 's:@PREFIX@:${PREFIX}:g'
-+SED_SBINDIR=		-e 's:@SBINDIR@:${SBINDIR}:g'
- SED_SYSCONFDIR=		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g'
- SED_LIBEXECDIR=		-e 's:@LIBEXECDIR@:${LIBEXECDIR}:g'
- SED_VARDIR=		-e 's:@VARDIR@:${VARDIR}:g'
-@@ -29,7 +29,7 @@ SED_RESTARTCMD=		-e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g'
- all: ${TARGET}
- 
- .in:
--	${SED}	${SED_PREFIX} ${SED_SYSCONFDIR} ${SED_LIBEXECDIR} \
-+	${SED}	${SED_SBINDIR} ${SED_SYSCONFDIR} ${SED_LIBEXECDIR} \
- 		${SED_VARDIR} ${SED_RCDIR} ${SED_RESTARTCMD} \
- 		$< > $@
- 
-diff --git a/dnsmasq.in b/dnsmasq.in
-index 96b5593..542acaa 100644
---- dnsmasq.in
-+++ dnsmasq.in
-@@ -29,7 +29,7 @@
- [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
- . "@SYSCONFDIR@/resolvconf.conf" || exit 1
- [ -z "$dnsmasq_conf" -a -z "$dnsmasq_resolv" ] && exit 0
--[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-+[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
- NL="
- "
- 
-@@ -154,7 +154,7 @@ fi
- if type config_mkdirs >/dev/null 2>&1; then
- 	config_mkdirs "$dnsmasq_conf" "$dnsmasq_resolv"
- else
--	@PREFIX@/sbin/resolvconf -D "$dnsmasq_conf" "$dnsmasq_resolv"
-+	@SBINDIR@/resolvconf -D "$dnsmasq_conf" "$dnsmasq_resolv"
- fi
- 
- changed=false
-diff --git a/libc.in b/libc.in
-index c4233d5..945efc8 100644
---- libc.in
-+++ libc.in
-@@ -97,7 +97,7 @@ fi
- : ${resolv_conf:=/etc/resolv.conf}
- : ${libc_service:=nscd}
- : ${libc_restart:=@RESTARTCMD ${libc_service}@}
--: ${list_resolv:=@PREFIX@/sbin/resolvconf -l}
-+: ${list_resolv:=@SBINDIR@/resolvconf -l}
- if [ "${resolv_conf_head-x}" = x -a -f "$SYSCONFDIR"/resolv.conf.head ]; then
- 	resolv_conf_head="$(cat "${SYSCONFDIR}"/resolv.conf.head)"
- fi
-@@ -130,7 +130,7 @@ case "${resolv_conf_passthrough:-NO}" in
- 	newconf="$(cat "$newest")$NL"
- 	;;
- *)
--	[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-+	[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
- 	newsearch="$(uniqify $search_domains $SEARCH $search_domains_append)"
- 	NS="$LOCALNAMESERVERS $NAMESERVERS"
- 	newns=
-diff --git a/named.in b/named.in
-index 1ee3abc..43ceabb 100644
---- named.in
-+++ named.in
-@@ -29,7 +29,7 @@
- [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
- . "@SYSCONFDIR@/resolvconf.conf" || exit 1
- [ -z "$named_zones" -a -z "$named_options" ] && exit 0
--[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-+[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
- NL="
- "
- 
-@@ -78,7 +78,7 @@ done
- if type config_mkdirs >/dev/null 2>&1; then
- 	config_mkdirs "$named_options" "$named_zones"
- else
--	@PREFIX@/sbin/resolvconf -D "$named_options" "$named_zones"
-+	@SBINDIR@/resolvconf -D "$named_options" "$named_zones"
- fi
- 
- # No point in changing files or reloading bind if the end result has not
-diff --git a/pdnsd.in b/pdnsd.in
-index 0a0241a..4c14c3c 100644
---- pdnsd.in
-+++ pdnsd.in
-@@ -29,7 +29,7 @@
- [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
- . "@SYSCONFDIR@/resolvconf.conf" || exit 1
- [ -z "$pdnsd_conf" -a -z "$pdnsd_resolv" ] && exit 0
--[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-+[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
- NL="
- "
- 
-@@ -89,7 +89,7 @@ changed=false
- if type config_mkdirs >/dev/null 2>&1; then
- 	config_mkdirs "$pdnsd_resolv" "$pdnsd_conf"
- else
--	@PREFIX@/sbin/resolvconf -D "$pdnsd_resolv" "$pdnsd_conf"
-+	@SBINDIR@/resolvconf -D "$pdnsd_resolv" "$pdnsd_conf"
- fi
- 
- if [ -n "$pdnsd_resolv" ]; then
-diff --git a/unbound.in b/unbound.in
-index 4ee0da7..633c7f0 100644
---- unbound.in
-+++ unbound.in
-@@ -29,7 +29,7 @@
- [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0
- . "@SYSCONFDIR@/resolvconf.conf" || exit 1
- [ -z "$unbound_conf" ] && exit 0
--[ -z "$RESOLVCONF" ] && eval "$(@PREFIX@/sbin/resolvconf -v)"
-+[ -z "$RESOLVCONF" ] && eval "$(@SBINDIR@/resolvconf -v)"
- NL="
- "
- 
-@@ -60,7 +60,7 @@ fi
- if type config_mkdirs >/dev/null 2>&1; then
- 	config_mkdirs "$unbound_conf"
- else
--	@PREFIX@/sbin/resolvconf -D "$unbound_conf"
-+	@SBINDIR@/resolvconf -D "$unbound_conf"
- fi
- 
- if [ ! -f "$unbound_conf" ] || \
--- 
-1.8.2.3
-

srcpkgs/openresolv/patches/dnsmasq.patch

@@ -1,82 +0,0 @@
-diff --git i/dnsmasq.in w/dnsmasq.in
-index 96b5593..384d9df 100644
---- dnsmasq.in
-+++ 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
---- resolvconf.conf.5.in
-+++ 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
---- unbound.in
-+++ 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

srcpkgs/openresolv/template

@@ -1,19 +1,16 @@
 # Template file for 'openresolv'
 pkgname=openresolv
-version=3.5.5
+version=3.5.7
 revision=1
 noarch="yes"
 build_style=gnu-configure
 configure_args="--prefix=/usr --sysconfdir=/etc
  --bindir=/usr/bin --libexecdir=/usr/lib/resolvconf"
+conf_files="/etc/resolvconf.conf"
+hostmakedepends="systemd"
 short_desc="DNS management framework"
 maintainer="Ypnose <linuxienATlegtuxDOTorg>"
 license="BSD"
 homepage="http://roy.marples.name/projects/openresolv/wiki"
 distfiles="http://roy.marples.name/downloads/$pkgname/$pkgname-$version.tar.bz2"
-checksum=ff35f5ae311d624bb46e4a1d38dbcfb2935541b2c8cc7ba902eac9f295e59bf5
+checksum=a7fb7a353a3dea7fe62ede3a96de3c0fca00ddd0e9d010fa6e3f1168310fc592
-makedepends="systemd"
-
-do_install() {
-	make DESTDIR=$DESTDIR install
-}