updated the patches for the live ebuild

Package-Manager: portage-2.2_rc46/cvs/Linux i686

6 files changed, 67 insertions, 202 deletions

diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 4313d03d500c..ac159ae5f952 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.88 2009/10/28 17:09:30 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/ChangeLog,v 1.89 2009/10/29 02:28:58 williamh Exp $
+
+  29 Oct 2009; William Hubbs <williamh@gentoo.org>
+  +files/9999/0002-fix-iproute2-support.patch,
+  -files/9999/0002-useful-functions.patch, -files/9999/0003-KV.patch,
+  +files/9999/0003-dont-wipe-wtmp.patch:
+  Updated the patches for the live ebuild.
 
   28 Oct 2009; William Hubbs <williamh@gentoo.org>
   -files/0.4.2/0001-msg-style.patch,
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 063ee86fcc4b..8769be380618 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -7,8 +7,8 @@ AUX 0.5.2/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA
 AUX 0.5.2/0004-fix-typo.patch 673 RMD160 aeeebc237042564aae1f0e09c38accec8aac3b3a SHA1 f86be91ad8f3c441af6b04fa8cb1ed99c3858a36 SHA256 7065d2368fb8dab56595a7f27d5b00c5d360eb22af35723d6cd9bf06d91b21ac
 AUX 0.5.2/0005-fix-iproute2-support.patch 835 RMD160 859e4c8d2c1c8fe8b787432beea370bc955a5e7c SHA1 0cd6fea09ca65945aa86905fc9665d8410186f3c SHA256 491c0444de2d8a11ff17343abb9295e61178db0d3b07e3b075424abe3f287827
 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
+AUX 9999/0002-fix-iproute2-support.patch 835 RMD160 859e4c8d2c1c8fe8b787432beea370bc955a5e7c SHA1 0cd6fea09ca65945aa86905fc9665d8410186f3c SHA256 491c0444de2d8a11ff17343abb9295e61178db0d3b07e3b075424abe3f287827
+AUX 9999/0003-dont-wipe-wtmp.patch 684 RMD160 c1d7df47f123327e03523fc133583a464fc88c71 SHA1 24aa51d63ce6c8b3f9263f41f312f763a9450a44 SHA256 c850f9e948ff1726ec20d73f0afc894e3a010e0285d046eb19b573b781a59e45
 AUX openrc.logrotate 71 RMD160 4e7370ca873bd917f16e2b8cfc4bc71accbf2353 SHA1 ef1f26020db432f96a1485f72a189b288ef6873b SHA256 0b44210db9770588bd491cd6c0ac9412d99124c6be4c9d3f7d31ec8746072f5c
 DIST openrc-0.4.3.tar.bz2 145668 RMD160 9e517cb492651c5fc5f90ba1b52d42238cd239ad SHA1 8b23b410b4cc26670b509bf72a1e6e1e21639cd2 SHA256 58d9e7fcdb9ed5137aff16c3a2f89a2c9296843b60b91830b0380734e27f42c9
 DIST openrc-0.5.2.tar.bz2 153419 RMD160 a2c5e11e1df7325c4e9678cabee62d1168c8bff7 SHA1 3ef138df0e75e50484f9064b1653cebc3b8ab17e SHA256 0633f5cc8c0f055a292722b36108cebbe1925f164df8c0d2688dd376e6f0e18c
@@ -16,5 +16,5 @@ EBUILD openrc-0.4.3-r4.ebuild 11196 RMD160 534248be8b72b188c2183b84f7658d93e3b43
 EBUILD openrc-0.5.2-r1.ebuild 12008 RMD160 d83125ec521333169fcdc4c2fabf25814526cba7 SHA1 d8f74de48eb2b468ad114ef2b6d105cd55a00f2b SHA256 5a0ca85a763c76a1b0fb999fc5597bbae142d91c691f828c384aee83afb58393
 EBUILD openrc-0.5.2.ebuild 12005 RMD160 51371542eb2aca18b2d49d0341994b174fb8ac97 SHA1 8b813caae5c975f0bc436a08ad80fc2c9e70368b SHA256 58679bf0cff94d02318eac2a12ad9c23d6f69bc698189facafac07e636a9366c
 EBUILD openrc-9999.ebuild 12005 RMD160 9baa7ec42f2fd9f95547ee23ee1246c2a44c47de SHA1 e2c7be20a277a48d50a2284d63e3e1d7da060f8e SHA256 78c3247a1b75168b36474c2c29192447dd175165d2149de487d93e7d02cc0f96
-MISC ChangeLog 18034 RMD160 7a1d0df167403c4b8876ede853a1feac0cccac3f SHA1 ace74dc59307c2ac5e9ba9c62c133534755f5ab9 SHA256 b5067281440702533470af54e5e23ea04171cb97ae387fb486cd021eddee8849
+MISC ChangeLog 18287 RMD160 5a40503571471084bede5eb8b6628506275b348c SHA1 a461687023286dd5fdc060610373f080dd154963 SHA256 d44be61fe1f222c22aeab9a1d40dcfd8ccd45a2d1bba86c0227c63f6198e9234
 MISC metadata.xml 314 RMD160 ff92ab9cd3f1f3caf25d0be59cf658343d44991c SHA1 d9febb1ce1499c949a2478defda945a3ce716f73 SHA256 4eb82a61b3697027b5ccb1a328a763308c7e090aa23f69fe87b7b7966165fb33
diff --git a/sys-apps/openrc/files/9999/0002-fix-iproute2-support.patch b/sys-apps/openrc/files/9999/0002-fix-iproute2-support.patch
new file mode 100644
index 000000000000..e204267b63d9
--- /dev/null
+++ b/sys-apps/openrc/files/9999/0002-fix-iproute2-support.patch
@@ -0,0 +1,31 @@
+From aa6d81180167192ad41a73e896f58db89a81d371 Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Mon, 19 Oct 2009 22:25:40 -0500
+Subject: [PATCH] fix iproute2 support for gentoo bug 289762
+
+---
+ init.d/network.in |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/init.d/network.in b/init.d/network.in
+index 5e60963..396c67d 100644
+--- a/init.d/network.in
++++ b/init.d/network.in
+@@ -109,11 +109,11 @@ runip()
+ 	local int="$1" err=
+ 
+ 	shift
+-	err=$(LC_ALL=C ip address add "$@" dev "$int" 2>&1)
++	err=$(LC_ALL=C ip address add "$@" dev "$int" brd + 2>&1)
+ 	if [ -z "$err" ]; then
+ 		# ip does not bring up the interface when adding addresses
+-		if ! intup; then
+-			ip set link up dev "$int"
++		if ! $intup; then
++			ip link set "$int" up
+ 			intup=true
+ 		fi
+ 		return 0
+-- 
+1.6.4.4
+
diff --git a/sys-apps/openrc/files/9999/0002-useful-functions.patch b/sys-apps/openrc/files/9999/0002-useful-functions.patch
deleted file mode 100644
index edd226c48d3a..000000000000
--- a/sys-apps/openrc/files/9999/0002-useful-functions.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-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 3f41f8f..be5285c 100644
---- a/sh/functions.sh.in
-+++ b/sh/functions.sh.in
-@@ -42,6 +42,29 @@ 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
-+		[ "$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
-+}
-+
- _sanitize_path()
- {
- 	local IFS=":" p= path=
-diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
-index ebdb768..68cd6e7 100644
---- a/sh/rc-functions.sh.in
-+++ b/sh/rc-functions.sh.in
-@@ -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
--
--	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:*);;
diff --git a/sys-apps/openrc/files/9999/0003-KV.patch b/sys-apps/openrc/files/9999/0003-KV.patch
deleted file mode 100644
index 95e1035f0546..000000000000
--- a/sys-apps/openrc/files/9999/0003-KV.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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/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.5.4.4
-
diff --git a/sys-apps/openrc/files/9999/0003-dont-wipe-wtmp.patch b/sys-apps/openrc/files/9999/0003-dont-wipe-wtmp.patch
new file mode 100644
index 000000000000..d99fd472dad1
--- /dev/null
+++ b/sys-apps/openrc/files/9999/0003-dont-wipe-wtmp.patch
@@ -0,0 +1,26 @@
+From 3ec425ce9bcd0bb91f74ac7394aa9ee3f10013bd Mon Sep 17 00:00:00 2001
+From: William Hubbs <w.d.hubbs@gmail.com>
+Date: Wed, 28 Oct 2009 20:53:35 -0500
+Subject: [PATCH] Don't wipe wtmp
+
+Thanks to jasiu@belsznica.pl for the patch.
+---
+ init.d/bootmisc.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in
+index 1ec5748..5e24531 100644
+--- a/init.d/bootmisc.in
++++ b/init.d/bootmisc.in
+@@ -95,7 +95,7 @@ start()
+ 		for x in "" $xtra; do
+ 			mkutmp /var/run/utmp$x
+ 		done
+-		[ -e /var/log/wtmp ] && mkutmp /var/log/wtmp
++		[ -e /var/log/wtmp ] || mkutmp /var/log/wtmp
+ 		eend 0
+ 
+ 		ebegin "Cleaning /var/run"
+-- 
+1.6.4.4
+