fix multilib issues. support multiple ntp servers. fix sysctl w/ vserver issue.

(Portage version: 2.1.4.4)

3 files changed, 128 insertions, 0 deletions

diff --git a/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch b/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch
new file mode 100644
index 000000000000..138d715e7689
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.2-multilib-fix.patch
@@ -0,0 +1,84 @@
+From: Roy Marples <roy@marples.name>
+Date: Thu, 27 Mar 2008 16:53:22 +0000 (+0000)
+Subject: Fix mulitlib issues.
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=bf488c54bf93e0b4d95e6aa9303107de098cf049;hp=4e3ef56e27028d1f2976340205ab7f4adc700cb9
+
+Fix mulitlib issues.
+---
+
+diff --git a/sh/functions.sh.in b/sh/functions.sh.in
+index 1a1fbba..7575d9c 100644
+--- a/sh/functions.sh.in
++++ b/sh/functions.sh.in
+@@ -43,7 +43,7 @@ _sanitize_path()
+ 	local IFS=":" p= path=
+ 	for p in ${PATH}; do
+ 		case "${p}" in
+-			@PREFIX@/lib/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);;
++			@PREFIX@/@LIB@/rc/sbin|@PREFIX@/bin|@PREFIX@/sbin|/usr/bin|/usr/sbin);;
+ 			@PKG_PREFIX@/bin|@PKG_PREFIX@/sbin);;
+ 			@LOCAL_PREFIX@/bin|@LOCAL_PREFIX@/sbin);;
+ 			*) path="${path}${path:+:}${p}";;
+@@ -66,7 +66,7 @@ _PREFIX=@PREFIX@
+ _PKG_PREFIX=@PKG_PREFIX@
+ _LOCAL_PREFIX=@LOCAL_PREFIX@
+ _LOCAL_PREFIX=${_LOCAL_PREFIX:-/usr/local}
+-_PATH=@PREFIX@/lib/rc/bin
++_PATH=@PREFIX@/@LIB@/rc/bin
+ case "${_PREFIX}" in
+ 	"${_PKG_PREFIX}"|"${_LOCAL_PREFIX}") ;;
+ 	*) _PATH="${_PATH}:${_PREFIX}/bin:${_PREFIX}/sbin";;
+@@ -99,7 +99,7 @@ else
+ 	# the last ecmd
+ 	for _e in ebegin eend error errorn einfo einfon ewarn ewarnn ewend \
+ 		vebegin veend veinfo vewarn vewend; do
+-		eval "${_e}() { local _r; @PREFIX@/lib/rc/bin/${_e} \"\$@\"; _r=$?; \
++		eval "${_e}() { local _r; @PREFIX@/@LIB@/rc/bin/${_e} \"\$@\"; _r=$?; \
+ 		export EINFO_LASTCMD=${_e}; return \$_r; }"
+ 	done
+ 	unset _e
+diff --git a/sh/init-common-post.sh b/sh/init-common-post.sh
+index cb44999..61f3863 100644
+--- a/sh/init-common-post.sh
++++ b/sh/init-common-post.sh
+@@ -8,7 +8,7 @@ retval=0
+ # the old service state data
+ if [ "${RC_SVCDIR}" != "/" ] && mkdir "${RC_SVCDIR}/.test.$$" 2>/dev/null; then
+ 	rmdir "${RC_SVCDIR}/.test.$$"
+-	for x in ${RC_SVCDIR:-/lib/rc/init.d}/*; do
++	for x in ${RC_SVCDIR:-/@LIB@/rc/init.d}/*; do
+ 		[ -e "${x}" ] || continue
+ 		case ${x##*/} in
+ 			depconfig|deptree|ksoftlevel|rc.log);;
+diff --git a/sh/rc-functions.sh.in b/sh/rc-functions.sh.in
+index 74db71e..f449783 100644
+--- a/sh/rc-functions.sh.in
++++ b/sh/rc-functions.sh.in
+@@ -4,15 +4,15 @@
+ 
+ has_addon()
+ {
+-	[ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /lib/rcscripts/addons/"$1".sh ]
++	[ -e "${RC_LIBDIR}/addons/$1.sh" ] || [ -e /@LIB@/rcscripts/addons/"$1".sh ]
+ }
+ 
+ import_addon()
+ {
+ 	if [ -e "${RC_LIBDIR}/addons/$1.sh" ]; then
+ 		. "${RC_LIBDIR}/addons/$1.sh"
+-	elif [ -e /lib/rcscripts/addons/"$1".sh ]; then
+-		. /lib/rcscripts/addons/"$1".sh
++	elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then
++		. /@LIB@/rcscripts/addons/"$1".sh
+ 	else
+ 		return 1
+ 	fi
+@@ -75,6 +75,6 @@ get_bootparam()
+ 
+ # Add our sbin to $PATH
+ case "${PATH}" in
+-	@PREFIX@/lib/rc/sbin|@PREFIX@/lib/rc/sbin:*);;
+-	*) export PATH="@PREFIX@/lib/rc/sbin:${PATH}";;
++	"${RC_LIBDIR}"/rc/sbin|"${RC_LIBDIR}"/rc/sbin:*);;
++	*) export PATH="${RC_LIBDIR}/rc/sbin:${PATH}";;
+ esac
diff --git a/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch b/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch
new file mode 100644
index 000000000000..5c93d8340fc8
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.2-multiple-ntp-servers.patch
@@ -0,0 +1,23 @@
+From: Nathan Phillip Brink <ohnobinki@gmail.com>
+Date: Wed, 26 Mar 2008 22:39:27 +0000 (+0000)
+Subject: Allow multiple ntp_servers without error, #47
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=790e886674f73af3d28d3e07ced854a4cbbe2e8c
+
+Allow multiple ntp_servers without error, #47
+---
+
+diff --git a/net/system.sh b/net/system.sh
+index 2cbab9c..aa654a1 100644
+--- a/net/system.sh
++++ b/net/system.sh
+@@ -58,8 +58,8 @@ _system_ntp()
+ 	local servers= buffer= x=
+ 
+ 	eval servers=\$ntp_servers_${IFVAR}
+-	[ -z ${servers} ] && servers=${ntp_servers}
+-	[ -z ${servers} ] && return 0
++	[ -z "${servers}" ] && servers=${ntp_servers}
++	[ -z "${servers}" ] && return 0
+ 
+ 	buffer="# Generated by net-scripts for interface ${IFACE}\n"
+ 	buffer="${buffer}restrict default noquery notrust nomodify\n"
diff --git a/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch b/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch
new file mode 100644
index 000000000000..b3a57cf4446c
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.2-sysctl-vserver-fix.patch
@@ -0,0 +1,21 @@
+From: Roy Marples <roy@marples.name>
+Date: Fri, 28 Mar 2008 19:05:26 +0000 (+0000)
+Subject: Restore noserver and noopenvz to sysctl.
+X-Git-Url: http://git.overlays.gentoo.org/gitweb/?p=proj%2Fopenrc.git;a=commitdiff_plain;h=b5c48ca38cd7b599a241ac658fa276a75a46cfd3
+
+Restore noserver and noopenvz to sysctl.
+---
+
+diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
+index 03f48ee..9bf56a8 100644
+--- a/init.d/sysctl.Linux.in
++++ b/init.d/sysctl.Linux.in
+@@ -6,7 +6,7 @@ depend()
+ {
+ 	use hostname
+ 	before bootmisc logger
+-	keyword noprefix
++	keyword noopenvz noprefix novserver
+ }
+ 
+ start()