Bump baselayout version with more fixes to init system, all the patches for s-s-d and rc-daemon in place and working routing support in networking scripts.

Package-Manager: portage-2.1_pre7-r5

4 files changed, 6 insertions, 112 deletions

diff --git a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r3 b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r3
deleted file mode 100644
index 0b7a79ec7cb4..000000000000
--- a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r3
+++ /dev/null
@@ -1,6 +0,0 @@
-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
-MD5 fe1dc941db27880a2f54f52a000e9e3e freebsd-baselayout-20060401.tar.bz2 216260
-RMD160 436645254490c558336f918b1d550ff5b03a0ec0 freebsd-baselayout-20060401.tar.bz2 216260
-SHA256 6f2ec760b9fb65e115d1c0b9c1628b5ddfcf214fe56cbb1a7a2eef5dbbdec292 freebsd-baselayout-20060401.tar.bz2 216260
diff --git a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060414 b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060414
new file mode 100644
index 000000000000..0b02bb245606
--- /dev/null
+++ b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060414
@@ -0,0 +1,6 @@
+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
+MD5 4d5d9dd761bde82994e9e9751ecb0b82 freebsd-baselayout-20060414.tar.bz2 213043
+RMD160 a1e1ea8e92c7975dd2260181a6631a078aa28960 freebsd-baselayout-20060414.tar.bz2 213043
+SHA256 27863a33ea2760cf44d17556e2e69d0df3a37330041dfe42997fa95af3966540 freebsd-baselayout-20060414.tar.bz2 213043
diff --git a/sys-freebsd/freebsd-baselayout/files/profile b/sys-freebsd/freebsd-baselayout/files/profile
deleted file mode 100644
index 835b0abff752..000000000000
--- a/sys-freebsd/freebsd-baselayout/files/profile
+++ /dev/null
@@ -1,58 +0,0 @@
-# /etc/profile: login shell setup
-#
-# That this file is used by any Bourne-shell derivative to setup the
-# environment for login shells.
-#
-
-# Load environment settings from profile.env, which is created by
-# env-update from the files in /etc/env.d
-if [ -e /etc/profile.env ] ; then
-	. /etc/profile.env
-fi
-
-# 077 would be more secure, but 022 is generally quite realistic
-umask 022
-
-# Set up PATH depending on whether we're root or a normal user.
-# There's no real reason to exclude sbin paths from the normal user,
-# but it can make tab-completion easier when they aren't in the
-# user's PATH to pollute the executable namespace.
-#
-# It is intentional in the following line to use || instead of -o.
-# This way the evaluation can be short-circuited and calling whoami is
-# avoided.
-if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
-	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
-else
-	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
-fi
-export PATH
-unset ROOTPATH
-
-# Extract the value of EDITOR
-[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
-[ -z "$EDITOR" ] && EDITOR="/bin/nano"
-export EDITOR
-
-if [ -n "${BASH_VERSION}" ] ; then
-	# Newer bash ebuilds include /etc/bash/bashrc which will setup PS1
-	# including color.  We leave out color here because not all
-	# terminals support it.
-	if [ -f /etc/bash/bashrc ] ; then
-		# Bash login shells run only /etc/profile
-		# Bash non-login shells run only /etc/bash/bashrc
-		# Since we want to run /etc/bash/bashrc regardless, we source it 
-		# from here.  It is unfortunate that there is no way to do 
-		# this *after* the user's .bash_profile runs (without putting 
-		# it in the user's dot-files), but it shouldn't make any 
-		# difference.
-		. /etc/bash/bashrc
-	else
-		PS1='\u@\h \w \$ '
-	fi
-else
-	# Setup a bland default prompt.  Since this prompt should be useable
-	# on color and non-color terminals, as well as shells that don't
-	# understand sequences such as \h, don't put anything special in it.
-	PS1="`whoami`@`uname -n | cut -f1 -d.` \$ "
-fi
diff --git a/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch b/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch
deleted file mode 100644
index f8b3bf59fb1b..000000000000
--- a/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: start-stop-daemon.c
-===================================================================
---- start-stop-daemon.c	(revision 1915)
-+++ start-stop-daemon.c	(working copy)
-@@ -784,7 +784,7 @@
- /* WTA: this  needs to be an autoconf check for /proc/pid existance.
-  */
- 
--#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd)
-+#if defined(OSLinux) || defined (OSsunos) || defined(OSFreeBSD)
- static void
- do_procinit(void)
- {
-@@ -855,10 +855,16 @@
- 	kd = kvm_openfiles(NULL, NULL, NULL, O_RDONLY, errbuf);
- 	if (kd == 0)
- 		errx(1, "%s", errbuf);
--	if ((kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries)) == 0)
--		errx(1, "%s", kvm_geterr(kd));
--	if ((pid_argv_p = kvm_getargv(kd, kp, argv_len)) == 0)
--		errx(1, "%s", kvm_geterr(kd));
-+	kp = kvm_getprocs(kd, KERN_PROC_PID, pid, &nentries);
-+	if ( ! kp )
-+	{
-+		printf("%s: warning: %s\n",
-+		       progname, kvm_geterr(kd));
-+		return 0;
-+	}
-+	pid_argv_p = kvm_getargv(kd, kp, argv_len);
-+	if ( pid_argv_p == 0 ) /* You can't always access argv */
-+		return 0;
- 
- 	start_argv_0_p = *pid_argv_p;
- 	/* find and compare string */
-@@ -924,11 +930,13 @@
- }
- 
- 
-+#ifndef OSFreeBSD
- static void
- do_procinit(void)
- {
- 	/* Nothing to do */
- }
-+#endif /* !OSFreeBSD */
- 
- #endif /* OSOpenBSD */
-