Update patches against latest svn #267540 by Vivien Moreau.

(Portage version: 2.2_rc31/cvs/Linux x86_64)

4 files changed, 31 insertions, 28 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index a0cf419f3cab..001d8003e64f 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.67 2009/04/18 11:17:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.68 2009/04/27 04:55:00 vapier Exp $
+
+  27 Apr 2009; Mike Frysinger <vapier@gentoo.org>
+  files/9999/0001-msg-style.patch, files/9999/0002-useful-functions.patch,
+  files/9999/0003-KV.patch:
+  Update patches against latest svn #267540 by Vivien Moreau.
 
   18 Apr 2009; Benedikt Böhm <hollow@gentoo.org>
   files/0.4.3/0002-support-custom-status.patch:
diff --git a/sys-apps/openrc/files/9999/0001-msg-style.patch b/sys-apps/openrc/files/9999/0001-msg-style.patch
index ab3559e71a70..0ba3697facf5 100644
--- a/sys-apps/openrc/files/9999/0001-msg-style.patch
+++ b/sys-apps/openrc/files/9999/0001-msg-style.patch
@@ -11,8 +11,8 @@ 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)
+@@ -817,7 +817,7 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
+ 	if (!msg)
  		return;
  
 -	cols = get_term_columns(fp) - (strlen(msg) + 3);
@@ -20,7 +20,7 @@ index f8ddcb5..c46cacb 100644
  
  	/* 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,
+@@ -831,18 +831,15 @@ static void _eend(FILE * __EINFO_RESTRICT fp, int col, ECOLOR color,
  	if (term_is_cons25)
  		cols--;
  
@@ -30,8 +30,8 @@ index f8ddcb5..c46cacb 100644
  	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));
+ 		    ecolor(ECOLOR_BRACKET), ecolor(color), msg,
+ 		    ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL));
  	} else {
  		if (col > 0)
  			for (i = 0; i < cols - col; i++)
diff --git a/sys-apps/openrc/files/9999/0002-useful-functions.patch b/sys-apps/openrc/files/9999/0002-useful-functions.patch
index a307386f9504..edd226c48d3a 100644
--- a/sys-apps/openrc/files/9999/0002-useful-functions.patch
+++ b/sys-apps/openrc/files/9999/0002-useful-functions.patch
@@ -9,26 +9,27 @@ Subject: [PATCH] add a softlevel() function to the API so people dont have to wo
  2 files changed, 22 insertions(+), 23 deletions(-)
 
 diff --git a/sh/functions.sh.in b/sh/functions.sh.in
-index 57917ed..680f534 100644
+index 3f41f8f..be5285c 100644
 --- a/sh/functions.sh.in
 +++ b/sh/functions.sh.in
-@@ -42,6 +42,28 @@ rc_runlevel() {
+@@ -42,6 +42,29 @@ rc_runlevel() {
      rc-status --runlevel
  }
  
 +get_bootparam()
 +{
 +	local match="$1"
-+	[ -z "${match}" -o ! -r /proc/cmdline ] && return 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
++				for x in $params; do
++					[ "$x" = "$match" ] && return 0
 +				done
 +				;;
 +		esac
@@ -42,27 +43,27 @@ index 57917ed..680f534 100644
  {
  	local IFS=":" p= path=
 diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
-index 751d47a..c713def 100644
+index ebdb768..68cd6e7 100644
 --- a/sh/rc-functions.sh.in
 +++ b/sh/rc-functions.sh.in
-@@ -51,29 +51,6 @@ is_union_fs()
+@@ -61,29 +61,6 @@ is_union_fs()
  	unionctl "$1" --list >/dev/null 2>&1
  }
  
 -get_bootparam()
 -{
 -	local match="$1"
--	[ -z "${match}" -o ! -r /proc/cmdline ] && return 1
+-	[ -z "$match" -o ! -r /proc/cmdline ] && return 1
 -
 -	set -- $(cat /proc/cmdline)
 -	while [ -n "$1" ]; do
--		[ "$1" = "${match}" ] && return 0
+-		[ "$1" = "$match" ] && return 0
 -		case "$1" in
 -			gentoo=*)
 -				local params="${1##*=}"
 -				local IFS=, x=
--				for x in ${params}; do
--					[ "${x}" = "${match}" ] && return 0
+-				for x in $params; do
+-					[ "$x" = "$match" ] && return 0
 -				done
 -				;;
 -		esac
@@ -73,8 +74,5 @@ index 751d47a..c713def 100644
 -}
 -
  # Add our sbin to $PATH
- case "${PATH}" in
- 	"${RC_LIBDIR}"/sbin|"${RC_LIBDIR}"/sbin:*);;
--- 
-1.6.0.2
-
+ case "$PATH" in
+ 	"$RC_LIBDIR"/sbin|"$RC_LIBDIR"/sbin:*);;
diff --git a/sys-apps/openrc/files/9999/0003-KV.patch b/sys-apps/openrc/files/9999/0003-KV.patch
index 8ab646f32c0d..95e1035f0546 100644
--- a/sys-apps/openrc/files/9999/0003-KV.patch
+++ b/sys-apps/openrc/files/9999/0003-KV.patch
@@ -59,8 +59,8 @@ 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
+ : ${top_srcdir:=..}
+ . $top_srcdir/test/setup_env.sh
  
 +checkit() {
 +	local output=$($1 $3)
@@ -79,8 +79,8 @@ index d0d6a17..debcf4f 100755
  
  tret=0
 @@ -22,4 +35,36 @@ done
- eend ${tret}
- ((ret+=tret))
+ eend $tret
+ ret=$(($ret + $tret))
  
 +compare_int() {
 +	local got=$(KV_to_int $1)
@@ -112,9 +112,9 @@ index d0d6a17..debcf4f 100755
 +	compare_int 1.2.3.4 -eq ${v}
 +done
 +eend ${tret}
-+((ret+=tret))
++: $((ret+=tret))
 +
- exit ${ret}
+ exit $ret
 -- 
 1.5.4.4