main/openrc: use git format-patches as in main/busybox

Don't bump pkgrel since the resulting binary should be identical.

12 files changed, 170 insertions, 111 deletions

diff --git a/main/openrc/0001-Force-root-be-rw-before-localmount.patch b/main/openrc/0001-Force-root-be-rw-before-localmount.patch
deleted file mode 100644
index 3381d9f0dd..0000000000
--- a/main/openrc/0001-Force-root-be-rw-before-localmount.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c92e702f6dddab58a749f5fea5479ff2affeb498 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 21 Dec 2010 10:29:37 +0000
-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 |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init.d/localmount.in b/init.d/localmount.in
-index a4d1116..2895894 100644
---- a/init.d/localmount.in
-+++ b/init.d/localmount.in
-@@ -6,7 +6,7 @@ description="Mounts disks and swap according to /etc/fstab."
- 
- depend()
- {
--	need fsck
-+	need fsck root
- 	use lvm modules mtab
- 	keyword -jail -openvz -prefix -vserver -lxc
- }
--- 
-1.7.3.4
-
diff --git a/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch b/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
new file mode 100644
index 0000000000..5a3eb69190
--- /dev/null
+++ b/main/openrc/0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
@@ -0,0 +1,24 @@
+From 4af966ca19380c00f04e4f7ab88362050a8e6559 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 17 Aug 2016 17:38:20 +0200
+Subject: [PATCH 1/7] call /sbin/mkmntdirs in localmount OpenRC service
+
+---
+ init.d/localmount.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/init.d/localmount.in b/init.d/localmount.in
+index d2c9321..a9bba15 100644
+--- a/init.d/localmount.in
++++ b/init.d/localmount.in
+@@ -21,6 +21,7 @@ depend()
+ 
+ start()
+ {
++	[ -x /sbin/mkmntdirs ] && mkmntdirs
+ 	# Mount local filesystems in /etc/fstab.
+ 	local critical= types="noproc" x= no_netdev= rc=
+ 	for x in $net_fs_list $extra_net_fs_list; do
+-- 
+2.9.3
+
diff --git a/main/openrc/0002-force-root-be-rw-before-localmount.patch b/main/openrc/0002-force-root-be-rw-before-localmount.patch
new file mode 100644
index 0000000000..7c14c94a28
--- /dev/null
+++ b/main/openrc/0002-force-root-be-rw-before-localmount.patch
@@ -0,0 +1,26 @@
+From 485b33d2474c040d433b0e7b6e1b5cc81b280a70 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 17 Aug 2016 17:13:20 +0200
+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(-)
+
+diff --git a/init.d/localmount.in b/init.d/localmount.in
+index a9bba15..ed8fb85 100644
+--- a/init.d/localmount.in
++++ b/init.d/localmount.in
+@@ -13,7 +13,7 @@ description="Mounts disks and swap according to /etc/fstab."
+ 
+ depend()
+ {
+-	need fsck
++	need fsck root
+ 	use lvm modules mtab
+ 	after lvm modules
+ 	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
+-- 
+2.9.3
+
diff --git a/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch b/main/openrc/0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
index 0814876a3a..22f1a626d8 100644
--- a/main/openrc/0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+++ b/main/openrc/0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
@@ -1,7 +1,7 @@
-From cc347f6ddacb3c4f1bfc87b274fef1fd7924a539 Mon Sep 17 00:00:00 2001
+From 67cea9c310c90198f7f788d6ac1a90b8ed57183c Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 28 Apr 2015 12:26:46 +0200
-Subject: [PATCH] sysctl.Linux.in: fix for busybox sysctl
+Date: Wed, 17 Aug 2016 17:14:37 +0200
+Subject: [PATCH 3/7] sysctl.Linux.in: fix for busybox sysctl
 
 busybox sysctl does not support --system
 ---
@@ -9,10 +9,10 @@ busybox sysctl does not support --system
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
-index 186c6ed..ff17892 100644
+index f5e0ab6..e1a1932 100644
 --- a/init.d/sysctl.Linux.in
 +++ b/init.d/sysctl.Linux.in
-@@ -10,10 +10,21 @@ depend()
+@@ -17,10 +17,21 @@ depend()
  
  start()
  {
@@ -38,5 +38,5 @@ index 186c6ed..ff17892 100644
 +	eend $rc "Unable to configure some kernel parameters"
  }
 -- 
-2.4.5
+2.9.3
 
diff --git a/main/openrc/swap-umount-tmpfs.patch b/main/openrc/0004-swap-only-unmount-tmpfs-when-shutting-down.patch
index 1982d4ea73..5d19293f05 100644
--- a/main/openrc/swap-umount-tmpfs.patch
+++ b/main/openrc/0004-swap-only-unmount-tmpfs-when-shutting-down.patch
@@ -1,8 +1,18 @@
+From 751d17bcdb7306f46179b403cfafc88c39bf3b25 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 17 Aug 2016 17:15:25 +0200
+Subject: [PATCH 4/7] swap: only unmount tmpfs when shutting down
+
+http://bugs.alpinelinux.org/issues/711
+---
+ init.d/swap.in | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
 diff --git a/init.d/swap.in b/init.d/swap.in
-index fa08b4d..e358266 100644
+index 4fb2b35..093d19f 100644
 --- a/init.d/swap.in
 +++ b/init.d/swap.in
-@@ -25,8 +25,10 @@ stop()
+@@ -32,8 +32,10 @@ stop()
  
  	# Try to unmount all tmpfs filesystems not in use, else a deadlock may
  	# occur. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
@@ -15,3 +25,6 @@ index fa08b4d..e358266 100644
  
  	case "$RC_UNAME" in
  		NetBSD|OpenBSD)	swapctl -U -t noblk >/dev/null;;
+-- 
+2.9.3
+
diff --git a/main/openrc/0005-hide-error-when-migrating-var-run-to-run.patch b/main/openrc/0005-hide-error-when-migrating-var-run-to-run.patch
new file mode 100644
index 0000000000..bc096195d6
--- /dev/null
+++ b/main/openrc/0005-hide-error-when-migrating-var-run-to-run.patch
@@ -0,0 +1,28 @@
+From 1cbf5a9babbe35de0791c6ccc7e02c3553682300 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 17 Aug 2016 17:18:21 +0200
+Subject: [PATCH 5/7] hide error when migrating /var/run to /run
+
+The script tries to copy non-existing files. We simply hide the error
+
+http://bugs.alpinelinux.org/issues/3160
+---
+ init.d/bootmisc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
+index efc1c57..6e473ad 100644
+--- a/init.d/bootmisc.in
++++ b/init.d/bootmisc.in
+@@ -112,7 +112,7 @@ migrate_to_run()
+  		rm $src
+  	elif [ ! -L $src -a -d $src ]; then
+  		ebegin "Migrating $src to $dst"
+- 		cp -a $src/* $dst/
++ 		cp -a $src/* $dst/ 2>/dev/null
+  		rm -rf $src
+  		eend $?
+  	fi
+-- 
+2.9.3
+
diff --git a/main/openrc/rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch b/main/openrc/0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
index b8776553a1..b31d7b34d5 100644
--- a/main/openrc/rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
+++ b/main/openrc/0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
@@ -1,7 +1,8 @@
-From fbbad65b293c2254edcdfab0171bbe204464d503 Mon Sep 17 00:00:00 2001
+From 284053cf953511fd4c5c2d0da144e623fd92cdb7 Mon Sep 17 00:00:00 2001
 From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 14 May 2015 18:52:07 +0000
-Subject: [PATCH] rc: pull in sysinit and boot as stacked levels when needed
+Date: Wed, 17 Aug 2016 17:19:20 +0200
+Subject: [PATCH 6/7] rc: pull in sysinit and boot as stacked levels when
+ needed
 
 We need start services from sysinit and boot runlevel, even if the new
 runlevel is empty.
@@ -20,18 +21,18 @@ Fixes issue #54.
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/rc/rc.c b/src/rc/rc.c
-index dd35482..4edb539 100644
+index ed06bf7..a9cfd11 100644
 --- a/src/rc/rc.c
 +++ b/src/rc/rc.c
-@@ -757,6 +757,7 @@ main(int argc, char **argv)
- 	static RC_STRINGLIST *types_n;
- 	static RC_STRINGLIST *types_nua;
+@@ -741,6 +741,7 @@ int main(int argc, char **argv)
+ 	static RC_STRINGLIST *types_nw;
+ 	static RC_STRINGLIST *types_nwua;
  	static RC_DEPTREE *deptree;
 +	RC_STRINGLIST *runlevel_chain;
  	RC_STRINGLIST *deporder = NULL;
  	RC_STRINGLIST *tmplist;
  	RC_STRING *service;
-@@ -1016,6 +1017,7 @@ main(int argc, char **argv)
+@@ -996,6 +997,7 @@ int main(int argc, char **argv)
  	hotplugged_services = rc_services_in_state(RC_SERVICE_HOTPLUGGED);
  	start_services = rc_services_in_runlevel_stacked(newlevel ?
  	    newlevel : runlevel);
@@ -39,7 +40,7 @@ index dd35482..4edb539 100644
  	if (strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SHUTDOWN) != 0 &&
  	    strcmp(newlevel ? newlevel : runlevel, RC_LEVEL_SYSINIT) != 0)
  	{
-@@ -1033,6 +1035,7 @@ main(int argc, char **argv)
+@@ -1013,6 +1015,7 @@ int main(int argc, char **argv)
  				tmplist = rc_services_in_runlevel(bootlevel);
  				TAILQ_CONCAT(start_services, tmplist, entries);
  				free(tmplist);
@@ -47,7 +48,7 @@ index dd35482..4edb539 100644
  			}
  			if (hotplugged_services) {
  				TAILQ_FOREACH(service, hotplugged_services,
-@@ -1041,6 +1044,7 @@ main(int argc, char **argv)
+@@ -1021,6 +1024,7 @@ int main(int argc, char **argv)
  					service->value);
  			}
  		}
@@ -55,7 +56,7 @@ index dd35482..4edb539 100644
  	}
  
  	parallel = rc_conf_yesno("rc_parallel");
-@@ -1097,9 +1101,6 @@ main(int argc, char **argv)
+@@ -1077,9 +1081,6 @@ int main(int argc, char **argv)
  
  	/* If we have a list of services to start then... */
  	if (start_services) {
@@ -65,3 +66,6 @@ index dd35482..4edb539 100644
  		/* Loop through them in reverse order. */
  		RC_STRING *rlevel;
  		TAILQ_FOREACH_REVERSE(rlevel, runlevel_chain, rc_stringlist, entries)
+-- 
+2.9.3
+
diff --git a/main/openrc/0007-mount-efivars-read-only.patch b/main/openrc/0007-mount-efivars-read-only.patch
new file mode 100644
index 0000000000..fccd39ffca
--- /dev/null
+++ b/main/openrc/0007-mount-efivars-read-only.patch
@@ -0,0 +1,27 @@
+From 79ec18e070f7ff4a93c5f8bd4d821eee7c21558f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 17 Aug 2016 17:20:15 +0200
+Subject: [PATCH 7/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 6929810..3e4c26c 100644
+--- a/init.d/sysfs.in
++++ b/init.d/sysfs.in
+@@ -105,7 +105,7 @@ mount_misc()
+ 		modprobe -q efivarfs
+ 		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
+-- 
+2.9.3
+
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 5022f8eeaa..55ef37eb83 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -11,15 +11,15 @@ depends=""
 makedepends="bsd-compat-headers"
 subpackages="$pkgname-doc $pkgname-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
-source="openrc-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver.tar.gz
-	openrc-0.4.3-mkmntdirs.patch
+source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver.tar.gz
 
-	0001-Force-root-be-rw-before-localmount.patch
-	0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
-	swap-umount-tmpfs.patch
-	hide-migrate-to-run-error.patch
-	rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
-	read-only-efivars.patch
+	0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+	0002-force-root-be-rw-before-localmount.patch
+	0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+	0004-swap-only-unmount-tmpfs-when-shutting-down.patch
+	0005-hide-error-when-migrating-var-run-to-run.patch
+	0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+	0007-mount-efivars-read-only.patch
 
 	openrc.logrotate
 	hostname.initd
@@ -73,13 +73,13 @@ package() {
 }
 
 md5sums="a93cb29a001d7439b0e85596bd325717  openrc-0.21.3.tar.gz
-8c2c1c2ee0509b63966b7187a2079f4b  openrc-0.4.3-mkmntdirs.patch
-4fd036ff07ed9ad7fb76af6a3ffc0695  0001-Force-root-be-rw-before-localmount.patch
-f5bcedf55f440767a0b93d9f9cd2860d  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
-c2af5e52da614a6cef02d1e4d537e360  swap-umount-tmpfs.patch
-679c559aa54f9e855cd735866eeaaad6  hide-migrate-to-run-error.patch
-db45dc04a50d48a0c377e9de3ee0008b  rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
-1f4d1fed897e8dd42b459952c63933d2  read-only-efivars.patch
+ac16fca77d315dd92ef39db43dd2b39c  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+58f42bb7ba1eb8bfc07554dc150a8a6c  0002-force-root-be-rw-before-localmount.patch
+04bcb11513ad0178fc00508f288b2160  0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+9fc84b1130c7a0ad93553c8808af1476  0004-swap-only-unmount-tmpfs-when-shutting-down.patch
+2ba09bebca524be06bd2ba9eeabd1be6  0005-hide-error-when-migrating-var-run-to-run.patch
+f402d67b185803ea899053c3bccfc87c  0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+63a6b0e12a5c71d66c1dcb64bc907b6d  0007-mount-efivars-read-only.patch
 d83df5513f08f09fa9e7353327701bf7  openrc.logrotate
 60b4cf93ca19aff577fd743ab42878a8  hostname.initd
 887eba592d487d6ffe2b42cfcd2813df  hwdrivers.initd
@@ -92,13 +92,13 @@ cb8760df99ddd78ba686522168854535  consolefont.initd
 1c629807d282ca1dc73ffe55c29146ef  consolefont.confd
 8a49d8ae0ec6502d0b5ddb568e73138d  sysfsconf.initd"
 sha256sums="cf9a3e2056c88243ab01b817f1d4073c7f7019670e7998777632c9017886aceb  openrc-0.21.3.tar.gz
-c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1  openrc-0.4.3-mkmntdirs.patch
-e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066  0001-Force-root-be-rw-before-localmount.patch
-bdccc12593d9bb9df6fcff57a56e4100ae43e052d6eff87f561966653ca071dc  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
-84d67ed2cf050e20f52d4ea048e7452e78356ba02b396d8c064a4458c0811ea4  swap-umount-tmpfs.patch
-786580df90a5a75087e5adfd395d160dee2df4b994e0938e8524198aeaf2d774  hide-migrate-to-run-error.patch
-cb4ff88875c0125b68fe567cc41b42743499bbdc90a5c9dfe2b92883b5b05111  rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
-61abfab5a0100ea1ea706bf50712cb38f107516c2856a1278fb9364bdde216c0  read-only-efivars.patch
+9dc7b80480ea8c54fe4fd3967098906d3c535ff420879bb5d8d646e5f7f627bf  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+28648317df903af33e369397f52285f8a865b6151f8a89f4d490e28bcebf13b0  0002-force-root-be-rw-before-localmount.patch
+d6418b65b9f2f8f31f7b87fb5a3d38baf836b4eed6544f2a6a2b980fd6cc30dd  0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+6fe8105fe7b18f8d529ee07b4ec53985db84b141cbf5f675c242e09d8c8ebc3b  0004-swap-only-unmount-tmpfs-when-shutting-down.patch
+47188ade6627eeadcd9934976f131b7dea574192219be895a9802f6c24d56e09  0005-hide-error-when-migrating-var-run-to-run.patch
+0447481a30d1af83293861cf53eef9b0b241d02eeb015e2d10b310acea126c9b  0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+cd35c4040a9b21da394c598a8996390dab1c520e93e84707014094ab82827163  0007-mount-efivars-read-only.patch
 30a81fb2f761083088d4d6a3d435fc842966d44588e9837b45ffd03e48be6eb6  openrc.logrotate
 dda515d7d906cebcf4137746939f3fdccc7f504fe097ef1dbf429e3e6773a013  hostname.initd
 6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236  hwdrivers.initd
@@ -111,13 +111,13 @@ a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd
 9010b94892280f0bb42be39c0e989a70439eb97cbfe2a7a41a32df9a3035b8c2  consolefont.confd
 63e7b8c3118612d250f55a711c3e8f0fd328ddd54464e50d0425496cc580beb4  sysfsconf.initd"
 sha512sums="1c0683fa86ab9e32a1102fccfdd8f149f670f9f4bd96e0c84405f4132a400a0634d677ba43cdd2af6721b4472cfe5f5540d0af465e3dc8e8cb9c81546dc222d6  openrc-0.21.3.tar.gz
-eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db  openrc-0.4.3-mkmntdirs.patch
-51c77be5ab726d50ef1d0b9dab644edef1ff739e855e3a12ab27beada8911998e0c6a7491eb92df621dcdb633b672d933a4edc00115ec43bdf1271105239ebb7  0001-Force-root-be-rw-before-localmount.patch
-1c01874aebab74c18c70c1869b074ce1069ac43637340097e4f16741bd6b4771bc9506b25482f10e2b597f73ad2ea57434acb61ed38fca72017aed96b13e45fa  0001-sysctl.Linux.in-fix-for-busybox-sysctl.patch
-8fd442d372401740b1c523367c928f49efa8179604aac2b517cdc4264daf303056d5a5e0a2c996db5e6ef9b7cdd0619a16cfabc15c3399e322384844e2a36542  swap-umount-tmpfs.patch
-750e3305913d3f6fa6baa0b34b851fe17aacb922e864b95ec9b4b451e8e3c16d0c10686a12f4c7cb9b5d05894e1d89b0dac3beed19b1223d3fbc672f25769145  hide-migrate-to-run-error.patch
-a3c2f419a3d475519cc8f78bd3baa26cae90a492a5fc92308b18931889db10452aa33324cca8489058d2bcf720e67ab9163ada090d3d3f54ab55dbd758901d4a  rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
-2e4c9edb51c4220684ee39102e048df0a6a4f10ddea0e9e5b7f9323240c47181de0048b23fe49c23221f9c78663e7336deb70d9c8eccdc9ce3eb86b51e009f1f  read-only-efivars.patch
+33bb89638bce6908911643d78586bd24b1a009eec0379a6e7b93ea360dda8512de3730583d177f68f81b6777d6c4ef5a70f1731ad040826f1133c9345486e5d8  0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch
+a7468878fdb47de7b0e26eb5a664401e914332e173c5c0a4a3b50ac40f4f20ba750da9600bf1521501d5a5e73ac5f9f17254ccfd17ab6bdcbc8c04fce2a4ef68  0002-force-root-be-rw-before-localmount.patch
+4d790d2e0b2ff05580f7481a800e8b77fd7015218d3177e156710e9470ee5b29a0a1c97d5af4ce3a4f5cf7724b67c0eb02cf8c87f3ed82b090b95914d8d9bde8  0003-sysctl.Linux.in-fix-for-busybox-sysctl.patch
+e68933f16a2112fdf41bf9827266dd776801656a656fb961c17bb5eaf483e4791e46594b6b47b221a826a83a76e51cd0ec2f0f74c3c6b4b3ac0c0c96ff2f53f1  0004-swap-only-unmount-tmpfs-when-shutting-down.patch
+c70d0bb6c8149c370231ef875d37fcfc77a3a6b0511252161abd9c5141bd14d2e12ae74f208f9b8e26057579cb732dad71ce7c1731d79273634d4d69f412565f  0005-hide-error-when-migrating-var-run-to-run.patch
+769712a6ad7d401a03b15a29dbe5cb62e67e289a5ff252b470b43a265c7cd51a8bb4819d645c29eb10abdf39d9f705173d1b53d23608f638be7917a6d83a7fc7  0006-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
+e1d23634e7b6d68c488efefa5a4c5b1ca59385eaab298bd3ac88903f60dd5b20d634da4c837c5a2fed012ec8b07894547984c0646aef7a3b2ab41250e778a874  0007-mount-efivars-read-only.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd
 b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b  hwdrivers.initd
diff --git a/main/openrc/hide-migrate-to-run-error.patch b/main/openrc/hide-migrate-to-run-error.patch
deleted file mode 100644
index 00e529930f..0000000000
--- a/main/openrc/hide-migrate-to-run-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-See http://bugs.alpinelinux.org/issues/3160
-
---- openrc-0.12.4.orig/init.d/bootmisc.in
-+++ openrc-0.12.4/init.d/bootmisc.in
-@@ -105,7 +105,7 @@
-  		rm $src
-  	elif [ ! -L $src -a -d $src ]; then
-  		ebegin "Migrating $src to $dst"
-- 		cp -a $src/* $dst/
-+ 		cp -a $src/* $dst/ 2>/dev/null
-  		rm -rf $src
-  		eend $?
-  	fi
diff --git a/main/openrc/openrc-0.4.3-mkmntdirs.patch b/main/openrc/openrc-0.4.3-mkmntdirs.patch
deleted file mode 100644
index 01512ad7c0..0000000000
--- a/main/openrc/openrc-0.4.3-mkmntdirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru openrc-0.4.3.orig/init.d/localmount.in openrc-0.4.3/init.d/localmount.in
---- openrc-0.4.3.orig/init.d/localmount.in	2009-04-19 14:24:11.000000000 +0000
-+++ openrc-0.4.3/init.d/localmount.in	2009-04-19 14:25:06.000000000 +0000
-@@ -13,6 +13,7 @@
- 
- start()
- {
-+	[ -x /sbin/mkmntdirs ] && mkmntdirs
- 	# Mount local filesystems in /etc/fstab.
- 	local types="noproc" x=
- 	for x in ${net_fs_list}; do
diff --git a/main/openrc/read-only-efivars.patch b/main/openrc/read-only-efivars.patch
deleted file mode 100644
index 5311ff8aa9..0000000000
--- a/main/openrc/read-only-efivars.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/init.d/sysfs.in b/init.d/sysfs.in
-index 4f214f6..759f246 100644
---- a/init.d/sysfs.in
-+++ b/init.d/sysfs.in
-@@ -96,7 +96,7 @@ mount_misc()
- 		modprobe -q efivarfs
- 		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