Update patches against latest svn #267540 by Vivien Moreau.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

5 files changed, 45 insertions, 32 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/Manifest b/sys-apps/openrc/Manifest
index d8dfe5688e00..b9ab793ee6a1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.4.0/0001-msg-style.patch 1709 RMD160 c8f22d90c66cd99da701d0840094694d96269def SHA1 2983c97f1b3c770d9b2afce4540d6d8a7db8abe7 SHA256 5a5d7cd9c0289eb9e7332b01aa15331e8497579efc78ea4d833400d00cb46f7b
 AUX 0.4.0/0002-useful-functions.patch 1803 RMD160 be1963ad7d51deb8ffc96d9ce5d7c59903e9dbcd SHA1 d07901d1c65af2c37a4817d05b364f736b66470c SHA256 d270bba9141333df12c5b5795566bba9f59ba6d6c26a58f09abf0c394f802475
 AUX 0.4.0/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA1 d3489d7a34f9984b4267819677b5e4549c12fc00 SHA256 dab3a00036718ea99058f362d84a4bac5e9bbd4eff934f1ad1d4da85c8551539
@@ -9,9 +12,9 @@ AUX 0.4.2/0003-KV.patch 2569 RMD160 7ccbca71beba996aedcec5aa1def57a96c008893 SHA
 AUX 0.4.2/0004-svn-version.patch 450 RMD160 7e85a0b4e08bd9554749ab384ce61bab4b7ddd21 SHA1 bfcd2eb61affc819f2ecabc420dc9e9c08dc4179 SHA256 f3877a994690912998daae1144a3564eea7a15d841df41af4ca93a37566cce46
 AUX 0.4.3/0001-fix-is_older_than.patch 896 RMD160 8e0cf759932312ddab7e6dfc06c0e08c27f94629 SHA1 a3d9d3ab2d47f2f75529bd32a02ad4541b4aef18 SHA256 d047b14b49c7ce5bf53167a6e0b47d7c23830d91eeeb25d9e0df1330f9f1b1ab
 AUX 0.4.3/0002-support-custom-status.patch 5529 RMD160 b86c26a3f4190dcafc9061e360cac2b45b801fbd SHA1 7e3381e8e13cff93037fe85a9047563348b8aff4 SHA256 f8bbd189054873179d5fa03a50ca513d28efde5888b2b93ffd9de51ed21af362
-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
+AUX 9999/0001-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
+AUX 9999/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd4518e0393a SHA1 86f4a4f49989c688269a6e1f95c27ef00f5186ca SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f
+AUX 9999/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
 DIST openrc-0.4.1.tar.bz2 144429 RMD160 86510cb298eaa8f5f8cef4569e4df903650935de SHA1 1e56096b02a91ae7f455765f3334dfa8cc887f97 SHA256 0b6de456b1f5398089f8d4f805dcee427dced4d6245dfe1427b1994c2d2fa16b
 DIST openrc-0.4.2.tar.bz2 144825 RMD160 68f559ddb41f5fcc367298f258b43bf667af45c3 SHA1 da75f8a9d81639fa7e5de5b398c3b807190be520 SHA256 df6463ba76b3700d803b3fe81c9cd6d511142225ada7ff655cb71b91ca1bf8af
 DIST openrc-0.4.3.tar.bz2 145668 RMD160 9e517cb492651c5fc5f90ba1b52d42238cd239ad SHA1 8b23b410b4cc26670b509bf72a1e6e1e21639cd2 SHA256 58d9e7fcdb9ed5137aff16c3a2f89a2c9296843b60b91830b0380734e27f42c9
@@ -20,5 +23,12 @@ EBUILD openrc-0.4.2.ebuild 10228 RMD160 769c35cd085c3b45d722321c1d13d35b8c4c7283
 EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2520 SHA1 7826444c7fafd4a20f0feca79449e1fc5dc7f8ed SHA256 8bb06d5f79a3010b2060a75ef7770cd95baf71c6be9c59cda7e7288531c5fa06
 EBUILD openrc-0.4.3-r2.ebuild 10462 RMD160 859a50cfa5df320b39caaa6f6436d868850f85f5 SHA1 c86ce35a213a258f9000c26e8b0b741c8ca1d5de SHA256 137c15b63436629b95dff971fc41bfc80c37fbc75d8b6a1df763b6127f8f7a32
 EBUILD openrc-9999.ebuild 10129 RMD160 8a832f78324e5d6c72c31dbfcf86b0da2732802b SHA1 00a8eb5b146e24fc0b8ffb8b374cb2d631ad0d2d SHA256 0f2dc2caf6471ee98530b1dd038c2656be660c2d413fc346241bd5f343ace4b7
-MISC ChangeLog 13967 RMD160 84562877f040831cf8d248d4c3eea9f67bcf321f SHA1 1cbe2c107beee782563d7f7d3cd25585ec997808 SHA256 1e6a1d2c1d5c62d913694ac09f564b57f25a0013584b01bbfcc9c45a1be1a1e9
+MISC ChangeLog 14183 RMD160 0e6bdc6e404ce127dacd5ef170b1ffc628542689 SHA1 34b704d0f534f188357e96ca1e975d6d87ebc731 SHA256 cf68a21ab43122c175320060b496d6e2f0c3ff7240ef3e0bf50a12fcfe3429cc
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn1OqkACgkQn/5bYzqsSmEPQgCfZdxOdz0uWKujlvAf2RSBzBYS
+6J8AoJRuqPIjGlkeXES7DmDiJaMOOvL8
+=COFF
+-----END PGP SIGNATURE-----
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