Add --svcdir option to depscan.sh so that other programs don't have to change internal variables.

(Portage version: 2.1_pre5-r1)

4 files changed, 283 insertions, 0 deletions

diff --git a/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch
new file mode 100644
index 000000000000..802c25734a30
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch
@@ -0,0 +1,146 @@
+Index: sbin/rc
+===================================================================
+--- sbin/rc	(revision 1934)
++++ sbin/rc	(working copy)
+@@ -407,7 +407,7 @@
+ 	         grep -ve '\(depcache\|deptree\|envcache\)')
+ 
+ 	# Update the dependency cache
+-	/sbin/depscan.sh -u
++	/sbin/depscan.sh
+ 
+ 	# Now that the dependency cache are up to date, make sure these
+ 	# are marked as started ...
+Index: sbin/depscan.sh
+===================================================================
+--- sbin/depscan.sh	(revision 1934)
++++ sbin/depscan.sh	(working copy)
+@@ -1,58 +1,64 @@
+ #!/bin/bash
+ # Copyright 1999-2004 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/files/baselayout-1.11.14-depscan.patch,v 1.1 2006/03/02 17:37:20 uberlord Exp $
+ 
+-source /etc/init.d/functions.sh
++. /sbin/functions.sh
++mysvcdir="${svcdir}"
++update=false
+ 
+-if [[ $1 == "--debug" ]] ; then
++while [[ -n $1 ]] ; do
++	case "$1" in
++		--debug|-d)
++			set -x
++			;;
++		--svcdir|-s)
++			if [[ -z $2 || $2 == -* ]] ; then
++				eerror "No svcdir specified"
++			else
++				shift
++				mysvcdir="$1"
++			fi
++			;;
++		--update|-u)
++			update=true
++			;;
++	esac
+ 	shift
+-	set -x
+-fi
++done
+ 
+-if [ ! -d "${svcdir}" ]
+-then
+-	if ! mkdir -p -m 0755 "${svcdir}" 2>/dev/null
+-	then
+-		eerror " Could not create needed directory '${svcdir}'!"
++if [[ ! -d ${mysvcdir} ]] ; then
++	if ! mkdir -p -m 0755 "${mysvcdir}" 2>/dev/null ; then
++		eerror "Could not create needed directory '${mysvcdir}'!"
+ 	fi
+ fi
+ 
+-for x in softscripts snapshot options started
+-do
+-	if [ ! -d "${svcdir}/${x}" ]
+-	then
+-		if ! mkdir -p -m 0755 "${svcdir}/${x}" 2>/dev/null
+-		then
+-			eerror " Could not create needed directory '${svcdir}/${x}'!"
++for x in softscripts snapshot options started ; do
++	if [[ ! -d "${mysvcdir}/${x}" ]] ; then
++		if ! mkdir -p -m 0755 "${mysvcdir}/${x}" 2>/dev/null ; then
++			eerror "Could not create needed directory '${mysvcdir}/${x}'!"
+ 		fi
+ 	fi
+ done
+ 
+ # Only update if files have actually changed
+-update=1
+-if [ "$1" == "-u" ]
+-then
+-	update=0
+-	for config in /etc/conf.d /etc/init.d /etc/rc.conf
+-	do
+-		if [ "${config}" -nt "${svcdir}/depcache" ]
+-		then
+-			update=1
++if ! ${update} ; then
++	for config in /etc/conf.d /etc/init.d /etc/rc.conf ; do
++		if [[ ${config} -nt "${mysvcdir}/depcache" ]] ; then
++			update=true	
+ 			break
+ 		fi
+ 	done
+-	shift
+ fi
+-[ ${update} -eq 0 ] && exit 0
+ 
++! ${update} && exit 0
++
+ ebegin "Caching service dependencies"
+ 
+ # Clean out the non volitile directories ...
+-rm -rf "${svcdir}"/dep{cache,tree} "${svcdir}"/{broken,snapshot}/*
++rm -rf "${mysvcdir}"/dep{cache,tree} "${mysvcdir}"/{broken,snapshot}/*
+ 
+ retval=0
+-SVCDIR="${svcdir}"
++SVCDIR="${mysvcdir}"
+ DEPTYPES="${deptypes}"
+ ORDTYPES="${ordtypes}"
+ 
+@@ -65,17 +71,17 @@
+ 	-f /lib/rcscripts/awk/cachedepends.awk || \
+ 	retval=1
+ 
+-bash "${svcdir}/depcache" | \
++bash "${mysvcdir}/depcache" | \
+ /bin/gawk \
+ 	-f /lib/rcscripts/awk/functions.awk \
+ 	-f /lib/rcscripts/awk/gendepends.awk || \
+ 	retval=1
+ 
+-touch -m "${svcdir}"/dep{cache,tree}
++touch "${mysvcdir}"/dep{cache,tree}
++chmod 0644 "${mysvcdir}"/dep{cache,tree}
+ 
+ eend ${retval} "Failed to cache service dependencies"
+ 
+ exit ${retval}
+ 
+-
+ # vim:ts=4
+Index: sbin/rc-services.sh
+===================================================================
+--- sbin/rc-services.sh	(revision 1934)
++++ sbin/rc-services.sh	(working copy)
+@@ -10,7 +10,7 @@
+ 
+ if [ "${RC_GOT_DEPTREE_INFO}" != "yes" ]
+ then
+-	if ! /sbin/depscan.sh -u
++	if ! /sbin/depscan.sh
+ 	then
+ 		echo
+ 		eerror "Error running '/sbin/depscan.sh'!"
diff --git a/sys-apps/baselayout/files/baselayout-1.12.0_pre16-depscan.patch b/sys-apps/baselayout/files/baselayout-1.12.0_pre16-depscan.patch
new file mode 100644
index 000000000000..8a11ccbcae11
--- /dev/null
+++ b/sys-apps/baselayout/files/baselayout-1.12.0_pre16-depscan.patch
@@ -0,0 +1,131 @@
+Index: sbin/depscan.sh
+===================================================================
+--- sbin/depscan.sh	(revision 1934)
++++ sbin/depscan.sh	(working copy)
+@@ -3,68 +3,83 @@
+ # Distributed under the terms of the GNU General Public License v2
+ 
+ source /sbin/functions.sh
++mysvcdir="${svcdir}"
++update=false
+ 
+-if [[ $1 == "--debug" ]] ; then
++while [[ -n $1 ]] ; do
++	case "$1" in
++		--debug|-d)
++			set -x
++			;;
++		--svcdir|-s)
++			if [[ -z $2 || $2 == -* ]] ; then
++				eerror "No svcdir specified"
++			else
++				shift
++				mysvcdir="$1"
++			fi
++			;;
++		--update|-u)
++			update=true
++			;;
++	esac
+ 	shift
+-	set -x
+-fi
++done
+ 
+-if [[ ! -d ${svcdir} ]] ; then
+-	if ! mkdir -p -m 0755 "${svcdir}" 2>/dev/null ; then
+-		eerror "Could not create needed directory '${svcdir}'!"
++if [[ ! -d ${mysvcdir} ]] ; then
++	if ! mkdir -p -m 0755 "${mysvcdir}" 2>/dev/null ; then
++		eerror "Could not create needed directory '${mysvcdir}'!"
+ 	fi
+ fi
+ 
+ for x in softscripts snapshot options daemons \
+ 	started starting inactive wasinactive stopping failed \
+ 	exclusive exitcodes scheduled ; do
+-	if [[ ! -d "${svcdir}/${x}" ]] ; then
+-		if ! mkdir -p -m 0755 "${svcdir}/${x}" 2>/dev/null ; then
+-			eerror "Could not create needed directory '${svcdir}/${x}'!"
++	if [[ ! -d "${mysvcdir}/${x}" ]] ; then
++		if ! mkdir -p -m 0755 "${mysvcdir}/${x}" 2>/dev/null ; then
++			eerror "Could not create needed directory '${mysvcdir}/${x}'!"
+ 		fi
+ 	fi
+ done
+ 
+ # Only update if files have actually changed
+-update=1
++if ! ${update} ; then
++	clock_screw=false
++	mtime_test="${mysvcdir}/mtime-test.$$"
+ 
+-if [[ $1 == "-u" ]] ; then
+-	update=0
+-	clock_screw=0
+-	mtime_test="${svcdir}/mtime-test.$$"
+-
+ 	# If its not there, we have to update, and make sure its present
+ 	# for next mtime testing
+-	if [[ ! -e "${svcdir}/depcache" ]] ; then
+-			update=1
+-			touch "${svcdir}/depcache"
++	if [[ ! -e "${mysvcdir}/depcache" ]] ; then
++			update=true
++			touch "${mysvcdir}/depcache"
+ 	fi
+ 
+ 	touch "${mtime_test}"
+ 	for config in /etc/conf.d /etc/init.d /etc/rc.conf
+ 	do
+-		[[ ${update} == 0 ]] && \
+-			is_older_than "${svcdir}/depcache" "${config}" && update=1
++		! ${update} \
++			&& is_older_than "${mysvcdir}/depcache" "${config}" \
++			&& update=true
+ 		
+-		is_older_than "${mtime_test}" "${config}" && clock_screw=1
++		is_older_than "${mtime_test}" "${config}" && clock_screw=true
+ 	done
+ 	rm -f "${mtime_test}"
+ 
+-	[[ ${clock_screw} == 1 ]] && \
++	${clock_screw} && \
+ 		ewarn "Some file in '/etc/{conf.d,init.d}' have Modification time in the future!"
+ 
+ 	shift
+ fi
+ 
+-[[ ${update} == 0 && -e "${svcdir}/deptree" ]] && exit 0
++! ${update} && [[ -e "${mysvcdir}/deptree" ]] && exit 0
+ 
+ ebegin "Caching service dependencies"
+ 
+ # Clean out the non volitile directories ...
+-rm -rf "${svcdir}"/dep{cache,tree} "${svcdir}"/{broken,snapshot}/*
++rm -rf "${mysvcdir}"/dep{cache,tree} "${mysvcdir}"/{broken,snapshot}/*
+ 
+ retval=0
+-SVCDIR="${svcdir}"
++SVCDIR="${mysvcdir}"
+ DEPTYPES="${deptypes}"
+ ORDTYPES="${ordtypes}"
+ 
+@@ -77,14 +92,14 @@
+ 	-f /lib/rcscripts/awk/cachedepends.awk || \
+ 	retval=1
+ 
+-bash "${svcdir}/depcache" | \
++bash "${mysvcdir}/depcache" | \
+ /bin/gawk \
+ 	-f /lib/rcscripts/awk/functions.awk \
+ 	-f /lib/rcscripts/awk/gendepends.awk || \
+ 	retval=1
+ 
+-touch "${svcdir}"/dep{cache,tree}
+-chmod 0644 "${svcdir}"/dep{cache,tree}
++touch "${mysvcdir}"/dep{cache,tree}
++chmod 0644 "${mysvcdir}"/dep{cache,tree}
+ 
+ eend ${retval} "Failed to cache service dependencies"
+ 
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.11.14-r6 b/sys-apps/baselayout/files/digest-baselayout-1.11.14-r6
new file mode 100644
index 000000000000..02f0a1051117
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.11.14-r6
@@ -0,0 +1,3 @@
+MD5 3ef9ae479847d474c33d7d54f4912e77 rc-scripts-1.6.14.tar.bz2 159580
+RMD160 564997e6d116ce9d24fd5dcdb885504bce14809e rc-scripts-1.6.14.tar.bz2 159580
+SHA256 d269f2e7749e4034adc5d87bb618901348f6869939a40dba79ba763ea76633ee rc-scripts-1.6.14.tar.bz2 159580
diff --git a/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre16-r2 b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre16-r2
new file mode 100644
index 000000000000..271fd941bb5b
--- /dev/null
+++ b/sys-apps/baselayout/files/digest-baselayout-1.12.0_pre16-r2
@@ -0,0 +1,3 @@
+MD5 50441239bb337689c5d8885ebaf3dff2 baselayout-1.12.0_pre16.tar.bz2 215775
+RMD160 8f989cecba0105072610f7cf437d43fd0a772fd8 baselayout-1.12.0_pre16.tar.bz2 215775
+SHA256 e09739b76fc0ab91eba696979612fb62e28718d57a68a9f66e0fa9c74cc5768d baselayout-1.12.0_pre16.tar.bz2 215775