main/openrc: upgrade to 0.20.5

2 files changed, 5 insertions, 38 deletions

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 2236288a1c..ed25c6b426 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openrc
-pkgver=0.20.4
+pkgver=0.20.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"
@@ -21,7 +21,6 @@ source="openrc-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgver.
 	hide-migrate-to-run-error.patch
 	rc-pull-in-sysinit-and-boot-as-stacked-levels-when-needed.patch
 	read-only-efivars.patch
-	fix-rc_env_allow.patch
 
 	openrc.logrotate
 	hostname.initd
@@ -77,7 +76,7 @@ package() {
 	install -d "$pkgdir"/etc/local.d "$pkgdir"/run
 }
 
-md5sums="12e1e2c70c03f93fb42f3549d8cdbc0a  openrc-0.20.4.tar.gz
+md5sums="7519b82a55be24f7bfd4e4378fd9a536  openrc-0.20.5.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
@@ -86,7 +85,6 @@ 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
-e36830c55dd72e05c4937520df7b05fc  fix-rc_env_allow.patch
 d83df5513f08f09fa9e7353327701bf7  openrc.logrotate
 60b4cf93ca19aff577fd743ab42878a8  hostname.initd
 887eba592d487d6ffe2b42cfcd2813df  hwdrivers.initd
@@ -97,7 +95,7 @@ d83df5513f08f09fa9e7353327701bf7  openrc.logrotate
 c1ec888202d868710b5749f7b217d1e3  modloop.confd
 bd51c5353d6dbbb34d929bf59097b232  consolefont.initd
 1c629807d282ca1dc73ffe55c29146ef  consolefont.confd"
-sha256sums="162018f2cba6d8df74daeca40522ce716370d67f19b8592d4beaa2df5435cee3  openrc-0.20.4.tar.gz
+sha256sums="3929193306f6033547331f65bcddb01c23edc770f725cc4750a252574b66aef4  openrc-0.20.5.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
@@ -106,7 +104,6 @@ bdccc12593d9bb9df6fcff57a56e4100ae43e052d6eff87f561966653ca071dc  0001-sysctl.Li
 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
-0d69889690f5f5bd960a8e3d1085a7402fdee401c08321e8302c17e928a24754  fix-rc_env_allow.patch
 30a81fb2f761083088d4d6a3d435fc842966d44588e9837b45ffd03e48be6eb6  openrc.logrotate
 dda515d7d906cebcf4137746939f3fdccc7f504fe097ef1dbf429e3e6773a013  hostname.initd
 6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236  hwdrivers.initd
@@ -117,7 +114,7 @@ e92994dfd5ad6b099eca7627e36dbbe1107c5862b46722c1e1e1b13d10276b60  modloop.initd
 a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd
 8a3f663e9ac14f62c3aef4121736a71edd676bdc9dd93c1d411f13a0e7ab4ee6  consolefont.initd
 9010b94892280f0bb42be39c0e989a70439eb97cbfe2a7a41a32df9a3035b8c2  consolefont.confd"
-sha512sums="722d26f5235ff8ecff4dd9647b69e9058e5c228d8423c71ef3690aef1200bac11e5b02741752101c1c35c8aa7261a502392d3fd1448c068ef61cdf0c47015029  openrc-0.20.4.tar.gz
+sha512sums="367f9d76af410c154c4f53d8ebb6e57346b8719fc3535a132692d5415c9b0ae2a001b1d5e5638037cdf036fe11ef5c59976fb7eef186c83e5f6ea902d54d3173  openrc-0.20.5.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
@@ -126,7 +123,6 @@ c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1e
 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
-6ed55383b83a3cd1b57b42b5087c2bc732a5299644d8bc946fe6d23c1899754b109410cc5c19d7fc3b6f69b5ea19f11bf90a00588066cc9cb41f0b3bc4a1ad5f  fix-rc_env_allow.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
 99b542c0903ad6874b8c308b2e0660a4fe2ff9db962dfec65325cd12c368873a2ae800d5e6d42dc4deff775e1d5c0068869eb72581f7ab16e88d5738afe1d3dd  hostname.initd
 b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b  hwdrivers.initd
diff --git a/main/openrc/fix-rc_env_allow.patch b/main/openrc/fix-rc_env_allow.patch
deleted file mode 100644
index f3b89c5aec..0000000000
--- a/main/openrc/fix-rc_env_allow.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7eaf71176b87ae69bfa622aa621341a19a9d32b0 Mon Sep 17 00:00:00 2001
-From: William Hubbs <w.d.hubbs@gmail.com>
-Date: Fri, 12 Feb 2016 12:40:55 -0600
-Subject: [PATCH] Fix rc_env_allow wildcard usage
-
-Before this commit, using * in rc_env_allow did not work.
-
-This fixes #60.
----
- src/rc/rc-misc.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c
-index f2967dd..82f1b78 100644
---- a/src/rc/rc-misc.c
-+++ b/src/rc/rc-misc.c
-@@ -68,6 +68,12 @@ env_filter(void)
- 
- 	/* Add the user defined list of vars */
- 	env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " ");
-+	/*
-+	 * If '*' is an entry in rc_env_allow, do nothing as we are to pass
-+	 * through all environment variables.
-+	 */
-+	if (rc_stringlist_find(env_allow, "*"))
-+		return;
- 	profile = rc_config_load(RC_PROFILE_ENV);
- 
- 	/* Copy the env and work from this so we can manipulate it safely */