Bump for non bash init scripts and smbfs.

Package-Manager: portage-2.1.2.3

3 files changed, 47 insertions, 20 deletions

diff --git a/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2-r1 b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2-r1
new file mode 100644
index 000000000000..c3de4732eb20
--- /dev/null
+++ b/sys-freebsd/freebsd-usbin/files/digest-freebsd-usbin-6.2-r1
@@ -0,0 +1,27 @@
+MD5 da39228784512bd5bb4fba41f84d70d5 freebsd-contrib-6.2.tar.bz2 36594160
+RMD160 8b89f1ac72ba0054efe1aec2d747ecd33789fde3 freebsd-contrib-6.2.tar.bz2 36594160
+SHA256 dbbd9198597e176242806329242d0e12181820a921e5da42aadefaacda1b6277 freebsd-contrib-6.2.tar.bz2 36594160
+MD5 a25ab389e5f4ebef301abe071b4c196e freebsd-etc-6.2.tar.bz2 190297
+RMD160 1540601566ece689b3fc2935329a2eca62a24314 freebsd-etc-6.2.tar.bz2 190297
+SHA256 ff5970db1d7842d2933589203ae0c3907dee427b2ea99de68fce678582bf1804 freebsd-etc-6.2.tar.bz2 190297
+MD5 35378351a7ff00643f6149fe2a2d5998 freebsd-include-6.2.tar.bz2 131651
+RMD160 9264ba0661bbdceba85c4bef19a2ebd788ec6957 freebsd-include-6.2.tar.bz2 131651
+SHA256 38928510c34efd735a977896a9f96e71b48c22cf4727677ee954a23aff871d53 freebsd-include-6.2.tar.bz2 131651
+MD5 63b8b5552e729be41b98a73665bcd422 freebsd-lib-6.2.tar.bz2 2670374
+RMD160 95bbce7862fc7a406b8629914f281d5e01e5ea71 freebsd-lib-6.2.tar.bz2 2670374
+SHA256 8e0c909a79a9ed18841f8a5a6e25fc770f76de1a5dc20cbd6bc591bed52d1033 freebsd-lib-6.2.tar.bz2 2670374
+MD5 5cad9ad0ed76a85bf9188020ed9be879 freebsd-libexec-6.2.tar.bz2 277231
+RMD160 423490cb7c888bfce7edcf473d77868c65c21fe2 freebsd-libexec-6.2.tar.bz2 277231
+SHA256 546821f50ff3e69cebd59e1415798233050259de33a4b37acfcbd56b8d92782b freebsd-libexec-6.2.tar.bz2 277231
+MD5 b128d77e13f4956dd8ff60c4b4a670da freebsd-sbin-6.2.tar.bz2 1162548
+RMD160 f7d5f4ea5e4b5e03910a44a127b5670f8d6ebf2c freebsd-sbin-6.2.tar.bz2 1162548
+SHA256 aef424c07686bb72fbd06e4fd66a01b00bd36b70fec02ebdc228061cd4b435dd freebsd-sbin-6.2.tar.bz2 1162548
+MD5 79c16213744e76d3bf13a9ac21ede56d freebsd-sys-6.2.tar.bz2 18344936
+RMD160 784230e22ccaf09933ef3f053ff29cc3e579786a freebsd-sys-6.2.tar.bz2 18344936
+SHA256 a754371d88601aaab7152bb3d127bd3777db912e13a26a866e13ba34934c5e5b freebsd-sys-6.2.tar.bz2 18344936
+MD5 c6c8f8a7218d2294e499f80a2c77def3 freebsd-ubin-6.2.tar.bz2 1772844
+RMD160 8101bc3e98fa485e31ecf0d5529136ddeb4be5b9 freebsd-ubin-6.2.tar.bz2 1772844
+SHA256 446c1a8c7031defda8b184ccf4535cacf651928f324db6ce0aaec3b87b04d9ae freebsd-ubin-6.2.tar.bz2 1772844
+MD5 a1596f3407f95b33f927afc0e3eff428 freebsd-usbin-6.2.tar.bz2 2695872
+RMD160 ea6104fcfbf6c0be511a80d0475e5a8f716292be freebsd-usbin-6.2.tar.bz2 2695872
+SHA256 6195301d39e7bc7fa00f6dec71479b1800ea5c3dc9d3ea375dafe4e71e6485f0 freebsd-usbin-6.2.tar.bz2 2695872
diff --git a/sys-freebsd/freebsd-usbin/files/nfs.initd b/sys-freebsd/freebsd-usbin/files/nfs.initd
index 77f51c723fb8..d99017f9d0ad 100755
--- a/sys-freebsd/freebsd-usbin/files/nfs.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfs.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v 1.2 2007/04/06 14:47:17 uberlord Exp $
 
 #---------------------------------------------------------------------------
 # This script starts/stops the following
@@ -34,11 +34,11 @@ depend() {
 }
 
 start_idmapd() {
-	[[ ! -x ${idmapd} ]] && return 0
+	[ ! -x "${idmapd}" ] && return 0
 
 	if grep -q rpc_pipefs /proc/filesystems ; then
 		if ! grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			[[ ! -d /var/lib/nfs/rpc_pipefs ]] && mkdir -p /var/lib/nfs/rpc_pipefs
+			[ ! -d /var/lib/nfs/rpc_pipefs ] && mkdir -p /var/lib/nfs/rpc_pipefs
 			ebegin "Mounting RPC pipefs"
 			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
 			eend $?
@@ -51,14 +51,14 @@ start_idmapd() {
 }
 
 stop_idmapd() {
-	[[ ! -x ${idmapd} ]] && return 0
+	[ ! -x ${idmapd} ] && return 0
 
 	ebegin "Stopping idmapd"
 	start-stop-daemon --stop --quiet --exec ${idmapd}
 	ret=$?
 	eend ${ret}
 
-	if [[ $restarting == "no" ]] ; then
+	if [ $restarting = "no" -a "${RC_CMD}" != "restart" ] ; then
 		if grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
 			ebegin "Unmounting RPC pipefs"
 			umount /var/lib/nfs/rpc_pipefs
@@ -71,7 +71,7 @@ stop_idmapd() {
 
 start_statd() {
 	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd &>/dev/null && return 0
+	killall -0 rpc.statd 2>/dev/null && return 0
 	ebegin "Starting NFS statd"
 	start-stop-daemon --start --quiet --exec \
 		$statd -- $RPCSTATDOPTS 1>&2
@@ -82,7 +82,7 @@ stop_statd() {
 	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
 	mount -t nfs | grep -q . && return 0
 	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
+	killall -0 rpc.statd 2>/dev/null || return 0
 	# Okay, all tests passed, stop rpc.statd
 	ebegin "Stopping NFS statd"
 	start-stop-daemon --stop --quiet --exec $statd 1>&2
@@ -91,7 +91,7 @@ stop_statd() {
 
 waitfor_exportfs() {
 	local pid=$1
-	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid &>/dev/null ) &
+	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
 	wait $1
 }
 
@@ -102,8 +102,8 @@ start() {
 	fi
 
 	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -q nfsd /proc/filesystems &>/dev/null; then
-		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts &>/dev/null; then
+	if grep -q nfsd /proc/filesystems 2>/dev/null; then
+		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts 2>/dev/null; then
 			ebegin "Mounting nfsd filesystem in /proc"
 			mount -t nfsd nfsd /proc/fs/nfs
 			eend $? "Error mounting nfsd filesystem in /proc"
@@ -117,14 +117,14 @@ start() {
 	# Exportfs likes to hang if networking isn't working.
 	# If that's the case, then try to kill it so the
 	# bootup process can continue.
-	if grep -q '^/' /etc/exports &>/dev/null; then
+	if grep -q '^/' /etc/exports 2>/dev/null; then
 		ebegin "Exporting NFS directories"
 		$exportfs -r 1>&2 &
 		waitfor_exportfs $!
 		eend $? "Error exporting NFS directories"
 	fi
 
-	if [ -x $rquotad ]; then
+	if [ -x "${rquotad}" ]; then
 		ebegin "Starting NFS rquotad"
 		start-stop-daemon --start --quiet --exec \
 			$rquotad -- $RPCRQUOTADOPTS 1>&2
@@ -177,7 +177,7 @@ stop() {
 	# then "exportfs -r" will reread the xtab, and all the current
 	# clients will be able to resume NFS activity, *without* needing
 	# to umount/(re)mount the filesystem.
-	if [ "$restarting" = no ]; then
+	if [ "$restarting" = no -a "${RC_CMD}" != "restart" ]; then
 		ebegin "Unexporting NFS directories"
 		# Exportfs likes to hang if networking isn't working.
 		# If that's the case, then try to kill it so the
diff --git a/sys-freebsd/freebsd-usbin/files/nfsmount.initd b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
index a17dff3957a4..9208804d6627 100755
--- a/sys-freebsd/freebsd-usbin/files/nfsmount.initd
+++ b/sys-freebsd/freebsd-usbin/files/nfsmount.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.2 2007/02/23 14:03:08 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfsmount.initd,v 1.3 2007/04/06 14:47:17 uberlord Exp $
 
 depend() {
 	need net rpcbind
@@ -10,7 +10,7 @@ depend() {
 
 start_statd() {
 	# Don't start rpc.statd if already started by init.d/nfs
-	killall -0 rpc.statd &>/dev/null && return 0
+	killall -0 rpc.statd 2>/dev/null && return 0
 	ebegin "Starting NFS statd"
 	rpc.statd
 	eend $? "Error starting NFS statd"
@@ -18,9 +18,9 @@ start_statd() {
 
 stop_statd() {
 	# Don't stop rpc.statd if it's in use by init.d/nfs
-	killall -0 nfsd &>/dev/null && return 0
+	killall -0 nfsd 2>/dev/null && return 0
 	# Make sure it's actually running
-	killall -0 rpc.statd &>/dev/null || return 0
+	killall -0 rpc.statd 2>/dev/null || return 0
 	# Okay, all tests passed, stop rpc.statd
 	ebegin "Stopping NFS statd"
 	killall rpc.statd
@@ -29,7 +29,7 @@ stop_statd() {
 
 start_lockd() {
 	# Don't start rpc.lockd if already started by init.d/nfs
-	killall -0 rpc.lockd &>/dev/null && return 0
+	killall -0 rpc.lockd 2>/dev/null && return 0
 	ebegin "Starting NFS lockd"
 	rpc.lockd
 	eend $? "Error starting NFS lockd"
@@ -37,9 +37,9 @@ start_lockd() {
 
 stop_lockd() {
 	# Don't stop rpc.lockd if it's in use by init.d/nfs
-	killall -0 nfsd &>/dev/null && return 0
+	killall -0 nfsd 2>/dev/null && return 0
 	# Make sure it's actually running
-	killall -0 rpc.lockd &>/dev/null || return 0
+	killall -0 rpc.lockd 2>/dev/null || return 0
 	# Okay, all tests passed, stop rpc.lockd
 	ebegin "Stopping NFS lockd"
 	killall rpc.lockd