diff options
author | William Hubbs <williamh@gentoo.org> | 2009-10-29 15:23:06 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2009-10-29 15:23:06 +0000 |
commit | dec26bd2bb6255702ff4247d7bfc85758a3a4b48 (patch) | |
tree | 0ef522a43fb852e717641e640558663a7198da76 /sys-apps | |
parent | amd64/x86 stable, bug #289156 (diff) | |
download | gentoo-2-dec26bd2bb6255702ff4247d7bfc85758a3a4b48.tar.gz gentoo-2-dec26bd2bb6255702ff4247d7bfc85758a3a4b48.tar.bz2 gentoo-2-dec26bd2bb6255702ff4247d7bfc85758a3a4b48.zip |
restored the 0.4.2 patches
(Portage version: 2.2_rc46/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/openrc/ChangeLog | 7 | ||||
-rw-r--r-- | sys-apps/openrc/files/0.4.2/0001-msg-style.patch | 46 | ||||
-rw-r--r-- | sys-apps/openrc/files/0.4.2/0002-useful-functions.patch | 80 | ||||
-rw-r--r-- | sys-apps/openrc/files/0.4.2/0003-KV.patch | 120 |
4 files changed, 252 insertions, 1 deletions
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog index ac159ae5f952..7e8c9425ea7b 100644 --- a/sys-apps/openrc/ChangeLog +++ b/sys-apps/openrc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/openrc # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.89 2009/10/29 02:28:58 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.90 2009/10/29 15:23:06 williamh Exp $ + + 29 Oct 2009; William Hubbs <williamh@gentoo.org> + +files/0.4.2/0001-msg-style.patch, + +files/0.4.2/0002-useful-functions.patch, +files/0.4.2/0003-KV.patch: + restored 0.4.2 patches 29 Oct 2009; William Hubbs <williamh@gentoo.org> +files/9999/0002-fix-iproute2-support.patch, 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 000000000000..ab3559e71a70 --- /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 000000000000..a307386f9504 --- /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 000000000000..8ab646f32c0d --- /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 + |