diff options
Diffstat (limited to 'sys-apps/openrc')
23 files changed, 2801 insertions, 0 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest new file mode 100644 index 0000000..1b5002a --- /dev/null +++ b/sys-apps/openrc/Manifest @@ -0,0 +1,25 @@ +AUX 0.2.5/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 0.2.5/0002-useful-functions.patch 1745 RMD160 f507c10185e09d05f18f097a83102131f1373161 SHA1 fe8f35a5acc6b01830cb5aa7cb6d13706efa9820 SHA256 640a59b382d54a629f67cea0f0428f127ebcb8a071068e5a75ecbd9d0869e8a4 +AUX 0.2.5/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +AUX 0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch 1559 RMD160 a08248a348db9a8a2a2d8a1797c456c41efe03ba SHA1 bec79a1434c7855ee5764cc3d849900dcfd488f4 SHA256 a04ff81fe4f2358086084cb64ab53dd88a3a863184e708b18b7ab4d52684fbb2 +AUX 0.3.0/0002-kenv-is-not-always-available.patch 823 RMD160 63e540371f2831cecb605bb17c242cc95ff5f001 SHA1 da2d76f8e50674525834847af9f37ac60c5912dd SHA256 fbc2433956adb626724414b9d0f4758feee1c581cc95081e2dbbcecec389c919 +AUX 0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch 1718 RMD160 ab7d56e7723b8d78b0d3ad95c31506e6449fa30f SHA1 3edc1b081374467582f0139555c08e0a1ec4888d SHA256 810a27323ab4eea22aa76b5500eac4d650d612c6307edb55d953e7bcf778ed9f +AUX 0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 0.3.0/0005-add-back-KV_-funcs.patch 2581 RMD160 ab6bfb3a7786120f21a02934009c82b223bf6758 SHA1 256f6e26cdc2cc9b4ad74fff5a2ea5b7e0c40bc7 SHA256 cb859f5333e65440fef0993b5cf5686b27dfc4796d6c2b030dec019475967e2f +AUX 0.3.0/0006-Fix-tests-Gentoo-240350.patch 1302 RMD160 2594c6dbc4896e5e897a682bdc100a120b596f32 SHA1 d3063dc1ad9b3a763456cef0314fb62a2e5e8e8d SHA256 b285fd499a5f23ce79bad0ccab2add93b972644ce9945c1c94b470047157d673 +AUX 0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch 846 RMD160 3f766bf93af8d535a7611885c9e4a7e5a3a524f1 SHA1 085e13efe91810686182d16a9bce03a0dd31b23a SHA256 ddb5c44735647a1576f11f69993fbb2d4e52f41ae1beda91eac89770b14ba410 +AUX 0.3.0/0008-Clean-up-warnings-regarding-printf.patch 13827 RMD160 9d19dc1ff80b554fc3a134b3f815b063d1260937 SHA1 3c5d57088a1c98e78c542a306a1852a251b4b2bd SHA256 b434b8351815bce1133d059f824897d9f2b6e340abcc787f27c5d9879b39186f +AUX 0.4.2/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 0.4.2/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 0.4.2/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +AUX 0.4.2/0004-svn-version.patch 450 RMD160 7e85a0b4e08bd9554749ab384ce61bab4b7ddd21 SHA1 bfcd2eb61affc819f2ecabc420dc9e9c08dc4179 SHA256 f3877a994690912998daae1144a3564eea7a15d841df41af4ca93a37566cce46 +AUX 9999/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b +AUX 9999/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475 +AUX 9999/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539 +DIST openrc-0.2.5.tar.bz2 142526 RMD160 5938b2186b7ef84890d4a6aebb9aeb3bf272e609 SHA1 e41249abb9f68ac0ebf92c080276499bd22daa94 SHA256 f81e6a84f016dcecdee67067d6c0bc85f3184baa6c127cc406cc00e88a45bec2 +DIST openrc-0.3.0.tar.bz2 145599 RMD160 ca45de6f222060a24542663fff343b84b870e72b SHA1 2fcac5cb7586b407714700b8325b8c3d705aa2cd SHA256 857a038dc123ae67bff7afee3137a292e03f0b7a3999fd9f150f6a75119cdd1a +DIST openrc-0.4.2.tar.bz2 144825 RMD160 68f559ddb41f5fcc367298f258b43bf667af45c3 SHA1 da75f8a9d81639fa7e5de5b398c3b807190be520 SHA256 df6463ba76b3700d803b3fe81c9cd6d511142225ada7ff655cb71b91ca1bf8af +EBUILD openrc-0.2.5.ebuild 9001 RMD160 87557aa2984c5036cb0c5484a8503361696d5b2a SHA1 f923227dd487a46dd6a3695be7ca3b701dc117d9 SHA256 f7cfb2fe755aa69aa202f853780f37dc791acd687a73cf2ed25389d874dec35d +EBUILD openrc-0.3.0-r1.ebuild 8994 RMD160 a99e81fc96df6d8d52eda840b9f678ec0dc1f064 SHA1 aaf7ed0502251f82fde1f2dfbf3ef060d401bf0c SHA256 cb23fbcd586af6dbff1f9a78ee442c4f6c46df25b097cc6819b3e99f98fdce6d +EBUILD openrc-0.4.2.ebuild 10240 RMD160 cbb7e5110c5106bc22823580ca278c129ae7139d SHA1 2ee68ae728696f7a5fb19cb8be5933ecb979a5c0 SHA256 e84302e40ccd8141f7db2598c0660556eef43ca199a386dbd217831b2679cba0 +EBUILD openrc-9999.ebuild 10023 RMD160 9d53fa28f968c155f2f4865e90e3fcc3442022ad SHA1 e99a4b09b401293225c64f2f11d3de72a270eb15 SHA256 5a1223ed58af309a2d33477600bfbce7564ab1bcb3d06c34be0274d15da67cd9 diff --git a/sys-apps/openrc/files/0.2.5/0001-msg-style.patch b/sys-apps/openrc/files/0.2.5/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch b/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch new file mode 100644 index 0000000..91969a1 --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0002-useful-functions.patch @@ -0,0 +1,79 @@ +From c5552432d21e964ea1dbda7415040259b87ea77e Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 27 +++++++++++++++++++++++++++ + sh/rc-functions.sh.in | 22 ---------------------- + 2 files changed, 27 insertions(+), 22 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 1a1fbba..140f6dc 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -38,6 +38,28 @@ yesno() + esac + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 74db71e..eb45e49 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,28 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + @PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);; +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.2.5/0003-KV.patch b/sys-apps/openrc/files/0.2.5/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/0.2.5/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch b/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch new file mode 100644 index 0000000..610b13f --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0001-Fix-a-segfault-when-profile.env-does-not-exist.patch @@ -0,0 +1,54 @@ +From 908a084d0ed193f6ec1b4017438cb4bbf3814b7f Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@uberpc.marples.name> +Date: Fri, 3 Oct 2008 18:50:10 +0100 +Subject: [PATCH] Fix a segfault when profile.env does not exist. + +--- + src/rc/rc-misc.c | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c +index d94cd2e..d4b3ca0 100644 +--- a/src/rc/rc-misc.c ++++ b/src/rc/rc-misc.c +@@ -128,13 +128,13 @@ void env_filter(void) + size_t i = 0; + + /* Add the user defined list of vars */ +- env_allow = rc_stringlist_split(rc_conf_value ("rc_env_allow"), " "); ++ env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " "); + if (exists(PROFILE_ENV)) + profile = rc_config_load(PROFILE_ENV); + + /* Copy the env and work from this so we can manipulate it safely */ + env_list = rc_stringlist_new(); +- while (environ[i]) { ++ while (environ && environ[i]) { + env = rc_stringlist_add(env_list, environ[i++]); + e = strchr(env->value, '='); + if (e) +@@ -159,14 +159,15 @@ void env_filter(void) + } + + /* Now add anything missing from the profile */ +- TAILQ_FOREACH(env, profile, entries) { +- e = strchr(env->value, '='); +- *e = '\0'; +- if (!getenv(env->value)) +- setenv(env->value, e + 1, 1); ++ if (profile) { ++ TAILQ_FOREACH(env, profile, entries) { ++ e = strchr(env->value, '='); ++ *e = '\0'; ++ if (!getenv(env->value)) ++ setenv(env->value, e + 1, 1); ++ } + } + +- + rc_stringlist_free(env_list); + rc_stringlist_free(env_allow); + rc_stringlist_free(profile); +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch b/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch new file mode 100644 index 0000000..d7bd443 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0002-kenv-is-not-always-available.patch @@ -0,0 +1,31 @@ +From 19f8761365b825ae9949559048afd90c2f662de8 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@uberpc.marples.name> +Date: Fri, 3 Oct 2008 18:50:30 +0100 +Subject: [PATCH] kenv is not always available. + +--- + init.d/hostid.in | 8 +++++--- + 1 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/init.d/hostid.in b/init.d/hostid.in +index a058884..584fd2d 100644 +--- a/init.d/hostid.in ++++ b/init.d/hostid.in +@@ -38,9 +38,11 @@ _set() + # otherwise we generate a random UUID. + reset() + { +- local uuid=$(kenv smbios.system.uuid 2>/dev/null) +- local x="[0-9a-f]" +- local y="${x}${x}${x}${x}" ++ local uuid= x="[0-9a-f]" y="${x}${x}${x}${x}" ++ ++ if type kenv >/dev/null 2>&1; then ++ uuid=$(kenv smbios.system.uuid 2>/dev/null) ++ fi + case "${uuid}" in + ${y}${y}-${y}-${y}-${y}-${y}${y}${y});; + *) uuid=;; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch b/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch new file mode 100644 index 0000000..8325015 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0003-This-reverts-commit-0e2f160c95b15e95f3885e3f5a3670ec.patch @@ -0,0 +1,46 @@ +From ce2effcad208d2fdc6126811ac7127fdc928e823 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index bef98a5..a5977b7 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -764,7 +764,7 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + if (!msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -778,18 +778,15 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch b/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0004-add-a-softlevel-function-to-the-API-so-people-dont.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch b/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch new file mode 100644 index 0000000..dfde845 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0005-add-back-KV_-funcs.patch @@ -0,0 +1,120 @@ +From 77a1fb72523df6495ae526fbf4fd834ac15aae74 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 680f534..f121564 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -64,6 +64,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index 110266b..9f6726d 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ret=$((${ret} + ${tret})) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch new file mode 100644 index 0000000..dfb022e --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0006-Fix-tests-Gentoo-240350.patch @@ -0,0 +1,49 @@ +From 86a3baa490d1d84f764b2f4b081d5abfc437b496 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Tue, 7 Oct 2008 13:14:53 +0100 +Subject: [PATCH] Fix tests, #Gentoo 240350. + +--- + src/test/librc.funcs.hidden.list | 2 ++ + src/test/rc.funcs.list | 4 ++++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/src/test/librc.funcs.hidden.list b/src/test/librc.funcs.hidden.list +index 15249ad..2416a0c 100644 +--- a/src/test/librc.funcs.hidden.list ++++ b/src/test/librc.funcs.hidden.list +@@ -41,8 +41,10 @@ rc_services_scheduled_by + rc_stringlist_add + rc_stringlist_addu + rc_stringlist_delete ++rc_stringlist_find + rc_stringlist_free + rc_stringlist_new + rc_stringlist_sort ++rc_stringlist_split + rc_sys + rc_yesno +diff --git a/src/test/rc.funcs.list b/src/test/rc.funcs.list +index 85cf936..f632474 100644 +--- a/src/test/rc.funcs.list ++++ b/src/test/rc.funcs.list +@@ -82,12 +82,16 @@ rc_stringlist_addu + rc_stringlist_addu@@RC_1.0 + rc_stringlist_delete + rc_stringlist_delete@@RC_1.0 ++rc_stringlist_find ++rc_stringlist_find@@RC_1.0 + rc_stringlist_free + rc_stringlist_free@@RC_1.0 + rc_stringlist_new + rc_stringlist_new@@RC_1.0 + rc_stringlist_sort + rc_stringlist_sort@@RC_1.0 ++rc_stringlist_split ++rc_stringlist_split@@RC_1.0 + rc_sys + rc_sys@@RC_1.0 + rc_yesno +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch new file mode 100644 index 0000000..1ef89f2 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0007-Fix-utmp-permissions-Gentoo-240437.patch @@ -0,0 +1,31 @@ +From a327a7d1e795fb6d6c49a459f5863d9d1fdc0b9c Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Wed, 8 Oct 2008 14:58:17 +0100 +Subject: [PATCH] Fix utmp permissions, Gentoo #240437. + +--- + init.d/bootmisc.in | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in +index 50e83a0..529097e 100644 +--- a/init.d/bootmisc.in ++++ b/init.d/bootmisc.in +@@ -77,10 +77,13 @@ start() + if dir_writeable /var/run; then + ebegin "Creating user login records" + cp /dev/null /var/run/utmp ++ chgrp utmp /var/run/utmp ++ chmod 0664 /var/run/utmp + if dir_writeable /var/log; then + logw=true + [ -e /var/log/wtmp ] || cp /dev/null /var/log/wtmp +- chmod 0644 /var/run/utmp /var/log/wtmp ++ chgrp utmp /var/log/wtmp ++ chmod 0664 /var/log/wtmp + fi + eend 0 + +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch new file mode 100644 index 0000000..f645f07 --- /dev/null +++ b/sys-apps/openrc/files/0.3.0/0008-Clean-up-warnings-regarding-printf.patch @@ -0,0 +1,442 @@ +From ca7651e9ee42b222ec4fd1b30f4e9ba8eb0ffc37 Mon Sep 17 00:00:00 2001 +From: Roy Marples <roy@marples.name> +Date: Wed, 8 Oct 2008 16:56:47 +0100 +Subject: [PATCH] Clean up warnings regarding printf. + +--- + src/libeinfo/einfo.h | 66 ++++++++++++++++++++++------------------------ + src/libeinfo/libeinfo.c | 63 ++++++++++++++++++++++---------------------- + src/rc/rc-applets.c | 11 ++++--- + src/rc/runscript.c | 2 +- + 4 files changed, 70 insertions(+), 72 deletions(-) + +diff --git a/src/libeinfo/einfo.h b/src/libeinfo/einfo.h +index 3934b58..9c54e68 100644 +--- a/src/libeinfo/einfo.h ++++ b/src/libeinfo/einfo.h +@@ -28,13 +28,11 @@ + #define __EINFO_H__ + + #if defined(__GNUC__) +-# define __EINFO_PRINTF __attribute__ ((__format__ (__printf__, 1, 2))) +-# define __EINFO_XPRINTF __attribute__ ((__noreturn__, __format__ (__printf__, 1, 2))) +-# define __EEND_PRINTF __attribute__ ((__format__ (__printf__, 2, 3))) ++# define EINFO_PRINTF(a, b) __attribute__((__format__(__printf__, a, b))) ++# define EINFO_XPRINTF(a, b) __attribute__((__noreturn__,__format__(__printf__, a, b))) + #else +-# define __EINFO_PRINTF +-# define __EINFO_XPRINTF +-# define __EEND_PRINTF ++# define EINFO_PRINTF(a, b) ++# define EINFO_XPRINTF(a, b) + #endif + + #include <sys/types.h> +@@ -42,12 +40,12 @@ + + /* Although OpenRC requires C99, linking to us should not. */ + #ifdef restrict +-# define __EINFO_RESTRICT restrict ++# define EINFO_RESTRICT restrict + #else + # ifdef __restrict +-# define __EINFO_RESTRICT __restrict ++# define EINFO_RESTRICT __restrict + # else +-# define __EINFO_RESTRICT ++# define EINFO_RESTRICT + # endif + #endif + +@@ -68,7 +66,7 @@ typedef enum + const char *ecolor(ECOLOR); + + /*! @brief Writes to syslog. */ +-void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; ++void elog(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); + + /*! + * @brief Display informational messages. +@@ -86,22 +84,22 @@ void elog(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; + * The v suffix means only print if EINFO_VERBOSE is yes. + */ + /*@{*/ +-int einfon(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int eerrorn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int einfo(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-void ewarnx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF; +-int eerror(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-void eerrorx(const char * __EINFO_RESTRICT, ...) __EINFO_XPRINTF; +- +-int einfovn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ebeginvn(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int eendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewendvn(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int einfov(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; ++int einfon(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int eerrorn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int einfo(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++void ewarnx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2); ++int eerror(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++void eerrorx(const char * __EINFO_RESTRICT, ...) EINFO_XPRINTF(1, 2); ++ ++int einfovn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ebeginvn(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int eendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewendvn(int, const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int einfov(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ewarnv(const char * __EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); + /*@}*/ + + /*! @ingroup ebegin +@@ -109,8 +107,8 @@ int ewarnv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; + * + * Similar to einfo, but we add ... to the end of the message */ + /*@{*/ +-int ebeginv(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; +-int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; ++int ebeginv(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); ++int ebegin(const char * EINFO_RESTRICT, ...) EINFO_PRINTF(1, 2); + /*@}*/ + + /*! @ingroup eend +@@ -122,12 +120,12 @@ int ebegin(const char * __EINFO_RESTRICT, ...) __EINFO_PRINTF; + * + * ebracket allows you to specifiy the position, color and message */ + /*@{*/ +-int eend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewend(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-void ebracket(int, ECOLOR, const char * __EINFO_RESTRICT); ++int eend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewend(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++void ebracket(int, ECOLOR, const char * EINFO_RESTRICT); + +-int eendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; +-int ewendv(int, const char * __EINFO_RESTRICT, ...) __EEND_PRINTF; ++int eendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); ++int ewendv(int, const char * EINFO_RESTRICT, ...) EINFO_PRINTF(2, 3); + /*@}*/ + + /*! @ingroup eindent +@@ -141,7 +139,7 @@ void eindentv(void); + void eoutdentv(void); + + /*! @brief Prefix each einfo line with something */ +-void eprefix(const char * __EINFO_RESTRICT); ++void eprefix(const char * EINFO_RESTRICT); + + __END_DECLS + #endif +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index a5977b7..7dd2ef6 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -316,7 +316,7 @@ tgoto(const char *cap, int a, int b) + #endif + + static bool +-colour_terminal(FILE * __EINFO_RESTRICT f) ++colour_terminal(FILE * EINFO_RESTRICT f) + { + static int in_colour = -1; + char *e, *ee, *end, *d, *p; +@@ -460,7 +460,7 @@ colour_terminal(FILE * __EINFO_RESTRICT f) + } + + static int +-get_term_columns(FILE * __EINFO_RESTRICT stream) ++get_term_columns(FILE * EINFO_RESTRICT stream) + { + struct winsize ws; + char *env = getenv("COLUMNS"); +@@ -480,14 +480,14 @@ get_term_columns(FILE * __EINFO_RESTRICT stream) + } + + void +-eprefix(const char *__EINFO_RESTRICT prefix) ++eprefix(const char *EINFO_RESTRICT prefix) + { + _eprefix = prefix; + } + hidden_def(eprefix) + +-static void +-elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap) ++static void EINFO_PRINTF(2, 0) ++elogv(int level, const char *EINFO_RESTRICT fmt, va_list ap) + { + char *e = getenv("EINFO_LOG"); + va_list apc; +@@ -503,7 +503,7 @@ elogv(int level, const char *__EINFO_RESTRICT fmt, va_list ap) + } + + void +-elog(int level, const char *__EINFO_RESTRICT fmt, ...) ++elog(int level, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -514,7 +514,7 @@ elog(int level, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(elog) + + static int +-_eindent(FILE * __EINFO_RESTRICT stream) ++_eindent(FILE * EINFO_RESTRICT stream) + { + char *env = getenv("EINFO_INDENT"); + int amount = 0; +@@ -538,7 +538,7 @@ _eindent(FILE * __EINFO_RESTRICT stream) + } + + static const char * +-_ecolor(FILE * __EINFO_RESTRICT f, ECOLOR color) ++_ecolor(FILE * EINFO_RESTRICT f, ECOLOR color) + { + unsigned int i; + +@@ -575,9 +575,8 @@ ecolor(ECOLOR color) + setenv("EINFO_LASTCMD", _cmd, 1); \ + } + +-static int +-_einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va) +- ++static int EINFO_PRINTF(3, 0) ++_einfo(FILE *f, ECOLOR color, const char *EINFO_RESTRICT fmt, va_list va) + { + int retval = 0; + char *last = getenv("EINFO_LASTCMD"); +@@ -605,7 +604,7 @@ _einfo(FILE *f, ECOLOR color, const char *__EINFO_RESTRICT fmt, va_list va) + #define _eerrorvn(fmt, ap) _einfo(stderr, ECOLOR_BAD, fmt, ap) + + int +-einfon(const char *__EINFO_RESTRICT fmt, ...) ++einfon(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -621,7 +620,7 @@ einfon(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfon) + + int +-ewarnn(const char *__EINFO_RESTRICT fmt, ...) ++ewarnn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -637,7 +636,7 @@ ewarnn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnn) + + int +-eerrorn(const char *__EINFO_RESTRICT fmt, ...) ++eerrorn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -651,7 +650,7 @@ eerrorn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerrorn) + + int +-einfo(const char *__EINFO_RESTRICT fmt, ...) ++einfo(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -668,7 +667,7 @@ einfo(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfo) + + int +-ewarn(const char *__EINFO_RESTRICT fmt, ...) ++ewarn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -686,7 +685,7 @@ ewarn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarn) + + void +-ewarnx(const char *__EINFO_RESTRICT fmt, ...) ++ewarnx(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -703,7 +702,7 @@ ewarnx(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnx) + + int +-eerror(const char *__EINFO_RESTRICT fmt, ...) ++eerror(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -721,7 +720,7 @@ eerror(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerror) + + void +-eerrorx(const char *__EINFO_RESTRICT fmt, ...) ++eerrorx(const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -737,7 +736,7 @@ eerrorx(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eerrorx) + + int +-ebegin(const char *__EINFO_RESTRICT fmt, ...) ++ebegin(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -756,7 +755,7 @@ ebegin(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ebegin) + + static void +-_eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) ++_eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + { + int i; + int cols; +@@ -790,8 +789,8 @@ _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) + } + } + +-static int +-_do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list ap) ++static int EINFO_PRINTF(3, 0) ++_do_eend(const char *cmd, int retval, const char *EINFO_RESTRICT fmt, va_list ap) + { + int col = 0; + FILE *fp = stdout; +@@ -814,7 +813,7 @@ _do_eend(const char *cmd, int retval, const char *__EINFO_RESTRICT fmt, va_list + } + + int +-eend(int retval, const char *__EINFO_RESTRICT fmt, ...) ++eend(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -829,7 +828,7 @@ eend(int retval, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eend) + + int +-ewend(int retval, const char *__EINFO_RESTRICT fmt, ...) ++ewend(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -897,7 +896,7 @@ void eoutdent(void) + hidden_def(eoutdent) + + int +-einfovn(const char *__EINFO_RESTRICT fmt, ...) ++einfovn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -913,7 +912,7 @@ einfovn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfovn) + + int +-ewarnvn(const char *__EINFO_RESTRICT fmt, ...) ++ewarnvn(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -929,7 +928,7 @@ ewarnvn(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnvn) + + int +-einfov(const char *__EINFO_RESTRICT fmt, ...) ++einfov(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -946,7 +945,7 @@ einfov(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(einfov) + + int +-ewarnv(const char *__EINFO_RESTRICT fmt, ...) ++ewarnv(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -963,7 +962,7 @@ ewarnv(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ewarnv) + + int +-ebeginv(const char *__EINFO_RESTRICT fmt, ...) ++ebeginv(const char *EINFO_RESTRICT fmt, ...) + { + int retval; + va_list ap; +@@ -983,7 +982,7 @@ ebeginv(const char *__EINFO_RESTRICT fmt, ...) + hidden_def(ebeginv) + + int +-eendv(int retval, const char *__EINFO_RESTRICT fmt, ...) ++eendv(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +@@ -998,7 +997,7 @@ eendv(int retval, const char *__EINFO_RESTRICT fmt, ...) + hidden_def(eendv) + + int +-ewendv(int retval, const char *__EINFO_RESTRICT fmt, ...) ++ewendv(int retval, const char *EINFO_RESTRICT fmt, ...) + { + va_list ap; + +diff --git a/src/rc/rc-applets.c b/src/rc/rc-applets.c +index f5892f9..eea4a01 100644 +--- a/src/rc/rc-applets.c ++++ b/src/rc/rc-applets.c +@@ -84,8 +84,8 @@ static int do_e(int argc, char **argv) + int level = 0; + struct timespec ts; + struct timeval stop, now; +- int (*e) (const char *, ...) __EINFO_PRINTF = NULL; +- int (*ee) (int, const char *, ...) __EEND_PRINTF = NULL; ++ int (*e) (const char *, ...) EINFO_PRINTF(1, 2) = NULL; ++ int (*ee) (int, const char *, ...) EINFO_PRINTF(2, 3) = NULL; + + /* Punt applet */ + argc--; +@@ -205,9 +205,10 @@ static int do_e(int argc, char **argv) + ee = eend; + else if (strcmp(applet, "ewend") == 0) + ee = ewend; +- else if (strcmp(applet, "esyslog") == 0) +- ee = elog; +- else if (strcmp(applet, "veinfo") == 0) ++ else if (strcmp(applet, "esyslog") == 0) { ++ elog(retval, "%s", message); ++ retval = 0; ++ } else if (strcmp(applet, "veinfo") == 0) + e = einfov; + else if (strcmp(applet, "veinfon") == 0) + e = einfovn; +diff --git a/src/rc/runscript.c b/src/rc/runscript.c +index c04f967..211beff 100644 +--- a/src/rc/runscript.c ++++ b/src/rc/runscript.c +@@ -556,7 +556,7 @@ static bool svc_wait(const char *svc) + static RC_SERVICE svc_status(void) + { + char status[10]; +- int (*e) (const char *fmt, ...) __EINFO_PRINTF = einfo; ++ int (*e) (const char *fmt, ...) EINFO_PRINTF(1, 2) = einfo; + RC_SERVICE state = rc_service_state(service); + + if (state & RC_SERVICE_STOPPING) { +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.4.2/0001-msg-style.patch b/sys-apps/openrc/files/0.4.2/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch b/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0002-useful-functions.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/0.4.2/0003-KV.patch b/sys-apps/openrc/files/0.4.2/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/0.4.2/0004-svn-version.patch b/sys-apps/openrc/files/0.4.2/0004-svn-version.patch new file mode 100644 index 0000000..a2f9e1e --- /dev/null +++ b/sys-apps/openrc/files/0.4.2/0004-svn-version.patch @@ -0,0 +1,13 @@ +Index: openrc-0.4.2/src/rc/Makefile +=================================================================== +--- openrc-0.4.2.orig/src/rc/Makefile ++++ openrc-0.4.2/src/rc/Makefile +@@ -45,7 +45,7 @@ include ${MK}/${MKPAM}.mk + + _SVNVER_SH= ret=""; \ + if type svnversion >/dev/null 2>&1; then \ +- svnver="$$(svnversion)"; \ ++ svnver="$$(LC_ALL=C svnversion)"; \ + [ "$${svnver}" != exported ] && ret="-svn-$${svnver}"; \ + fi; \ + echo "$${ret}"; diff --git a/sys-apps/openrc/files/9999/0001-msg-style.patch b/sys-apps/openrc/files/9999/0001-msg-style.patch new file mode 100644 index 0000000..ab3559e --- /dev/null +++ b/sys-apps/openrc/files/9999/0001-msg-style.patch @@ -0,0 +1,46 @@ +From 1eddb56f11b41c4bf4f878c995c5d140b1f9d44d Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 01:48:19 -0400 +Subject: [PATCH] This reverts commit 0e2f160c95b15e95f3885e3f5a3670ec5ae0a709. 2 spaces in 80 cols has never made any sort of realistic difference and we're not going to change this behavior in Gentoo. + +--- + src/libeinfo/libeinfo.c | 9 +++------ + 1 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c +index f8ddcb5..c46cacb 100644 +--- a/src/libeinfo/libeinfo.c ++++ b/src/libeinfo/libeinfo.c +@@ -787,7 +787,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (! msg) + return; + +- cols = get_term_columns(fp) - (strlen(msg) + 3); ++ cols = get_term_columns(fp) - (strlen(msg) + 5); + + /* cons25 is special - we need to remove one char, otherwise things + * do not align properly at all. */ +@@ -801,18 +801,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color, + if (term_is_cons25) + cols--; + +- /* If extra spacing is required around msg, then please change +- * via a runtime knob and leave this default as is as it saves 2 +- * valuable columns when running on 80 column screens. */ + if (cols > 0 && colour_terminal(fp)) { +- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), ++ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), + ecolor(ECOLOR_BRACKET), ecolor(color), msg, + ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); + } else { + if (col > 0) + for (i = 0; i < cols - col; i++) + fprintf(fp, " "); +- fprintf(fp, " [%s]\n", msg); ++ fprintf(fp, " [ %s ]\n", msg); + } + } + +-- +1.5.4.4 + diff --git a/sys-apps/openrc/files/9999/0002-useful-functions.patch b/sys-apps/openrc/files/9999/0002-useful-functions.patch new file mode 100644 index 0000000..a307386 --- /dev/null +++ b/sys-apps/openrc/files/9999/0002-useful-functions.patch @@ -0,0 +1,80 @@ +From 79e8ce8d2ea0ede99aba18d5f9a625a110aa918f Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 02:03:39 -0400 +Subject: [PATCH] add a softlevel() function to the API so people dont have to worry about inner details and move get_bootparam back to the exported function.sh api + +--- + sh/functions.sh.in | 22 ++++++++++++++++++++++ + sh/rc-functions.sh.in | 23 ----------------------- + 2 files changed, 22 insertions(+), 23 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 57917ed..680f534 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -42,6 +42,28 @@ rc_runlevel() { + rc-status --runlevel + } + ++get_bootparam() ++{ ++ local match="$1" ++ [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 ++ ++ set -- $(cat /proc/cmdline) ++ while [ -n "$1" ]; do ++ case "$1" in ++ gentoo=*) ++ local params="${1##*=}" ++ local IFS=, x= ++ for x in ${params}; do ++ [ "${x}" = "${match}" ] && return 0 ++ done ++ ;; ++ esac ++ shift ++ done ++ ++ return 1 ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in +index 751d47a..c713def 100644 +--- a/sh/rc-functions.sh.in ++++ b/sh/rc-functions.sh.in +@@ -51,29 +51,6 @@ is_union_fs() + unionctl "$1" --list >/dev/null 2>&1 + } + +-get_bootparam() +-{ +- local match="$1" +- [ -z "${match}" -o ! -r /proc/cmdline ] && return 1 +- +- set -- $(cat /proc/cmdline) +- while [ -n "$1" ]; do +- [ "$1" = "${match}" ] && return 0 +- case "$1" in +- gentoo=*) +- local params="${1##*=}" +- local IFS=, x= +- for x in ${params}; do +- [ "${x}" = "${match}" ] && return 0 +- done +- ;; +- esac +- shift +- done +- +- return 1 +-} +- + # Add our sbin to $PATH + case "${PATH}" in + "${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);; +-- +1.6.0.2 + diff --git a/sys-apps/openrc/files/9999/0003-KV.patch b/sys-apps/openrc/files/9999/0003-KV.patch new file mode 100644 index 0000000..8ab646f --- /dev/null +++ b/sys-apps/openrc/files/9999/0003-KV.patch @@ -0,0 +1,120 @@ +From dac703b26c71cd8479b71d101c4e1ddb8eadc194 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier@gentoo.org> +Date: Mon, 24 Mar 2008 03:14:02 -0400 +Subject: [PATCH] add back KV_* funcs + +--- + sh/functions.sh.in | 35 +++++++++++++++++++++++++++++++++++ + sh/runtests.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 80 insertions(+), 0 deletions(-) + +diff --git a/sh/functions.sh.in b/sh/functions.sh.in +index 140f6dc..0522792 100644 +--- a/sh/functions.sh.in ++++ b/sh/functions.sh.in +@@ -65,6 +65,41 @@ get_bootparam() + return 1 + } + ++KV_major() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ echo ${KV%%.*} ++} ++ ++KV_minor() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.} ++ echo ${KV%%.*} ++} ++ ++KV_micro() { ++ [ -z "$*" ] && return 1 ++ local KV="$*" ++ KV=${KV#*.*.} ++ echo ${KV%%[![:digit:]]*} ++} ++ ++KV_to_int() { ++ [ -z "$*" ] && return 1 ++ local KV_MAJOR="$(KV_major "$*")" ++ local KV_MINOR="$(KV_minor "$*")" ++ local KV_MICRO="$(KV_micro "$*")" ++ local KV_int="$(( KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO ))" ++ echo "${KV_int}" ++} ++ ++_RC_GET_KV_CACHE="" ++get_KV() { ++ [ -z ${_RC_GET_KV_CACHE} ] && _RC_GET_KV_CACHE=$(uname -r) ++ echo $(KV_to_int "${_RC_GET_KV_CACHE}") ++} ++ + _sanitize_path() + { + local IFS=":" p= path= +diff --git a/sh/runtests.sh b/sh/runtests.sh +index d0d6a17..debcf4f 100755 +--- a/sh/runtests.sh ++++ b/sh/runtests.sh +@@ -3,6 +3,19 @@ + top_srcdir=${top_srcdir:-..} + . ${top_srcdir}/test/setup_env.sh + ++checkit() { ++ local output=$($1 $3) ++ local lret=$? ++ if [ ${lret} -ne 0 ] ; then ++ ((tret+=lret)) ++ echo "FAIL: exec: $*" ++ fi ++ if [ "${output}" != "$2" ] ; then ++ ((tret+=lret)) ++ echo "FAIL: output: $* : got='${output}' wanted='$2'" ++ fi ++} ++ + ret=0 + + tret=0 +@@ -22,4 +35,36 @@ done + eend ${tret} + ((ret+=tret)) + ++compare_int() { ++ local got=$(KV_to_int $1) ++ local exp=$(KV_to_int $3) ++ if ! [ ${got} $2 ${exp} ] ; then ++ ((tret+=1)) ++ echo "FAIL: KV_to_int '${v}'(${got}) $2 '1.2.2'(${exp})" ++ fi ++} ++ ++tret=0 ++ebegin "Testing KV_{major,minor,micro,to_int}" ++for v in \ ++ 1.2.3 1.2.3-rc0 1.2.3_rc0 "1.2.3 rc0" \ ++ 1.2.3.4 1.2.3.4-rc0 1.2.3.4_rc0 "1.2.3.4 rc0" ++do ++ checkit KV_major 1 ${v} ++ checkit KV_minor 2 ${v} ++ checkit KV_micro 3 ${v} ++ ++ compare_int 1.2.2 -lt ${v} ++ compare_int 1.2.2.10 -lt ${v} ++ compare_int 1.2.4 -gt ${v} ++ compare_int 1.2.4-rc0 -gt ${v} ++ compare_int 1.2.3 -eq ${v} ++ compare_int 1.2.3-rc0 -eq ${v} ++ compare_int 1.2.3.2 -eq ${v} ++ compare_int 1.2.3.3 -eq ${v} ++ compare_int 1.2.3.4 -eq ${v} ++done ++eend ${tret} ++((ret+=tret)) ++ + exit ${ret} +-- +1.5.4.4 + diff --git a/sys-apps/openrc/openrc-0.2.5.ebuild b/sys-apps/openrc/openrc-0.2.5.ebuild new file mode 100644 index 0000000..2dfbfb4 --- /dev/null +++ b/sys-apps/openrc/openrc-0.2.5.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.2.5.ebuild,v 1.5 2008/10/06 18:53:12 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_linux? ( virtual/modutils ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + !<sys-fs/udev-118-r2" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/0.2.5/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-0.3.0-r1.ebuild b/sys-apps/openrc/openrc-0.3.0-r1.ebuild new file mode 100644 index 0000000..3ac8810 --- /dev/null +++ b/sys-apps/openrc/openrc-0.3.0-r1.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.3.0-r1.ebuild,v 1.1 2008/10/08 16:19:11 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_linux? ( virtual/modutils ) + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + !<sys-fs/udev-118-r2" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/${PV}/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-0.4.2.ebuild b/sys-apps/openrc/openrc-0.4.2.ebuild new file mode 100644 index 0000000..64e3d4e --- /dev/null +++ b/sys-apps/openrc/openrc-0.4.2.ebuild @@ -0,0 +1,314 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.4.2.ebuild,v 1.1 2009/01/14 14:19:47 zzam Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" + EGIT_BRANCH="master" + inherit git +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" +IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) + !<sys-fs/udev-133 + !<sys-apps/sysvinit-2.86-r11" +DEPEND="virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/0.4.2/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="git-$(git --git-dir=${EGIT_STORE_DIR}/${EGIT_PROJECT} rev-parse --verify ${EGIT_BRANCH} | cut -c1-8)" + sed -i "/^VERSION[[:space:]]*=/s:=.*:=${ver}:" Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -e ${ROOT}/etc/init.d/clock ]] ; then + rm -f "${ROOT}"/etc/init.d/clock + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # termencoding was added in 0.2.1 and needed in boot + has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding + + # openrc-0.4.0 no longer loads the udev addon + enable_udev=0 + if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ + [[ -e "${ROOT}"/etc/init.d/udev ]] && \ + ! has_version ">=sys-apps/openrc-0.4.0" + then + # make sure udev is in sysinit if it was enabled before + local rc_devices=$( + [[ -f /etc/rc.conf ]] && source /etc/rc.conf + [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc + echo "${rc_devices:-${RC_DEVICES:-auto}}" + ) + case ${rc_devices} in + udev|auto) + enable_udev=1 + ;; + esac + fi + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + else + if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/sysinit + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ + "${ROOT}"/etc/runlevels/sysinit + fi + if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/shutdown + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ + "${ROOT}"/etc/runlevels/shutdown + fi + fi + + if [[ "$enable_udev" = 1 ]]; then + elog "Auto adding udev init script to the sysinit runlevel" + ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild new file mode 100644 index 0000000..61646ab --- /dev/null +++ b/sys-apps/openrc/openrc-9999.ebuild @@ -0,0 +1,309 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.43 2008/12/31 21:31:40 cardoe Exp $ + +inherit eutils flag-o-matic multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="svn://roy.marples.name/openrc/trunk" + inherit subversion +else + SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2 + mirror://gentoo/${P}.tar.bz2 + http://dev.gentoo.org/~cardoe/files/${P}.tar.bz2 + http://dev.gentoo.org/~vapier/dist/${P}.tar.bz2" +fi + +DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" +HOMEPAGE="http://roy.marples.name/openrc" + +LICENSE="BSD-2" +SLOT="0" +KEYWORDS="" +IUSE="debug elibc_glibc ncurses pam unicode kernel_linux kernel_FreeBSD" + +RDEPEND="virtual/init + kernel_FreeBSD? ( sys-process/fuser-bsd ) + elibc_glibc? ( >=sys-libs/glibc-2.5 ) + ncurses? ( sys-libs/ncurses ) + pam? ( virtual/pam ) + >=sys-apps/baselayout-2.0.0 + kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) + !<sys-fs/udev-133 + !<sys-apps/sysvinit-2.86-r11" +DEPEND="${RDEPEND} + virtual/os-headers" + +pkg_setup() { + LIBDIR="lib" + [ "${SYMLINK_LIB}" = "yes" ] && LIBDIR=$(get_abi_LIBDIR "${DEFAULT_ABI}") + + MAKE_ARGS="${MAKE_ARGS} LIBNAME=${LIBDIR}" + + local brand="Unknown" + if use kernel_linux ; then + MAKE_ARGS="${MAKE_ARGS} OS=Linux" + brand="Linux" + elif use kernel_FreeBSD ; then + MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" + brand="FreeBSD" + fi + export BRANDING="Gentoo ${brand}" + + export DEBUG=$(usev debug) + export MKPAM=$(usev pam) + export MKTERMCAP=$(usev ncurses) +} + +src_unpack() { + if [[ ${PV} == "9999" ]] ; then + subversion_src_unpack + else + unpack ${A} + fi + cd "${S}" + epatch "${FILESDIR}"/9999/*.patch +} + +src_compile() { + # catch people running `ebuild` w/out setup + if [[ -z ${MAKE_ARGS} ]] ; then + die "Your MAKE_ARGS is empty ... are you running 'ebuild' but forgot to execute 'setup' ?" + fi + + if [[ ${PV} == "9999" ]] ; then + local ver="-svn-$(cd "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}"; LC_ALL=C svn info|awk '/Revision/ { print $2 }')" + sed -i "/^SVNVER[[:space:]]*=/s:=.*:=${ver}:" src/rc/Makefile + fi + + tc-export CC AR RANLIB + echo emake ${MAKE_ARGS} + emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" +} + +src_install() { + emake ${MAKE_ARGS} DESTDIR="${D}" install || die "make install failed" + gen_usr_ldscript libeinfo.so + gen_usr_ldscript librc.so + + keepdir /"${LIBDIR}"/rc/init.d + keepdir /"${LIBDIR}"/rc/tmp + + # Backup our default runlevels + dodir /usr/share/"${PN}" + mv "${D}/etc/runlevels" "${D}/usr/share/${PN}" + + # Setup unicode defaults for silly unicode users + use unicode && sed -i -e '/^unicode=/s:NO:YES:' "${D}"/etc/rc.conf + + # Cater to the norm + (use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps +} + +add_boot_init() { + local initd=$1 + # if the initscript is not going to be installed and is not + # currently installed, return + [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ + || return + [[ -e ${ROOT}/etc/runlevels/boot/${initd} ]] && return + elog "Auto-adding '${initd}' service to your boot runlevel" + ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/boot/${initd} +} +add_boot_init_mit_config() { + local config=$1 initd=$2 + if [[ -e ${ROOT}${config} ]] ; then + if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then + add_boot_init ${initd} + fi + fi +} + +pkg_preinst() { + local f + + # default net script is just comments, so no point in biting people + # in the ass by accident + mv "${D}"/etc/conf.d/net "${T}"/ + [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${T}"/ + + # upgrade timezone file ... do it before moving clock + if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then + ( + source "${ROOT}"/etc/conf.d/clock + [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone + ) + fi + + # /etc/conf.d/clock moved to /etc/conf.d/hwclock + local clock + use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" + if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then + mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} + fi + if [[ -e ${ROOT}/etc/init.d/clock ]] ; then + rm -f "${ROOT}"/etc/init.d/clock + fi + if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then + rm -f "${ROOT}"/etc/runlevels/boot/clock + ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} + fi + if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then + rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock + ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} + fi + + # /etc/conf.d/rc is no longer used for configuration + if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then + elog "/etc/conf.d/rc is no longer used for configuration." + elog "Please migrate your settings to /etc/rc.conf as applicable" + elog "and delete /etc/conf.d/rc" + fi + + # force net init.d scripts into symlinks + for f in "${ROOT}"/etc/init.d/net.* ; do + [[ -e ${f} ]] || continue # catch net.* not matching anything + [[ ${f} == */net.lo ]] && continue # real file now + [[ ${f} == *.openrc.bak ]] && continue + if [[ ! -L ${f} ]] ; then + elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." + elog "You should delete '${f##*/}.openrc.bak' if you don't need it." + mv "${f}" "${f}.openrc.bak" + ln -snf net.lo "${f}" + fi + done + + # openrc-0.4.0 no longer loads the udev addon + enable_udev=0 + if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]] && \ + [[ -e "${ROOT}"/etc/init.d/udev ]] && \ + ! has_version ">=sys-apps/openrc-0.4.0" + then + # make sure udev is in sysinit if it was enabled before + local rc_devices=$( + [[ -f /etc/rc.conf ]] && source /etc/rc.conf + [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc + echo "${rc_devices:-${RC_DEVICES:-auto}}" + ) + case ${rc_devices} in + udev|auto) + enable_udev=1 + ;; + esac + fi + + # skip remaining migration if we already have openrc installed + has_version sys-apps/openrc && return 0 + + # baselayout boot init scripts have been split out + for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do + add_boot_init ${f} + done + + # Try to auto-add some addons when possible + add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt + add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt + add_boot_init_mit_config /etc/mdadm.conf mdraid + add_boot_init_mit_config /etc/evms.conf evms + [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper + [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm + elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" + elog "init.d scripts. If you use such a thing, make sure you have the" + elog "required init.d scripts added to your boot runlevel." + + # Upgrade out state for baselayout-1 users + if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then + ( + [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc + svcdir=${svcdir:-/var/lib/init.d} + if [[ ! -d ${ROOT}${svcdir}/started ]] ; then + ewarn "No state found, and no state exists" + elog "You should reboot this host" + else + mkdir -p "${ROOT}${LIBDIR}/rc/init.d" + einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" + mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d + rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ + "${ROOT}${LIBDIR}"/rc/init.d/console + umount "${ROOT}${svcdir}" 2>/dev/null + rm -rf "${ROOT}${svcdir}" + fi + ) + fi + + # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" + rm -f "${ROOT}"/etc/modules.autoload.d/.keep* + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + local f v + for f in "${ROOT}"/etc/modules.autoload.d/* ; do + v=${f##*/} + v=${v#kernel-} + v=${v//[^[:alnum:]]/_} + gawk -v v="${v}" -v f="${f##*/}" ' + BEGIN { print "\n### START: Auto-converted from " f "\n" } + { + if ($0 ~ /^[^#]/) { + print "modules_" v "=\"${modules_" v "} " $1 "\"" + gsub(/[^[:alnum:]]/, "_", $1) + printf "module_" $1 "_args_" v "=\"" + for (i = 2; i <= NF; ++i) { + if (i > 2) + printf " " + printf $i + } + print "\"\n" + } else + print + } + END { print "\n### END: Auto-converted from " f "\n" } + ' "${f}" >> "${D}"/etc/conf.d/modules + done + rm -f "${f}" + rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null + fi + fi +} + +pkg_postinst() { + # Remove old baselayout links + rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} + + [[ -e ${T}/net && ! -e ${ROOT}/etc/conf.d/net ]] && mv "${T}"/net "${ROOT}"/etc/conf.d/net + + # Make our runlevels if they don't exist + if [[ ! -e ${ROOT}/etc/runlevels ]] ; then + einfo "Copying across default runlevels" + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc + else + if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/sysinit + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* "${ROOT}"/etc/runlevels/sysinit + fi + if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then + mkdir -p "${ROOT}"/etc/runlevels/shutdown + cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* "${ROOT}"/etc/runlevels/shutdown + fi + fi + + if [[ "$enable_udev" = 1 ]]; then + elog "Auto adding udev init script to the sysinit runlevel" + ln -sf /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev + fi + + # update the dependency tree bug #224171 + [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u + + if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then + ewarn "/etc/modules.autoload.d is no longer used. Please convert" + ewarn "your files to /etc/conf.d/modules and delete the directory." + fi + + elog "You should now update all files in /etc, using etc-update" + elog "or equivalent before restarting any services or this host." + elog + elog "Please read the migration guide available at:" + elog "http://www.gentoo.org/doc/en/openrc-migration.xml" +} |