diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-14 11:08:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-14 11:09:04 +0000 |
| commit | 8cbbb1cc063e37caa502d6b543079898eb40acd1 (patch) | |
| tree | bdb206041e54adc329f222c843a03ee7e3047682 /main/openrc | |
| parent | 7c18b536e1c1329ab8466eb402c956ebfff315ba (diff) | |
| download | aports-8cbbb1cc063e37caa502d6b543079898eb40acd1.tar.bz2 aports-8cbbb1cc063e37caa502d6b543079898eb40acd1.tar.xz | |
main/openrc: backport rc_env_allow fix
Diffstat (limited to 'main/openrc')
| -rw-r--r-- | main/openrc/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openrc/fix-rc_env_allow.patch | 29 |
2 files changed, 34 insertions, 1 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index 2ab7097e0b..2236288a1c 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -2,7 +2,7 @@ pkgname=openrc pkgver=0.20.4 _ver=${pkgver/_git*/} -pkgrel=0 +pkgrel=1 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,6 +21,7 @@ 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 @@ -85,6 +86,7 @@ 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 @@ -104,6 +106,7 @@ 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 @@ -123,6 +126,7 @@ 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 new file mode 100644 index 0000000000..f3b89c5aec --- /dev/null +++ b/main/openrc/fix-rc_env_allow.patch @@ -0,0 +1,29 @@ +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 */ |