main/openrc: upgrade to 0.35.5

3 files changed, 11 insertions, 48 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 1c9f12c1a3..7ea880829d 100644
--- a/main/openrc/0002-force-root-be-rw-before-localmount.patch
+++ b/main/openrc/0002-force-root-be-rw-before-localmount.patch
@@ -1,30 +1,22 @@
-From 228df9f1f21e08ec659d5fcf1f716393e563a3a5 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
+Date: Tue, 3 Apr 2018 17:11:15 +0200
+Subject: [PATCH] force root be rw before localmount
 
 The service that pulls in root remount is mtab which we dont need/use.
----
- init.d/localmount.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/init.d/localmount.in b/init.d/localmount.in
-index 9c8da2d0..c349c951 100644
 --- a/init.d/localmount.in
 +++ b/init.d/localmount.in
-@@ -13,9 +13,9 @@ description="Mounts disks and swap according to /etc/fstab."
+@@ -13,9 +13,9 @@
  
  depend()
  {
 -	need fsck
--	use lvm modules mtab root
--	after lvm modules root
+-	use lvm modules root
+-	after clock lvm modules root
 +	need fsck root
-+	use lvm modules mtab
-+	after lvm modules
++	use lvm modules
++	after clock lvm modules
  	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
  }
  
--- 
-2.11.1
-
diff --git a/main/openrc/0006-mount-efivars-read-only.patch b/main/openrc/0006-mount-efivars-read-only.patch
deleted file mode 100644
index ec2321dd23..0000000000
--- a/main/openrc/0006-mount-efivars-read-only.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
-unintentional writes to efivars may result in bricked hardware. mount it
-read-only to play safe.
----
- init.d/sysfs.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init.d/sysfs.in b/init.d/sysfs.in
-index e493f584..bfd0d438 100644
---- a/init.d/sysfs.in
-+++ b/init.d/sysfs.in
-@@ -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.1
-
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index c29af3ff9a..425097cafb 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.24.1
+pkgver=0.35.5
 _ver=${pkgver/_git*/}
-pkgrel=6
+pkgrel=0
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://gitweb.gentoo.org/proj/openrc.git"
 arch="all"
@@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	0003-sysctl-add-compatibility-for-busybox-sysctl.patch
 	0004-hide-error-when-migrating-var-run-to-run.patch
 	0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-	0006-mount-efivars-read-only.patch
 	0007-make-consolefont-service-compatible-with-busyboxs-se.patch
 	0001-fsck-don-t-add-C0-to-busybox-fsck.patch
 
@@ -77,13 +76,12 @@ package() {
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
 }
 
-sha512sums="8d2aec029cb675ae5d446fe4a2f9613fac2fc5ea74b091d93e62b1f7bd4f8e3a96893bafa39a301129dad4623cc30acdcfd9e383a74f98c69f29820adb6d9aa0  openrc-0.24.1.tar.gz
+sha512sums="655a0a32650ed46998ae84473e8a82aadd9de09904c5173cd9b9e2500fc8935e96539672b513a883c077ae862ece12ab768d4f379dbeb4389a7067ce7121dc0d  openrc-0.35.5.tar.gz
 71fce711adbcb411189a089f1d49567c50348e12c42b7a9c9b582dae5d18051f88ccf81c768337e87d6792d953e84d1e8b93d7978a1947d7d20ef3b1cd330875  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
-aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52ee8736c22d7e90375930d4bb5c66af3519d8e46590df00fe1  0002-force-root-be-rw-before-localmount.patch
+b1cedd38badda4fc308decdff06f9644b96fe35617792da8d6d62407409841705fd71b5b57d1804a6395095604a70898f80830c76395ec99f715038a0809d815  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
-7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3  0006-mount-efivars-read-only.patch
 234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59  0007-make-consolefont-service-compatible-with-busyboxs-se.patch
 dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a5eea3c764ad0e4c802e19b95b7082a72d423d46d30c18edd  0001-fsck-don-t-add-C0-to-busybox-fsck.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate