removed old version

(Portage version: 2.2_rc55/cvs/Linux i686)

5 files changed, 0 insertions, 319 deletions

diff --git a/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch b/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch
deleted file mode 100644
index d99fd472dad1..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-dont-wipe-wtmp.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch b/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch
deleted file mode 100644
index c172886dac61..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-fix-default-domain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3c8ea5896a8c7a6f7cc97cff1bd7b3c8a5739a61 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Sun, 25 Oct 2009 00:03:20 +0100
-Subject: [PATCH 1/3] Fix default domain
-
----
- init.d/network.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/init.d/network.in b/init.d/network.in
-index 5e60963..7f64b17 100644
---- a/init.d/network.in
-+++ b/init.d/network.in
-@@ -174,7 +174,7 @@ start()
- {
- 	local cr=0 r= int= intv= cmd= args= upcmd=
- 
--	if [ -z "$domainname" && -s /etc/defaultdomain ]; then
-+	if [ -z "$domainname" -a -s /etc/defaultdomain ]; then
- 		domainname=$(cat /etc/defaultdomain)
- 	fi
- 	if [ -n "$domainname" ]; then
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch b/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch
deleted file mode 100644
index e204267b63d9..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-fix-iproute2-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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/openrc-0.5.2-linux-containers.patch b/sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch
deleted file mode 100644
index 1543b173e035..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-linux-containers.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From 95ee39ab1c9ce313725098999cf1d05b42f9c126 Mon Sep 17 00:00:00 2001
-From: Roy Marples <roy@marples.name>
-Date: Wed, 4 Nov 2009 19:21:24 +0000
-Subject: [PATCH 2/3] Add support for Linux Containers, fixes #202.
- Patch by bug reporter.
-
----
- init.d/fsck.in       |    2 +-
- init.d/hwclock.in    |    2 +-
- init.d/localmount.in |    2 +-
- init.d/modules.in    |    2 +-
- init.d/mount-ro.in   |    2 +-
- init.d/numlock.in    |    2 +-
- init.d/procfs.in     |    2 +-
- init.d/root.in       |    2 +-
- init.d/swap.in       |    2 +-
- init.d/swclock.in    |    2 +-
- man/runscript.8      |    4 +++-
- src/librc/librc.c    |    2 ++
- src/librc/rc.h.in    |    1 +
- 13 files changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/init.d/fsck.in b/init.d/fsck.in
-index 68cdf14..279e25c 100644
---- a/init.d/fsck.in
-+++ b/init.d/fsck.in
-@@ -9,7 +9,7 @@ _IFS="
- depend()
- {
- 	use dev clock modules
--	keyword -jail -openvz -prefix -timeout -vserver
-+	keyword -jail -openvz -prefix -timeout -vserver -lxc
- }
- 
- _abort() {
-diff --git a/init.d/hwclock.in b/init.d/hwclock.in
-index ea9fa34..e99900f 100644
---- a/init.d/hwclock.in
-+++ b/init.d/hwclock.in
-@@ -28,7 +28,7 @@ depend()
- 	else
- 		before *
- 	fi
--	keyword -openvz -prefix -uml -vserver -xenu
-+	keyword -openvz -prefix -uml -vserver -xenu -lxc
- }
- 
- setupopts()
-diff --git a/init.d/localmount.in b/init.d/localmount.in
-index 89a4801..a4d1116 100644
---- a/init.d/localmount.in
-+++ b/init.d/localmount.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	need fsck
- 	use lvm modules mtab
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/modules.in b/init.d/modules.in
-index c2270ff..7c0b993 100644
---- a/init.d/modules.in
-+++ b/init.d/modules.in
-@@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
- depend()
- {
- 	use isapnp
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
-index 45e0fab..69032d7 100644
---- a/init.d/mount-ro.in
-+++ b/init.d/mount-ro.in
-@@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
- depend()
- {
- 	need killprocs savecache
--	keyword -prefix -openvz -vserver
-+	keyword -prefix -openvz -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/numlock.in b/init.d/numlock.in
-index 9d88fa0..7bf3dc7 100644
---- a/init.d/numlock.in
-+++ b/init.d/numlock.in
-@@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
- depend()
- {
- 	need localmount
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- _setleds()
-diff --git a/init.d/procfs.in b/init.d/procfs.in
-index 712adc2..2b73bd7 100644
---- a/init.d/procfs.in
-+++ b/init.d/procfs.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	use modules devfs
- 	need localmount
--	keyword -openvz -prefix -vserver
-+	keyword -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/root.in b/init.d/root.in
-index 6dc37c8..0689060 100644
---- a/init.d/root.in
-+++ b/init.d/root.in
-@@ -7,7 +7,7 @@ description="Mount the root fs read/write"
- depend()
- {
- 	need fsck
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/swap.in b/init.d/swap.in
-index 564531b..d99b9b8 100644
---- a/init.d/swap.in
-+++ b/init.d/swap.in
-@@ -5,7 +5,7 @@
- depend()
- {
- 	need localmount
--	keyword -jail -openvz -prefix -vserver
-+	keyword -jail -openvz -prefix -vserver -lxc
- }
- 
- start()
-diff --git a/init.d/swclock.in b/init.d/swclock.in
-index 2d091fe..3357fc7 100644
---- a/init.d/swclock.in
-+++ b/init.d/swclock.in
-@@ -8,7 +8,7 @@ depend()
- {
- 	before *
- 	provide clock
--	keyword -openvz -prefix -uml -vserver -xenu
-+	keyword -openvz -prefix -uml -vserver -xenu -lxc
- }
- 
- # swclock is an OpenRC built in
-diff --git a/man/runscript.8 b/man/runscript.8
-index a3e1f2e..22de825 100644
---- a/man/runscript.8
-+++ b/man/runscript.8
-@@ -22,7 +22,7 @@
- .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- .\" SUCH DAMAGE.
- .\"
--.Dd July 1, 2009
-+.Dd November 4, 2009
- .Dt RUNSCRIPT 8 SMM
- .Os OpenRC
- .Sh NAME
-@@ -143,6 +143,8 @@ When in a jail, exclude this service from any dependencies. The service can
- still be run directly.
- .It Dv -openvz
- Same as -jail, but for OpenVZ systems.
-+.It Dv -lxc
-+Same as -jail, but for Linux Resource Containers (LXC).
- .It Dv -shutdown
- Don't stop this service when shutting the system down.
- This normally quite safe as remaining daemons will be sent a SIGTERM just
-diff --git a/src/librc/librc.c b/src/librc/librc.c
-index 96e3195..34bd9e1 100644
---- a/src/librc/librc.c
-+++ b/src/librc/librc.c
-@@ -233,6 +233,8 @@ rc_sys(void)
- 		return RC_SYS_VSERVER;
- 	else if (exists("/proc/vz/veinfo") && !exists("/proc/vz/version"))
- 		return RC_SYS_OPENVZ;
-+	else if (file_regex("/proc/self/cgroup", ":/.+$"))
-+		return RC_SYS_LXC;
- 	else if (file_regex("/proc/self/status",
- 		"envID:[[:space:]]*[1-9]"))
- 		return RC_SYS_OPENVZ; /* old test */
-diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
-index 373f1d1..4b7977e 100644
---- a/src/librc/rc.h.in
-+++ b/src/librc/rc.h.in
-@@ -268,6 +268,7 @@ bool rc_service_daemons_crashed(const char *);
-  * Some services cannot work in these systems, or we do something else. */
- #define RC_SYS_JAIL    "JAIL"
- #define RC_SYS_OPENVZ  "OPENVZ"
-+#define RC_SYS_LXC     "LXC"
- #define RC_SYS_PREFIX  "PREFIX"
- #define RC_SYS_UML     "UML"
- #define RC_SYS_VSERVER "VSERVER"
--- 
-1.6.4.4
-
diff --git a/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch b/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch
deleted file mode 100644
index 473e91d2f8d8..000000000000
--- a/sys-apps/openrc/files/openrc-0.5.2-ppp-options.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4a892a23ba440a90d8a55f6d19d686917fd3e76e Mon Sep 17 00:00:00 2001
-From: Nao Nakashima <nao.nakashima@gmail.com>
-Date: Wed, 4 Nov 2009 19:40:52 +0000
-Subject: [PATCH 3/3] Fix ppp options ordering.
- Fixes #205.
-
----
- net/pppd.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/net/pppd.sh b/net/pppd.sh
-index 5967f0b..a8c8882 100644
---- a/net/pppd.sh
-+++ b/net/pppd.sh
-@@ -90,7 +90,7 @@ pppd_pre_start()
- 	eval passwordset=\$\{password_${IFVAR}-x\}
- 	if [ -n "${username}" ] \
- 	&& [ -n "${password}" -o -z "${passwordset}" ]; then
--		opts="${opts} plugin passwordfd.so passwordfd 0"
-+		opts="plugin passwordfd.so ${opts} passwordfd 0"
- 	fi
- 	
- 	if ! ${hasdefaultmetric}; then
-@@ -155,7 +155,7 @@ pppd_pre_start()
- 			opts="${opts} connect true"
- 			set -- "$@" "${link}"
- 		fi
--		opts="${opts} plugin $1.so"
-+		opts="plugin $1.so ${opts}"
- 		shift
- 		opts="${opts} $@"
- 	done
--- 
-1.6.4.4
-