Always add /lib and /usr/lib to our search paths for ldconfig.

  This patch will need changing if we move to a multilib system.
Package-Manager: portage-2.1.3.3

5 files changed, 163 insertions, 5 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index 7a9d6d278fb7..1c64f394909d 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.40 2007/07/12 08:26:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.41 2007/08/06 09:46:15 uberlord Exp $
+
+*freebsd-sbin-6.2-r2 (06 Aug 2007)
+
+  06 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/freebsd-sbin-6.2-ldconfig.patch, +freebsd-sbin-6.2-r2.ebuild:
+  Always add /lib and /usr/lib to our search paths for ldconfig.
+  This patch will need changing if we move to a multilib system.
 
   12 Jul 2007; Roy Marples <uberlord@gentoo.org> files/devd.initd:
   Fix devd for baselayout-2.0.0_alpha4.
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index dfa7500c38d9..670fc9838285 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -18,6 +18,10 @@ AUX freebsd-sbin-6.1-pr102701.patch 548 RMD160 ccaac521cdbb9b5449329cf98fc77be34
 MD5 c8be557a8710553350290da3e53f3e13 files/freebsd-sbin-6.1-pr102701.patch 548
 RMD160 ccaac521cdbb9b5449329cf98fc77be340c59cd1 files/freebsd-sbin-6.1-pr102701.patch 548
 SHA256 dccf32386359a2cfd80272c86085467d612c8f4d7924a6a223cd1259a8b7a176 files/freebsd-sbin-6.1-pr102701.patch 548
+AUX freebsd-sbin-6.2-ldconfig.patch 389 RMD160 856f6d3479ee927850f84380de6ee4109b41d236 SHA1 8af511190f4005b4a3de5159f86d9c23d8dc52f1 SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b
+MD5 fe9236f65baef9d006ebfa26c80b0031 files/freebsd-sbin-6.2-ldconfig.patch 389
+RMD160 856f6d3479ee927850f84380de6ee4109b41d236 files/freebsd-sbin-6.2-ldconfig.patch 389
+SHA256 b3fd47a733d39dea3400bee180d156ed09ff4c19dd47fbf5df52af33bdc5dc2b files/freebsd-sbin-6.2-ldconfig.patch 389
 AUX freebsd-sbin-setXid.patch 541 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 SHA1 fdc01c623893d5819d37d2ed47b7272e50172b89 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267
 MD5 6bd98aaa283db05c1f71d75c3efb62cd files/freebsd-sbin-setXid.patch 541
 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 files/freebsd-sbin-setXid.patch 541
@@ -49,14 +53,18 @@ EBUILD freebsd-sbin-6.2-r1.ebuild 2858 RMD160 9cfe06129cdee90c9cbd2bdb2bf7281c3c
 MD5 7860c6fe461736d6dba297480310937c freebsd-sbin-6.2-r1.ebuild 2858
 RMD160 9cfe06129cdee90c9cbd2bdb2bf7281c3cf5d99f freebsd-sbin-6.2-r1.ebuild 2858
 SHA256 30925d04692e679663e7f6c6e85751c9cfd8eb50ab0b8fbe3fbd03f987fdb501 freebsd-sbin-6.2-r1.ebuild 2858
+EBUILD freebsd-sbin-6.2-r2.ebuild 2896 RMD160 44b7a36aa4642634e44491232b065c5125d469f0 SHA1 394c06e648514beb5d067a97eef5244058039448 SHA256 b10efe783882ff688e05e95f5cbd3f7c555aad7a5d078ff9f21faff8863483d5
+MD5 c80fb014302653e740744baa19202085 freebsd-sbin-6.2-r2.ebuild 2896
+RMD160 44b7a36aa4642634e44491232b065c5125d469f0 freebsd-sbin-6.2-r2.ebuild 2896
+SHA256 b10efe783882ff688e05e95f5cbd3f7c555aad7a5d078ff9f21faff8863483d5 freebsd-sbin-6.2-r2.ebuild 2896
 EBUILD freebsd-sbin-6.2.ebuild 2756 RMD160 248395564ee560c18166c075e95b25bd48308159 SHA1 a3e099442d7e7757c70e3556875a93b5aebe6c2f SHA256 bed2cca5e89e0210e5d41f1f731d17fe6ef234cc32e9557d04c108bcb9c2d560
 MD5 896bd762d6714ae266a8af3dd16fc929 freebsd-sbin-6.2.ebuild 2756
 RMD160 248395564ee560c18166c075e95b25bd48308159 freebsd-sbin-6.2.ebuild 2756
 SHA256 bed2cca5e89e0210e5d41f1f731d17fe6ef234cc32e9557d04c108bcb9c2d560 freebsd-sbin-6.2.ebuild 2756
-MISC ChangeLog 9254 RMD160 97995feb506f32c4bbbbed86f0530d556bdf046d SHA1 e74a0d03740ade824431fc3275f112a8ef9a22dc SHA256 c94d503fb0dcdde54905e0640426a4e861b3eebfa4ba62d7485ea2b6d8ac810b
-MD5 c3e23134611a3fa48025ecd73d618007 ChangeLog 9254
-RMD160 97995feb506f32c4bbbbed86f0530d556bdf046d ChangeLog 9254
-SHA256 c94d503fb0dcdde54905e0640426a4e861b3eebfa4ba62d7485ea2b6d8ac810b ChangeLog 9254
+MISC ChangeLog 9541 RMD160 7a85516074be0b2f5cc2da5db05c306fcdbf4588 SHA1 3a65c1982b6851a99e04b468249967c0823d8747 SHA256 98e2ac78688bd7f6b3d92420858abb0a4297467b1b9ef8596e856fdad79c4ee5
+MD5 ba1d14de36e3e624255195a87bbe3835 ChangeLog 9541
+RMD160 7a85516074be0b2f5cc2da5db05c306fcdbf4588 ChangeLog 9541
+SHA256 98e2ac78688bd7f6b3d92420858abb0a4297467b1b9ef8596e856fdad79c4ee5 ChangeLog 9541
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -67,3 +75,6 @@ SHA256 dd6639881c484c5497fd8f99d5cc867962186839a241b92c88e6918901323815 files/di
 MD5 cee4baf0fdf2e1d87b7c0707e7245983 files/digest-freebsd-sbin-6.2-r1 1804
 RMD160 23eaaba0ee1471625508cf68ba09f9952d14da49 files/digest-freebsd-sbin-6.2-r1 1804
 SHA256 dd6639881c484c5497fd8f99d5cc867962186839a241b92c88e6918901323815 files/digest-freebsd-sbin-6.2-r1 1804
+MD5 cee4baf0fdf2e1d87b7c0707e7245983 files/digest-freebsd-sbin-6.2-r2 1804
+RMD160 23eaaba0ee1471625508cf68ba09f9952d14da49 files/digest-freebsd-sbin-6.2-r2 1804
+SHA256 dd6639881c484c5497fd8f99d5cc867962186839a241b92c88e6918901323815 files/digest-freebsd-sbin-6.2-r2 1804
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2-r2 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2-r2
new file mode 100644
index 000000000000..cf6f5c7a280c
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.2-r2
@@ -0,0 +1,21 @@
+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 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 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-sbin/files/freebsd-sbin-6.2-ldconfig.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
new file mode 100644
index 000000000000..81ad02461681
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.2-ldconfig.patch
@@ -0,0 +1,13 @@
+diff -ur sbin.orig/ldconfig/elfhints.c sbin/ldconfig/elfhints.c
+--- sbin.orig/ldconfig/elfhints.c	2001-05-03 00:56:18 +0100
++++ sbin/ldconfig/elfhints.c	2007-08-06 10:16:24 +0100
+@@ -245,6 +245,9 @@
+ 		else
+ 			add_dir(hintsfile, argv[i], 0);
+ 	}
++	/* Always add our system dirs */
++	add_dir (hintsfile, "/lib", 1);
++	add_dir (hintsfile, "/usr/lib", 1);
+ 	write_elf_hints(hintsfile);
+ }
+ 
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
new file mode 100644
index 000000000000..d6e84140ce65
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/freebsd-sbin-6.2-r2.ebuild,v 1.1 2007/08/06 09:46:15 uberlord Exp $
+
+inherit flag-o-matic bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~sparc-fbsd ~x86-fbsd"
+SLOT="0"
+
+SRC_URI="mirror://gentoo/${SBIN}.tar.bz2
+	mirror://gentoo/${CONTRIB}.tar.bz2
+	mirror://gentoo/${LIB}.tar.bz2
+	mirror://gentoo/${LIBEXEC}.tar.bz2
+	mirror://gentoo/${USBIN}.tar.bz2
+	mirror://gentoo/${ETC}.tar.bz2
+	build? ( mirror://gentoo/${SYS}.tar.bz2 )"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	dev-libs/libedit
+	sys-libs/readline
+	sys-process/vixie-cron"
+DEPEND="${RDEPEND}
+	!build? ( =sys-freebsd/freebsd-sources-${RV}* )
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+PROVIDE="virtual/dev-manager"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter ipv6 vinum suid ssl build"
+
+pkg_setup() {
+	use atm || mymakeopts="${mymakeopts} NO_ATM= "
+	use ipfilter || mymakeopts="${mymakeopts} NO_IPFILTER= "
+	use ipv6 || mymakeopts="${mymakeopts} NO_INET6= "
+	use vinum || mymakeopts="${mymakeopts} NO_VINUM= "
+	use suid || mymakeopts="${mymakeopts} NO_SUID= "
+
+	# O3 breaks this, apparently
+	replace-flags -O3 -O2
+}
+
+REMOVE_SUBDIRS="dhclient pfctl pflogd rcorder"
+
+PATCHES="${FILESDIR}/${PN}-6.2-ldconfig.patch
+	${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-zlib.patch
+	${FILESDIR}/${PN}-6.1-pr102701.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+	use build || ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+
+	# Allow users to use ping and other commands
+	dodir /bin
+	mv "${D}/sbin/ping" "${D}/bin/" || die "mv failed"
+
+	# ext2fs can mount ext3, you just don't get the journalling
+	dosym mount_ext2fs sbin/mount_ext3
+
+	newinitd "${FILESDIR}/devd.initd" devd
+	newinitd "${FILESDIR}/ipfw.initd" ipfw
+	newconfd "${FILESDIR}/ipfw.confd" ipfw
+	newinitd "${FILESDIR}/sysctl.initd" sysctl
+
+	# Gentoo devd.conf
+	# devd_queue is a filter so that only the last event is applied to an
+	# init script
+	insinto /etc
+	newins "${FILESDIR}/devd.conf" devd.conf
+	exeinto /etc
+	newexe "${FILESDIR}/devd_queue" devd_queue
+
+	# Do we need pccard.conf if we have devd?
+	# Maybe ship our own sysctl.conf so things like radvd work out of the box.
+	cd "${WORKDIR}/etc/"
+	insinto /etc
+	doins defaults/pccard.conf minfree sysctl.conf
+
+	# Install a crontab for adjkerntz
+	insinto /etc/cron.d
+	newins "${FILESDIR}/adjkerntz-crontab" adjkerntz
+
+	# Install the periodic stuff (needs probably to be ported in a more
+	# gentooish way)
+	cd "${WORKDIR}/etc/periodic"
+
+	doperiodic security \
+		security/*.ipfwlimit \
+		security/*.ip6fwlimit \
+		security/*.ip6fwdenied \
+		security/*.ipfwdenied
+
+	use ipfilter && doperiodic security \
+		security/*.ipf6denied \
+		security/*.ipfdenied
+
+}