main/openrc: upgrade to 0.24.1

3 files changed, 29 insertions, 61 deletions

diff --git a/main/openrc/0002-force-root-be-rw-before-localmount.patch b/main/openrc/0002-force-root-be-rw-before-localmount.patch
index 5ee5de8b80..be530bf4ed 100644
--- a/main/openrc/0002-force-root-be-rw-before-localmount.patch
+++ b/main/openrc/0002-force-root-be-rw-before-localmount.patch
@@ -1,26 +1,28 @@
-From f0f00e6845edaf75e8b8d5f4ca49035d0ee657cb Mon Sep 17 00:00:00 2001
+From 20603f90e49d0000babe6529a5d9b567b4e5f6b0 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Wed, 1 Feb 2017 04:05:44 +0000
 Subject: [PATCH 2/7] force root be rw before localmount
 
 The service that pulls in root remount is mtab which we dont need/use.
 ---
- init.d/localmount.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ init.d/localmount.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/init.d/localmount.in b/init.d/localmount.in
-index 3dbb375b..c349c951 100644
+index 9c8da2d0..3dbb375b 100644
 --- a/init.d/localmount.in
 +++ b/init.d/localmount.in
-@@ -13,7 +13,7 @@ description="Mounts disks and swap according to /etc/fstab."
- 
+@@ -14,8 +14,8 @@ description="Mounts disks and swap according to /etc/fstab."
  depend()
  {
--	need fsck
-+	need fsck root
- 	use lvm modules mtab
- 	after lvm modules
+ 	need fsck
+-	use lvm modules mtab root
+-	after lvm modules root
++	use lvm modules mtab
++	after lvm modules
  	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
+ }
+ 
 -- 
-2.11.0
+2.11.1
 
diff --git a/main/openrc/0006-mount-efivars-read-only.patch b/main/openrc/0006-mount-efivars-read-only.patch
index 656cefa197..ec2321dd23 100644
--- a/main/openrc/0006-mount-efivars-read-only.patch
+++ b/main/openrc/0006-mount-efivars-read-only.patch
@@ -1,4 +1,4 @@
-From 6658bee44645724c17f6b41ab0cf146e5e0c0248 Mon Sep 17 00:00:00 2001
+From 37feb4b716525f0c5c5469f21686ab4efcf06fab Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
 Date: Wed, 1 Feb 2017 04:18:53 +0000
 Subject: [PATCH 6/7] mount efivars read-only
@@ -10,18 +10,18 @@ read-only to play safe.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/init.d/sysfs.in b/init.d/sysfs.in
-index 6d6ec62c..235aebc3 100644
+index e493f584..bfd0d438 100644
 --- a/init.d/sysfs.in
 +++ b/init.d/sysfs.in
-@@ -111,7 +111,7 @@ mount_misc()
- 			! mountinfo -q /sys/firmware/efi/efivars; then
- 			if grep -qs efivarfs /proc/filesystems; then
- 				ebegin "Mounting efivarfs filesystem"
--				mount -n -t efivarfs -o ${sysfs_opts} \
-+				mount -n -t efivarfs -o ro,${sysfs_opts} \
- 					efivarfs /sys/firmware/efi/efivars
- 				eend $?
- 			fi
+@@ -101,7 +101,7 @@ mount_misc()
+ 	if [ -d /sys/firmware/efi/efivars ] &&
+ 		! mountinfo -q /sys/firmware/efi/efivars; then
+ 		ebegin "Mounting efivarfs filesystem"
+-		mount -n -t efivarfs -o ${sysfs_opts} \
++		mount -n -t efivarfs -o ro,${sysfs_opts} \
+ 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
+ 		eend 0
+ 	fi
 -- 
-2.11.0
+2.11.1
 
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 30628aa8c4..7435bb562d 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.23.2
+pkgver=0.24.1
 _ver=${pkgver/_git*/}
 pkgrel=0
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
@@ -70,47 +70,13 @@ package() {
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
 }
 
-md5sums="0a39c94b4b88faa87fc3a4445757fc94  openrc-0.23.2.tar.gz
-02f4e31e32f9a3e39d18ac584535e085  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-4d9990a419c9482e0c381508a3571f0e  0002-force-root-be-rw-before-localmount.patch
-70c05e5415b5733f075a6e25bf264b8f  0003-sysctl-add-compatibility-for-busybox-sysctl.patch
-1c0fdb51605c1690ae6c81a7913ae8c2  0004-hide-error-when-migrating-var-run-to-run.patch
-4c244568d93ab91117a122f3d26895bf  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-43b372f599764f1054d113b12e33e4f7  0006-mount-efivars-read-only.patch
-9665f09b75a8ce5e0ae53d88fd53daef  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
-d83df5513f08f09fa9e7353327701bf7  openrc.logrotate
-60b4cf93ca19aff577fd743ab42878a8  hostname.initd
-dddb3d66d87e4cc503c8513e7b0e666a  hwdrivers.initd
-41974f5408fd2e92892f891b58f2e49f  keymaps.initd
-1737a6fc5376f924230d173f5c7345d0  modules.initd
-30f26648981f986e502f75f78fa77df8  modloop.initd
-ead05c56ea93a420dd280eba243b5e5b  networking.initd
-c1ec888202d868710b5749f7b217d1e3  modloop.confd
-8a49d8ae0ec6502d0b5ddb568e73138d  sysfsconf.initd"
-sha256sums="244a9902a98694a7fd59ad3dec49bd9e61a6b22864795ed31ef8fc81aa474251  openrc-0.23.2.tar.gz
-0a4edea94da4c7c9e13df8bd7836834e1a29bac9d582295e6a737f5580f47936  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-c495add3bc867604f757df0cbdd0fb486b7a082eeec383065dcd8f478146b6ce  0002-force-root-be-rw-before-localmount.patch
-4e344ea28a77682b576baf1683f145b143529a64f330fe332402b23f4dbf095a  0003-sysctl-add-compatibility-for-busybox-sysctl.patch
-08f6b6e05ed614b5bc750e17fbe97dc14d365d3efdbd24a4aa33a3301c4edc9f  0004-hide-error-when-migrating-var-run-to-run.patch
-4f2c30bd06ec997991057a9e2850d0181163394bf3583fb7b9fec0fedbf1971a  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-87265e603e229bdd07a6be845b69aa38d7e6356830e1d66fc59352ff953c1aa2  0006-mount-efivars-read-only.patch
-20725b5a98da2932db3f5daa5112ab09e590ca0fec4cf8763612b0d6ca046428  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
-30a81fb2f761083088d4d6a3d435fc842966d44588e9837b45ffd03e48be6eb6  openrc.logrotate
-dda515d7d906cebcf4137746939f3fdccc7f504fe097ef1dbf429e3e6773a013  hostname.initd
-381ba933e6bc545a738ca0d12de9052e90381a850c4a5682b8603f00be64ac81  hwdrivers.initd
-32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84  keymaps.initd
-77b377575563df74d0e3fede5e6171c6eeec974fe487d0e47cccc5e0ed60ec2d  modules.initd
-af015110acf1f24024f2c21e69042a5ac313c90c88bfb1a653d03d33721c9929  modloop.initd
-d925fd36f0a5b85bc6fddfc5e4bee0ab2198577944c11c065a9ff551d046529a  networking.initd
-a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd
-63e7b8c3118612d250f55a711c3e8f0fd328ddd54464e50d0425496cc580beb4  sysfsconf.initd"
-sha512sums="6c8483d36812d21ba45bf3c386c6f1c03a9c01c10f48b7e7eb26707d105568b8017ba8a7728a794ac0ac6fedab10cea2bc9587f4d5ddb1957001e03f872e8f18  openrc-0.23.2.tar.gz
+sha512sums="8d2aec029cb675ae5d446fe4a2f9613fac2fc5ea74b091d93e62b1f7bd4f8e3a96893bafa39a301129dad4623cc30acdcfd9e383a74f98c69f29820adb6d9aa0  openrc-0.24.1.tar.gz
 71fce711adbcb411189a089f1d49567c50348e12c42b7a9c9b582dae5d18051f88ccf81c768337e87d6792d953e84d1e8b93d7978a1947d7d20ef3b1cd330875  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-a229dc9e2037a9ab87858f1a8be2a55bfa351125c3051a60a6e9096e6d0d606832766ebe5302aab88ae15e1aa2c416403701e3c283b45ab16f1e458cc3ac40cd  0002-force-root-be-rw-before-localmount.patch
+e6b5d88929feecfa6b8c283ebaae6c2b620d4d8c5ac65a0d4b8d015079bab042fef6b4809140336f3b56e2d238f62805ae73406ff12e89c70a09bc941729a3d2  0002-force-root-be-rw-before-localmount.patch
 9dea3fcdb90e3e8078a771beefeba3ca91b9966a1b8ee9ff96cf460e7dd21abbc4a46a501a960c3edf5a76c083c2cf60ccb06d9da7a4c6df2a50660745beb278  0003-sysctl-add-compatibility-for-busybox-sysctl.patch
 d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738  0004-hide-error-when-migrating-var-run-to-run.patch
 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-af69800eafc08754193833ba06cf20f45c0113715e9f7252eac846fe6bc306a33839d43431b439191667e6f0beb052dc5a2f840325b7cbf270bda014a8ede638  0006-mount-efivars-read-only.patch
+7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3  0006-mount-efivars-read-only.patch
 234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd