aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2009-09-01 09:42:13 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2009-09-01 09:42:13 +0000
commit3e5560e92f595620d173afcc3c28eb9e67cdfb1a (patch)
treebc6ac9ef6ea1936110be0478b22243dbca268c4b
parentc478877b8a61220b6162a907d55b5474a5993ed8 (diff)
downloadaports-3e5560e92f595620d173afcc3c28eb9e67cdfb1a.tar.bz2
aports-3e5560e92f595620d173afcc3c28eb9e67cdfb1a.tar.xz
main/openrc: backport patch from upstream
-rw-r--r--main/openrc/APKBUILD4
-rw-r--r--main/openrc/dont-provide-ourself.patch14
2 files changed, 17 insertions, 1 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index c0c3ec3b4c..528e1482f3 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openrc
pkgver=0.5.0
-pkgrel=7
+pkgrel=8
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://roy.marples.name/openrc"
license='BSD-2'
@@ -9,6 +9,7 @@ depends=""
subpackages="$pkgname-doc $pkgname-dev"
install="$pkgname.post-install $pkgname.post-upgrade"
source="http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2
+ dont-provide-ourself.patch
openrc-0.4.3-mkmntdirs.patch
openrc-hwclock.patch
hostname.initd
@@ -44,6 +45,7 @@ build() {
}
md5sums="9ec7f8425e12abbbd0f7a962aae3fa3c openrc-0.5.0.tar.bz2
+1bb9c2aec9243a781191efcfc68df8c9 dont-provide-ourself.patch
8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch
f462c976b04cfbb35b2335be15eee7f6 openrc-hwclock.patch
c32e15b0858eef708497e7ee6355a055 hostname.initd
diff --git a/main/openrc/dont-provide-ourself.patch b/main/openrc/dont-provide-ourself.patch
new file mode 100644
index 0000000000..2ff988f7f6
--- /dev/null
+++ b/main/openrc/dont-provide-ourself.patch
@@ -0,0 +1,14 @@
+Index: src/librc/librc-depend.c
+===================================================================
+--- a/src/librc/librc-depend.c (revision b4104957b198b38aba609ed3889e7fa605012d19)
++++ b/src/librc/librc-depend.c (revision 7fbb6ad42742ebc5e6ec244eedc85e9ac0a6236d)
+@@ -802,4 +802,9 @@
+ continue;
+ }
++
++ /* Don't provide ourself */
++ if (strcmp(type, "iprovide") == 0 &&
++ strcmp(depend, service) == 0)
++ continue;
+
+ /* .sh files are not init scripts */