From ccc138edf9864f10af5e6730951d92f81027cb6a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 3 Jun 2013 09:17:18 +0200 Subject: [PATCH] openresolv: add missing systemd builddep; fix patches. --- .../SBINDIR-instead-of-PREFIX-sbin.patch | 24 +++++++++---------- srcpkgs/openresolv/patches/dnsmasq.patch | 12 +++++----- srcpkgs/openresolv/template | 1 + 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/srcpkgs/openresolv/patches/SBINDIR-instead-of-PREFIX-sbin.patch b/srcpkgs/openresolv/patches/SBINDIR-instead-of-PREFIX-sbin.patch index 27c958d2a84..c6ea4e7a471 100644 --- a/srcpkgs/openresolv/patches/SBINDIR-instead-of-PREFIX-sbin.patch +++ b/srcpkgs/openresolv/patches/SBINDIR-instead-of-PREFIX-sbin.patch @@ -1,7 +1,7 @@ diff --git a/Makefile b/Makefile index 7865a5f..0e4780f 100644 ---- a/Makefile -+++ b/Makefile +--- Makefile ++++ Makefile @@ -17,7 +17,7 @@ TARGET= ${RESOLVCONF} ${SUBSCRIBERS} SRCS= ${TARGET:C,$,.in,} # pmake SRCS:= ${TARGET:=.in} # gmake @@ -22,8 +22,8 @@ index 7865a5f..0e4780f 100644 diff --git a/dnsmasq.in b/dnsmasq.in index 96b5593..542acaa 100644 ---- a/dnsmasq.in -+++ b/dnsmasq.in +--- dnsmasq.in ++++ dnsmasq.in @@ -29,7 +29,7 @@ [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 . "@SYSCONFDIR@/resolvconf.conf" || exit 1 @@ -44,8 +44,8 @@ index 96b5593..542acaa 100644 changed=false diff --git a/libc.in b/libc.in index c4233d5..945efc8 100644 ---- a/libc.in -+++ b/libc.in +--- libc.in ++++ libc.in @@ -97,7 +97,7 @@ fi : ${resolv_conf:=/etc/resolv.conf} : ${libc_service:=nscd} @@ -66,8 +66,8 @@ index c4233d5..945efc8 100644 newns= diff --git a/named.in b/named.in index 1ee3abc..43ceabb 100644 ---- a/named.in -+++ b/named.in +--- named.in ++++ named.in @@ -29,7 +29,7 @@ [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 . "@SYSCONFDIR@/resolvconf.conf" || exit 1 @@ -88,8 +88,8 @@ index 1ee3abc..43ceabb 100644 # 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 ---- a/pdnsd.in -+++ b/pdnsd.in +--- pdnsd.in ++++ pdnsd.in @@ -29,7 +29,7 @@ [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 . "@SYSCONFDIR@/resolvconf.conf" || exit 1 @@ -110,8 +110,8 @@ index 0a0241a..4c14c3c 100644 if [ -n "$pdnsd_resolv" ]; then diff --git a/unbound.in b/unbound.in index 4ee0da7..633c7f0 100644 ---- a/unbound.in -+++ b/unbound.in +--- unbound.in ++++ unbound.in @@ -29,7 +29,7 @@ [ -f "@SYSCONFDIR@"/resolvconf.conf ] || exit 0 . "@SYSCONFDIR@/resolvconf.conf" || exit 1 diff --git a/srcpkgs/openresolv/patches/dnsmasq.patch b/srcpkgs/openresolv/patches/dnsmasq.patch index c730dd30849..741884d7bd8 100644 --- a/srcpkgs/openresolv/patches/dnsmasq.patch +++ b/srcpkgs/openresolv/patches/dnsmasq.patch @@ -1,7 +1,7 @@ diff --git i/dnsmasq.in w/dnsmasq.in index 96b5593..384d9df 100644 ---- i/dnsmasq.in -+++ w/dnsmasq.in +--- dnsmasq.in ++++ dnsmasq.in @@ -33,10 +33,9 @@ NL=" " @@ -25,8 +25,8 @@ index 96b5593..384d9df 100644 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 +--- resolvconf.conf.5.in ++++ resolvconf.conf.5.in @@ -215,8 +215,8 @@ variables, documented below. Location of the dnsmasq service. .It Sy dnsmasq_restart @@ -53,8 +53,8 @@ index 81fe154..9b4f1bd 100644 and diff --git i/unbound.in w/unbound.in index 4ee0da7..5e4a326 100644 ---- i/unbound.in -+++ w/unbound.in +--- unbound.in ++++ unbound.in @@ -33,9 +33,8 @@ NL=" " diff --git a/srcpkgs/openresolv/template b/srcpkgs/openresolv/template index 26f9199d127..c7faccadc32 100644 --- a/srcpkgs/openresolv/template +++ b/srcpkgs/openresolv/template @@ -11,6 +11,7 @@ license="BSD" homepage="http://roy.marples.name/projects/openresolv/wiki" distfiles="http://roy.marples.name/downloads/$pkgname/$pkgname-$version.tar.bz2" checksum=ab91fce9053ac653379155aaa6f1b912c0e117d8c55c91a908133ea26004c446 +makedepends="systemd" do_install() { make DESTDIR=$DESTDIR install