summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2015-10-17 05:17:57 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2015-10-17 05:17:57 -0500
commit84ecdfa61301631f0b8a27eb307ceb933df24114 (patch)
tree3a3fa987e071c45ed482a3cffd9f5b92f50a5a26
parentdf6df7398acd8488c544e0abd6de1511bbc1ee69 (diff)
downloadabslibre-84ecdfa61301631f0b8a27eb307ceb933df24114.tar.gz
abslibre-84ecdfa61301631f0b8a27eb307ceb933df24114.tar.bz2
abslibre-84ecdfa61301631f0b8a27eb307ceb933df24114.zip
openresolv-openrc-3.7.0-1: updating version
-rw-r--r--pcr/openresolv-openrc/PKGBUILD18
-rw-r--r--pcr/openresolv-openrc/fs33801.patch49
2 files changed, 34 insertions, 33 deletions
diff --git a/pcr/openresolv-openrc/PKGBUILD b/pcr/openresolv-openrc/PKGBUILD
index 02bf2886c..b424f189e 100644
--- a/pcr/openresolv-openrc/PKGBUILD
+++ b/pcr/openresolv-openrc/PKGBUILD
@@ -1,32 +1,33 @@
-# Maintainer : freaj <freaj@riseup.net>
+# $Id$
# Contributor (Manjaro): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor (Manjaro): Ignacio Galmarino <igalmarino@gmail.com>
-# Maintainer (Manjaro): Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Maintainer (Manjaro): Aaditya Bagga <aaditya_gnulinux@zoho.com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
pkgname=openresolv-openrc
_pkgname=openresolv
-pkgver=3.6.1
-pkgrel=6
+pkgver=3.7.0
+pkgrel=1
pkgdesc="resolv.conf management framework (resolvconf)"
arch=(any)
url="http://roy.marples.name/projects/openresolv"
license=('custom:BSD')
backup=(etc/resolvconf.conf)
-depends=(bash openrc-core)
+depends=(bash openrc)
provides=(openresolv)
conflicts=(openresolv)
source=("http://roy.marples.name/downloads/openresolv/${_pkgname}-${pkgver}.tar.bz2"
fs33801.patch
openrc-path.patch)
-sha1sums=('03bbbe32e3763ed3a17f83c500469ddc5969bbe7'
- '7d68b36dfd6c8f01f9bf21a726e82d4cffb48bca'
+sha1sums=('59ed4fee1cc38211abd5cb7b8f30764687ed2c3f'
+ '729daba4e6feb8e60acaefd4a72515d34cee0f91'
'69177771673976506c24b4dfb88fa15fadd36077')
prepare() {
cd $_pkgname-$pkgver
patch -Np1 -i ../fs33801.patch
# For openrc path
patch -Np1 -i ../openrc-path.patch
- sed -n '2,25{s:^# \?::;p}' resolvconf.in >LICENSE
+ sed -n '2,25{s:^# \?::;p}' resolvconf.in >LICENSE
}
build() {
@@ -40,4 +41,3 @@ package() {
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
}
-
diff --git a/pcr/openresolv-openrc/fs33801.patch b/pcr/openresolv-openrc/fs33801.patch
index 53b44e4f8..16aeab33a 100644
--- a/pcr/openresolv-openrc/fs33801.patch
+++ b/pcr/openresolv-openrc/fs33801.patch
@@ -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.000000000 +0100
-+++ openresolv-3.6.1-arch/configure 2015-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.000000000 +0200
++++ openresolv-3.7.0-arch/configure 2015-05-08 00:31:41.584051126 +0200
@@ -7,6 +7,7 @@
HOST=
TARGET=
@@ -78,7 +78,7 @@ diff -u -r openresolv-3.6.1/configure openresolv-3.6.1-arch/configure
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 @@ diff -u -r openresolv-3.6.1/configure openresolv-3.6.1-arch/configure
+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.in 2014-10-28 23:03:14.000000000 +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.in 2015-05-01 20:11:09.000000000 +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 @@ diff -u -r openresolv-3.6.1/dnsmasq.in openresolv-3.6.1-arch/dnsmasq.in
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.000000000 +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.000000000 +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 @@ diff -u -r openresolv-3.6.1/Makefile openresolv-3.6.1-arch/Makefile
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 @@ diff -u -r openresolv-3.6.1/Makefile openresolv-3.6.1-arch/Makefile
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 @@ diff -u -r openresolv-3.6.1/Makefile openresolv-3.6.1-arch/Makefile
$< > $@
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.000000000 +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.000000000 +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 @@ diff -u -r openresolv-3.6.1/resolvconf.8.in openresolv-3.6.1-arch/resolvconf.8.i
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.000000000 +0100
-+++ openresolv-3.6.1-arch/resolvconf.conf.5.in 2015-01-01 12:20:34.882452568 +0100
+diff -u -r openresolv-3.7.0/resolvconf.conf.5.in openresolv-3.7.0-arch/resolvconf.conf.5.in
+--- openresolv-3.7.0/resolvconf.conf.5.in 2015-05-01 20:11:09.000000000 +0200
++++ openresolv-3.7.0-arch/resolvconf.conf.5.in 2015-05-08 00:31:41.620717637 +0200
@@ -281,6 +281,8 @@
Command to restart the dnsmasq service.
.It Sy dnsmasq_pid
@@ -193,9 +194,9 @@ diff -u -r openresolv-3.6.1/resolvconf.conf.5.in openresolv-3.6.1-arch/resolvcon
.El
.Sh SEE ALSO
.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
+diff -u -r openresolv-3.7.0/unbound.in openresolv-3.7.0-arch/unbound.in
+--- openresolv-3.7.0/unbound.in 2015-05-01 20:11:09.000000000 +0200
++++ openresolv-3.7.0-arch/unbound.in 2015-05-08 00:31:41.620717637 +0200
@@ -35,9 +35,10 @@
NL="
"