Fix s-s-d to work on FreeBSd and use it instead of rc-daemon.sh wrapper until that is fixed.

(Portage version: 2.1_pre7-r5)

5 files changed, 75 insertions, 18 deletions

diff --git a/sys-freebsd/freebsd-baselayout/ChangeLog b/sys-freebsd/freebsd-baselayout/ChangeLog
index d551935e31a5..d26fe38f642a 100644
--- a/sys-freebsd/freebsd-baselayout/ChangeLog
+++ b/sys-freebsd/freebsd-baselayout/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-freebsd/freebsd-baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.4 2006/04/08 10:56:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/ChangeLog,v 1.5 2006/04/10 23:07:46 flameeyes Exp $
+
+*freebsd-baselayout-20060401-r2 (10 Apr 2006)
+
+  10 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> +files/ssd-fbsd.patch,
+  -freebsd-baselayout-20060401-r1.ebuild,
+  +freebsd-baselayout-20060401-r2.ebuild:
+  Fix s-s-d to work on FreeBSd and use it instead of rc-daemon.sh wrapper
+  until that is fixed.
 
 *freebsd-baselayout-20060401-r1 (08 Apr 2006)
 
diff --git a/sys-freebsd/freebsd-baselayout/Manifest b/sys-freebsd/freebsd-baselayout/Manifest
index ef9f2ddab234..7a2431f63abe 100644
--- a/sys-freebsd/freebsd-baselayout/Manifest
+++ b/sys-freebsd/freebsd-baselayout/Manifest
@@ -1,28 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a030b374c2a2da3abd3f87f3f781ac05 ChangeLog 4147
 RMD160 ead7d456209b233ab472d7a3711e02925b0a4407 ChangeLog 4147
 SHA256 0119296afd5b62954e7478ce80deef97c1e078f301427b4e06b281f8e0fa1e57 ChangeLog 4147
-MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401-r1 560
-RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401-r1 560
-SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401-r1 560
+MD5 e976bdc5ab7291838293ac9765bb3aaa files/digest-freebsd-baselayout-20060401-r2 560
+RMD160 5e8df4ae6ac94bd3569a5c949419cbd3ff8c21ab files/digest-freebsd-baselayout-20060401-r2 560
+SHA256 986d1edf26c70067016d1b46851130e3c24d7d3279635a6ec8654560730d5460 files/digest-freebsd-baselayout-20060401-r2 560
 MD5 3982112fc4bf2d6f7adabbc28035fad3 files/dummy.initd 186
 RMD160 1802974f22719d82ec99911a3bd669412719a171 files/dummy.initd 186
 SHA256 1fe737503cd68c7a77aec997567e30aa5ff01adfb92f028ad57a5c4aab0afbc0 files/dummy.initd 186
 MD5 059ff3014205750225ae743b6821c0bd files/profile 2053
 RMD160 254d1aa5a81e2bfa7cb5d0b2f6f53d544195be52 files/profile 2053
 SHA256 489703e9a80c9b9d66f3b4f922a191f238ad9111479b22d90bb6d0c8905a2383 files/profile 2053
-MD5 0230d8c4372c2222ab1908eacf5eb484 freebsd-baselayout-20060401-r1.ebuild 20207
-RMD160 0807da02efc1c72cb2d0d7d8af9d565a3ccba6ea freebsd-baselayout-20060401-r1.ebuild 20207
-SHA256 56acf139825e66cab74686c67a3323471543f91b4d38489b40c7b0484b8e4d65 freebsd-baselayout-20060401-r1.ebuild 20207
+MD5 2170d28b6f693a8e66230323f381265b files/ssd-fbsd.patch 1254
+RMD160 2a9f7aecb3b6e7cdeed746a3d85b162595f5d8ba files/ssd-fbsd.patch 1254
+SHA256 a2e4ecd2e8bdf92e548495753f0230973cdc72f14fa6cbb6b08f83f229d95d61 files/ssd-fbsd.patch 1254
+MD5 c52c366b74cd9062a7374a8b0e4e54fc freebsd-baselayout-20060401-r2.ebuild 20470
+RMD160 0c58337a5d242828c56e3e955057ded97ba87378 freebsd-baselayout-20060401-r2.ebuild 20470
+SHA256 93b8d8e65541f1210b2723fd6b196ba5ef8b251821c7c440c6b8d28606cd840a freebsd-baselayout-20060401-r2.ebuild 20470
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEN5bqAiZjviIA2XgRAuMcAKCdb373jGbb25CyNGn+KQiJviHaWACfWE2a
-noXJqOlUXRUdHu2vBmtNt64=
-=us61
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r1 b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r2
index 0b7a79ec7cb4..0b7a79ec7cb4 100644
--- a/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r1
+++ b/sys-freebsd/freebsd-baselayout/files/digest-freebsd-baselayout-20060401-r2
diff --git a/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch b/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch
new file mode 100644
index 000000000000..f8b3bf59fb1b
--- /dev/null
+++ b/sys-freebsd/freebsd-baselayout/files/ssd-fbsd.patch
@@ -0,0 +1,48 @@
+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 */
+ 
diff --git a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild
index 5e8a64322b6d..9af1d8d5220b 100644
--- a/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild
+++ b/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r1.ebuild,v 1.1 2006/04/08 10:56:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-baselayout/freebsd-baselayout-20060401-r2.ebuild,v 1.1 2006/04/10 23:07:46 flameeyes Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib autotools
 
@@ -62,6 +62,9 @@ src_unpack() {
 	# take the sources from released baselayout
 	rm -rf "${WORKDIR}/${origbaselayout}/src/"{awk,filefuncs}
 	cp -r "${WORKDIR}/${origbaselayout}/src" "${S}"
+
+	cd "${S}/src"
+	epatch "${FILESDIR}/ssd-fbsd.patch"
 }
 
 src_compile() {
@@ -423,6 +426,11 @@ src_install() {
 
 	# Hack to fix bug 9849, continued in pkg_postinst
 	unkdir
+
+	# On FreeBSD rc-daemon.sh doesn't seem to behave correctly; provide useful
+	# working system until this is fixed by removing it and forcing use of s-s-d
+	# directly.
+	rm -f ${D}/lib/rcscripts/sh/rc-daemon.sh
 }
 
 # Support function for remapping old wireless dns vars