aboutsummaryrefslogtreecommitdiffstats
path: root/main/openrc
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-09-19 13:30:41 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-09-19 13:33:29 +0000
commit5c2655f779f788dc3f98cb7db99989f05b89de67 (patch)
tree124d55ce582e4fd32d40fff47a59c486c99ca233 /main/openrc
parent4e33fa86e2a671d636d4a1f05a695f41653f8a32 (diff)
downloadaports-5c2655f779f788dc3f98cb7db99989f05b89de67.tar.bz2
aports-5c2655f779f788dc3f98cb7db99989f05b89de67.tar.xz
main/openrc: upgrade to 0.10.5
Diffstat (limited to 'main/openrc')
-rw-r--r--main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch38
-rw-r--r--main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch29
-rw-r--r--main/openrc/APKBUILD16
-rw-r--r--main/openrc/hwclock-hctosys.patch15
-rw-r--r--main/openrc/remove-rc_sys-warning.patch10
-rw-r--r--main/openrc/swap-umount-tmpfs.patch6
6 files changed, 7 insertions, 107 deletions
diff --git a/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch b/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
deleted file mode 100644
index f79d62cfb4..0000000000
--- a/main/openrc/0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d1cb63729cb64cd3aebb14f00eaa8f03b90a57fe Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 9 Mar 2011 18:07:39 +0000
-Subject: [PATCH] fsck: add -C0 and -T options unless fsck is busybox
-
----
- init.d/fsck.in | 8 +++++++-
- 1 files changed, 7 insertions(+), 1 deletions(-)
-
-diff --git a/init.d/fsck.in b/init.d/fsck.in
-index de44ea8..3b55fbd 100644
---- a/init.d/fsck.in
-+++ b/init.d/fsck.in
-@@ -30,6 +30,10 @@ _forcefsck()
- [ -e /forcefsck ] || get_bootparam forcefsck
- }
-
-+_fsck_is_busybox() {
-+ [ -L /sbin/fsck ] && [ "$(readlink -f /sbin/fsck)" = "/bin/busybox" ]
-+}
-+
- start()
- {
- local fsck_opts= p= check_extra=
-@@ -60,7 +64,9 @@ start()
- done
-
- if [ "$RC_UNAME" = Linux ]; then
-- fsck_opts="$fsck_opts -C0 -T"
-+ if ! _fsck_is_busybox; then
-+ fsck_opts="$fsck_opts -C0 -T"
-+ fi
- if [ -z "$fsck_passno" -a -z "$fsck_mnt" ]; then
- fsck_args=${fsck_args--A -p}
- if echo 2>/dev/null >/.test.$$; then
---
-1.7.4.1
-
diff --git a/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch b/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch
deleted file mode 100644
index 5f92c755a0..0000000000
--- a/main/openrc/0001-sysctl-Use-dev-null-instead-of-q.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 73559a25e0fb484fc3ba42f1796b9b2b46128714 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Aug 2011 06:35:44 +0000
-Subject: [PATCH] sysctl: Use /dev/null instead of -q
-
-Busybox sysctl has no -q option so use /dev/null instead.
----
- init.d/sysctl.Linux.in | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
-index 71932fe..9449c5c 100644
---- a/init.d/sysctl.Linux.in
-+++ b/init.d/sysctl.Linux.in
-@@ -18,9 +18,9 @@ start()
- for conf in /etc/sysctl.d/*.conf /etc/sysctl.conf; do
- if [ -r "$conf" ]; then
- vebegin "applying $conf"
-- if ! err=$(sysctl -q -p "$conf" 2>&1) ; then
-+ if ! err=$(sysctl -p "$conf" 2>&1 >/dev/null) ; then
- errs="${errs} ${err}"
-- sysctl -q -e -p "${conf}"
-+ sysctl -e -p "${conf}" >/dev/null
- fi
- veend $? || retval=1
- fi
---
-1.7.6
-
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 4a78481cab..e63cf0767a 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=openrc
-pkgver=0.9.8.4
+pkgver=0.10.5
_ver=${pkgver/_git*/}
-pkgrel=1
+pkgrel=0
pkgdesc="OpenRC manages the services, startup and shutdown of a host"
url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
arch="all"
@@ -14,10 +14,6 @@ source="http://distfiles.gentoo.org/distfiles/$pkgname-$_ver.tar.bz2
openrc-0.4.3-mkmntdirs.patch
0001-Force-root-be-rw-before-localmount.patch
- 0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
- 0001-sysctl-Use-dev-null-instead-of-q.patch
- remove-rc_sys-warning.patch
- hwclock-hctosys.patch
swap-umount-tmpfs.patch
hostname.initd
@@ -65,14 +61,10 @@ package() {
install -d "$pkgdir"/etc/local.d "$pkgdir"/run
}
-md5sums="f4aa96afb9841aa499c29d108694fd2c openrc-0.9.8.4.tar.bz2
+md5sums="720341f7be2ec2f118a792e29e030e2d openrc-0.10.5.tar.bz2
8c2c1c2ee0509b63966b7187a2079f4b openrc-0.4.3-mkmntdirs.patch
4fd036ff07ed9ad7fb76af6a3ffc0695 0001-Force-root-be-rw-before-localmount.patch
-f66dbabe0859abbd4b996c5ba8976b41 0001-fsck-add-C0-and-T-options-unless-fsck-is-busybox.patch
-bc4f9ccd4036f9c458b89afe877fa8c2 0001-sysctl-Use-dev-null-instead-of-q.patch
-2a1749ee829877d80c3696eade59be8a remove-rc_sys-warning.patch
-ce6ccda132e579cd2464b8f72daa3d2e hwclock-hctosys.patch
-ddb34ea87994df3126f5e6b7e8f9ac93 swap-umount-tmpfs.patch
+c2af5e52da614a6cef02d1e4d537e360 swap-umount-tmpfs.patch
c32e15b0858eef708497e7ee6355a055 hostname.initd
78e9f0df010ac8095c5e76a91a1d3b12 hwdrivers.initd
33ca3e558c42cdd17adccbc7807298f7 keymaps.initd
diff --git a/main/openrc/hwclock-hctosys.patch b/main/openrc/hwclock-hctosys.patch
deleted file mode 100644
index 6302da3e87..0000000000
--- a/main/openrc/hwclock-hctosys.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- openrc-0.8.2.orig/init.d/hwclock.in
-+++ openrc-0.8.2/init.d/hwclock.in
-@@ -94,11 +94,7 @@
- "$utc_cmd" != --utc -o \
- -n "$clock_args" ];
- then
-- if yesno $clock_hctosys; then
-- _hwclock --hctosys $utc_cmd $clock_args
-- else
-- _hwclock --systz $utc_cmd $clock_args
-- fi
-+ _hwclock --hctosys $utc_cmd $clock_args
- : $(( retval += $? ))
- fi
-
diff --git a/main/openrc/remove-rc_sys-warning.patch b/main/openrc/remove-rc_sys-warning.patch
deleted file mode 100644
index 4f11674888..0000000000
--- a/main/openrc/remove-rc_sys-warning.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/rc/rc.c.orig
-+++ ./src/rc/rc.c
-@@ -878,7 +878,6 @@
- if (bootlevel)
- printf("%s\n", bootlevel);
- } else {
-- ewarn("WARNING: rc_sys not defined in rc.conf. Falling back to automatic detection");
- bootlevel = rc_sys_v1();
- if (bootlevel)
- printf("%s\n", bootlevel);
diff --git a/main/openrc/swap-umount-tmpfs.patch b/main/openrc/swap-umount-tmpfs.patch
index d68165c77a..1982d4ea73 100644
--- a/main/openrc/swap-umount-tmpfs.patch
+++ b/main/openrc/swap-umount-tmpfs.patch
@@ -1,11 +1,11 @@
diff --git a/init.d/swap.in b/init.d/swap.in
-index fef8ab3..c540bc2 100644
+index fa08b4d..e358266 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
-@@ -24,8 +24,10 @@ stop()
+@@ -25,8 +25,10 @@ stop()
# Try to unmount all tmpfs filesystems not in use, else a deadlock may
- # occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+ # occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
- cd "$RC_SVCDIR"
- umount -a -t tmpfs 2>/dev/null
+ if [ "$RC_RUNLEVEL" = "shutdown" ]; then