Update to 6.1 and add patch for devd to avoid using FreeBSD's rc system.

Package-Manager: portage-2.1_pre10

5 files changed, 213 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-sbin/ChangeLog b/sys-freebsd/freebsd-sbin/ChangeLog
index e09f37878ea3..0f063c16fe07 100644
--- a/sys-freebsd/freebsd-sbin/ChangeLog
+++ b/sys-freebsd/freebsd-sbin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-sbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.8 2006/04/23 12:55:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sbin/ChangeLog,v 1.9 2006/05/01 00:22:47 flameeyes Exp $
+
+*freebsd-sbin-6.1_rc1 (01 May 2006)
+
+  01 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/freebsd-sbin-6.1-devd-conf.patch, +freebsd-sbin-6.1_rc1.ebuild:
+  Update to 6.1 and add patch for devd to avoid using FreeBSD's rc system.
 
   23 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/adjkerntz-crontab:
diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 5fe365eba170..77f12f2a43c0 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -5,6 +5,10 @@ AUX adjkerntz-crontab 184 RMD160 c9abca80479ee47cfec7cbab70adad2018770785 SHA1 2
 MD5 982df5a3b23730ce6fe0428d1efead09 files/adjkerntz-crontab 184
 RMD160 c9abca80479ee47cfec7cbab70adad2018770785 files/adjkerntz-crontab 184
 SHA256 f3b08140ea38bfe502b34dd8c69aa4a6b65b786d792828cce082be8f844345dc files/adjkerntz-crontab 184
+AUX freebsd-sbin-6.1-devd-conf.patch 2110 RMD160 70d48afd56c04043c24dbeb3cb68bec9a8cd890e SHA1 069e5bf78a8478da007c939ac8fd35810f522a8e SHA256 023b18cf651c325019857cd5f8afe1e526faaf9f8b6ee9c4632f4bab6e3fe4d3 size 2110
+MD5 a7e709e1d4ea5d4e9b1089aead80a2a3 files/freebsd-sbin-6.1-devd-conf.patch 2110
+RMD160 70d48afd56c04043c24dbeb3cb68bec9a8cd890e files/freebsd-sbin-6.1-devd-conf.patch 2110
+SHA256 023b18cf651c325019857cd5f8afe1e526faaf9f8b6ee9c4632f4bab6e3fe4d3 files/freebsd-sbin-6.1-devd-conf.patch 2110
 AUX freebsd-sbin-setXid.patch 541 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 SHA1 fdc01c623893d5819d37d2ed47b7272e50172b89 SHA256 2d8158df7af52f9ce15f1513d16ed08ea6244f310aea3f271b12184a6a4c4267 size 541
 MD5 6bd98aaa283db05c1f71d75c3efb62cd files/freebsd-sbin-setXid.patch 541
 RMD160 003ee4530218c609a4a443d2c2d2c8c05d1f4ae6 files/freebsd-sbin-setXid.patch 541
@@ -22,19 +26,29 @@ MD5 edcf04ea876f3ac2275867633fa4e96d files/sysctl.initd 778
 RMD160 09ed017c2dd767db57cfa71da6c9d656a8fbb23b files/sysctl.initd 778
 SHA256 12f1bbcd72244579ae3b23d2455a00739cc6ff074f68cbb7db1410d19c0f69f4 files/sysctl.initd 778
 DIST freebsd-contrib-6.0.tar.bz2 34972594 RMD160 3f045dd7d1ddbcf20da670051459f0a2fc508a8b SHA256 9c76affcddb3a8257d3b612dd7cc8ff43bc7417e47e215c01909a81c79e9d443 size 34972594
+DIST freebsd-contrib-6.1_rc1.tar.bz2 36018347 RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 size 36018347
 DIST freebsd-etc-6.0.tar.bz2 178941 RMD160 48d0eb51f291e5d706ef076151964b88a9fc1796 SHA256 c4bd9401dad72bd869b89aa12a61339a30746caadb741bb0d094f522ee117616 size 178941
+DIST freebsd-etc-6.1_rc1.tar.bz2 183866 RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 size 183866
 DIST freebsd-lib-6.0.tar.bz2 2613087 RMD160 30bf04438a00408284f135c2670106141cae4873 SHA256 dab1140d52597f37d768d2210a49cb29db5404a7df35306462e3642074426a53 size 2613087
+DIST freebsd-lib-6.1_rc1.tar.bz2 2613706 RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 size 2613706
 DIST freebsd-libexec-6.0.tar.bz2 277631 RMD160 5121414524c9dfceab1f5ad8b8bc91c65141db82 SHA256 2eddc867d69afa6c5d0a2f3ce18d4570688b5fa49924adb478dc7d548ba8197e size 277631
+DIST freebsd-libexec-6.1_rc1.tar.bz2 277623 RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b size 277623
 DIST freebsd-sbin-6.0.tar.bz2 1132085 RMD160 9b194c62b4a51d37cea224f0e3fe1069f2645248 SHA256 43568a5534e29ee442a920459052638e0ca17c69b54a984b1c023628f5f2229f size 1132085
+DIST freebsd-sbin-6.1_rc1.tar.bz2 1156116 RMD160 f1931df3003d17320be5f898f318af646aae704c SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b size 1156116
 DIST freebsd-usbin-6.0.tar.bz2 2635411 RMD160 9a8f5cdc041df1ad2b388c432a1829b5c8adc51d SHA256 46ac3c581fd20d9980bcf2d80aba7c2f874ad3e29058939bee0c6f1a4af8ff64 size 2635411
+DIST freebsd-usbin-6.1_rc1.tar.bz2 2663185 RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 size 2663185
 EBUILD freebsd-sbin-6.0-r1.ebuild 2127 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 SHA1 2093aae1c6d5c9fc3c7575b8aec98a1d069122a4 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f size 2127
 MD5 226f3c852e244b961b05828ee84cef56 freebsd-sbin-6.0-r1.ebuild 2127
 RMD160 b0bc72f6c2a9a62b23297e431feedc12f32c76e6 freebsd-sbin-6.0-r1.ebuild 2127
 SHA256 09ece1d5395fbb75a039746906ad4fc4d0cb815763188eac38c9282b765e958f freebsd-sbin-6.0-r1.ebuild 2127
-MISC ChangeLog 4169 RMD160 864c8caea75914befcdddec5e9900901bf4228e5 SHA1 558008d1f1afd33d6b2b50464775fb59a28dbf30 SHA256 74fff18234d92ff5964ae764327259be3b76ba5f9c2269e01dca1fb45b277f92 size 4169
-MD5 a696d974bcb30b2d57d797a778634a3a ChangeLog 4169
-RMD160 864c8caea75914befcdddec5e9900901bf4228e5 ChangeLog 4169
-SHA256 74fff18234d92ff5964ae764327259be3b76ba5f9c2269e01dca1fb45b277f92 ChangeLog 4169
+EBUILD freebsd-sbin-6.1_rc1.ebuild 2194 RMD160 3bf0973ea161e9087a541de03e855b84576eb8d1 SHA1 21d648d8deae42a0fdff26295ed7f333972ccfb7 SHA256 35fcc2513f998dc81f7b9cba818d4fc2f945f2e498a49752ef9518e5d79a2f2f size 2194
+MD5 e1f88dfc664b372bc1c6586e009b2612 freebsd-sbin-6.1_rc1.ebuild 2194
+RMD160 3bf0973ea161e9087a541de03e855b84576eb8d1 freebsd-sbin-6.1_rc1.ebuild 2194
+SHA256 35fcc2513f998dc81f7b9cba818d4fc2f945f2e498a49752ef9518e5d79a2f2f freebsd-sbin-6.1_rc1.ebuild 2194
+MISC ChangeLog 4408 RMD160 7fdaba32e3a90c998aa54e95d35423a5d4e893c2 SHA1 8890bc9c0ec8d0bccf09c1ad8889aa97558e6991 SHA256 13ab604c9a9e7087410d8437ae73d6f653f4499d0114477d09f757610214278c size 4408
+MD5 1841ef6941afed45ef45cdd419587588 ChangeLog 4408
+RMD160 7fdaba32e3a90c998aa54e95d35423a5d4e893c2 ChangeLog 4408
+SHA256 13ab604c9a9e7087410d8437ae73d6f653f4499d0114477d09f757610214278c ChangeLog 4408
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -42,11 +56,13 @@ SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata
 MD5 5fd83bcbf48686bcd615b60799613cce files/digest-freebsd-sbin-6.0-r1 1548
 RMD160 bf64735bbceeed83ebccd22f2b3a989100e6ec31 files/digest-freebsd-sbin-6.0-r1 1548
 SHA256 c10cfdca82d0a375d105c9ec1834a52f8ebab8e1ab244cedb63ff06f29d39c05 files/digest-freebsd-sbin-6.0-r1 1548
-size 1548 files/digest-freebsd-sbin-6.0-r1 1548
+MD5 afac92cd847410a795b7da1e0c4a87a4 files/digest-freebsd-sbin-6.1_rc1 1620
+RMD160 7afe63935383f3666ced5b7cc8cd5ef212113787 files/digest-freebsd-sbin-6.1_rc1 1620
+SHA256 257b461e18ac9ebe6bfd38bba1c1e30a65c96fef5b1db300a7802e0dfe07652d files/digest-freebsd-sbin-6.1_rc1 1620
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFES3iBAiZjviIA2XgRAuJhAJ9qBeqdnvnoTZQJ36jE3T3RD9BkZACgtF0u
-lBjS/DEjOhbf6uoDmXMmhx4=
-=iQY8
+iD8DBQFEVVTuAiZjviIA2XgRAoChAKCuR1+6e+Y5WMdB29wtIxcbG5LD4wCglQ/r
+Ljv420pUtbhuHFXTtgvtapk=
+=OvfA
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1 b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1
new file mode 100644
index 000000000000..8320fb22c087
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1
@@ -0,0 +1,18 @@
+MD5 fdc3753ea193f97b6e38a6c166923f31 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+RMD160 dc559ff4141e4da0a18056c0d18ce295ba7b7166 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+SHA256 cad60b17700c9f72c4ac023ee085906a61f1df97b0b8c200831ca4599076a865 freebsd-contrib-6.1_rc1.tar.bz2 36018347
+MD5 6e99af8cce64280b02dafb31e8bf7703 freebsd-etc-6.1_rc1.tar.bz2 183866
+RMD160 5f973e0e0dc4418ef50289cd3a6e3f356f3e172a freebsd-etc-6.1_rc1.tar.bz2 183866
+SHA256 c3006c8c0c324be09de7ad0f4873a015257b0510e58d7149c64e84d09a1beb33 freebsd-etc-6.1_rc1.tar.bz2 183866
+MD5 c4785d39e744b337abfa7158e3ce213e freebsd-lib-6.1_rc1.tar.bz2 2613706
+RMD160 fe9ffa058f907e05747d106636a92aeb0cd2a864 freebsd-lib-6.1_rc1.tar.bz2 2613706
+SHA256 de39f9db53c8ab30a292d7ab4530cb0de3fa08ef682937bf2187962579d875c4 freebsd-lib-6.1_rc1.tar.bz2 2613706
+MD5 7fc05b60f2d902eaf2355343c3817ba0 freebsd-libexec-6.1_rc1.tar.bz2 277623
+RMD160 7a5ae00e1460d2c683164604ac10d1020d27fbda freebsd-libexec-6.1_rc1.tar.bz2 277623
+SHA256 a661f039bbda5d5dbefba584fc53a7166315c2456432a9bef2be6e3624658d5b freebsd-libexec-6.1_rc1.tar.bz2 277623
+MD5 f601c9da85490b59ee024e5f40ffe840 freebsd-sbin-6.1_rc1.tar.bz2 1156116
+RMD160 f1931df3003d17320be5f898f318af646aae704c freebsd-sbin-6.1_rc1.tar.bz2 1156116
+SHA256 863a8abd229afc049b532137714a681729fec0ff23f1536affcaa71eb14eaf9b freebsd-sbin-6.1_rc1.tar.bz2 1156116
+MD5 d79f570cec1b96e1f58d41fb04e66e6f freebsd-usbin-6.1_rc1.tar.bz2 2663185
+RMD160 9745c19a2de23cfbc8c7325679259dff5cbb71d4 freebsd-usbin-6.1_rc1.tar.bz2 2663185
+SHA256 0db8c33c2edfabec21a31e0a70ee81551e0aeb12856aa9d4a88f5f2e052c11f5 freebsd-usbin-6.1_rc1.tar.bz2 2663185
diff --git a/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-devd-conf.patch b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-devd-conf.patch
new file mode 100644
index 000000000000..d64f3f902385
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/files/freebsd-sbin-6.1-devd-conf.patch
@@ -0,0 +1,77 @@
+Index: fbsd-6.1/etc/devd.conf
+===================================================================
+--- fbsd-6.1.orig/etc/devd.conf
++++ fbsd-6.1/etc/devd.conf
+@@ -51,7 +51,7 @@ notify 0 {
+ 	match "system"		"IFNET";
+ 	match "type"		"LINK_UP";
+ 	media-type		"ethernet";
+-	action "/etc/rc.d/dhclient start $subsystem";
++	action "/etc/init.d/net.$subsystem start"
+ };
+ 
+ #
+@@ -80,38 +80,39 @@ notify 0 {
+ # hard wired to 1.2.3.4.
+ attach 100 {
+ 	device-name "ed50";
+-	action "ifconfig $device-name inet 1.2.3.4 netmask 0xffff0000";
++	action "/etc/init.d/net.ed50 start"
+ };
+ detach 100 {
+ 	device-name "ed50";
++	action "/etc/init.d/net.ed50 stop"
+ };
+ 
+ # When a USB Bluetooth dongle appears activate it
+-attach 100 {
+-	device-name "ubt[0-9]+";
+-	action "/etc/rc.d/bluetooth start $device-name";
+-};
+-detach 100 {
+-	device-name "ubt[0-9]+";
+-	action "/etc/rc.d/bluetooth stop $device-name";
+-};
++#attach 100 {
++#	device-name "ubt[0-9]+";
++#	action "/etc/rc.d/bluetooth start $device-name";
++#};
++#detach 100 {
++#	device-name "ubt[0-9]+";
++#	action "/etc/rc.d/bluetooth stop $device-name";
++#};
+ 
+ # When a USB keyboard arrives, attach it as the console keyboard.
+ attach 100 {
+ 	device-name "ukbd0";
+-	action "/etc/rc.d/syscons setkeyboard /dev/ukbd0";
++	action "kbdcontrol -k /dev/ukbd0 < /dev/console";
+ };
+ detach 100 {
+ 	device-name "ukbd0";
+-	action "/etc/rc.d/syscons setkeyboard /dev/kbd0";
++	action "kbdcontrol -k /dev/kbd0 < /dev/console"
+ };
+ 
+ # The entry below starts moused when a mouse is plugged in. Moused
+ # stops automatically (actually it bombs :) when the device disappears.
+-attach 100 {
+-	device-name "ums[0-9]+";
+-	action "/etc/rc.d/moused start $device-name";
+-};
++#attach 100 {
++#	device-name "ums[0-9]+";
++#	action "/etc/rc.d/moused start $device-name";
++#};
+ 
+ #
+ # Rescan scsi device-names on attach, but not detach.  However, it is
+@@ -133,7 +134,7 @@ nomatch 0 {
+ notify 10 {
+ 	match "system"		"ACPI";
+ 	match "subsystem"	"ACAD";
+-	action "/etc/rc.d/power_profile $notify";
++	action "/etc/init.d/powerd restart"
+ };
+ 
+ # Notify all users before beginning emergency shutdown when we get
diff --git a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
new file mode 100644
index 000000000000..a2d3c84a6ff1
--- /dev/null
+++ b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2006 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.1_rc1.ebuild,v 1.1 2006/05/01 00:22:47 flameeyes Exp $
+
+inherit flag-o-matic bsdmk freebsd
+
+DESCRIPTION="FreeBSD sbin utils"
+KEYWORDS="~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"
+
+RDEPEND="=sys-freebsd/freebsd-lib-${RV}*
+	=sys-freebsd/freebsd-libexec-${RV}*
+	ssl? ( dev-libs/openssl )
+	sys-libs/readline
+	sys-process/vixie-cron"
+DEPEND="${RDEPEND}
+	=sys-freebsd/freebsd-sources-${RV}*
+	=sys-freebsd/freebsd-mk-defs-${RV}*"
+
+PROVIDE="virtual/dev-manager
+	virtual/dhcpc"
+
+S="${WORKDIR}/sbin"
+
+IUSE="atm ipfilter ipv6 vinum suid ssl"
+
+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"
+
+PATCHES="${FILESDIR}/${PN}-setXid.patch
+	${FILESDIR}/${PN}-zlib.patch"
+
+src_unpack() {
+	freebsd_src_unpack
+	ln -s "/usr/src/sys-${RV}" "${WORKDIR}/sys"
+
+	cd "${WORKDIR}"
+	epatch "${FILESDIR}/${PN}-6.1-devd-conf.patch"
+}
+
+src_install() {
+	freebsd_src_install
+	keepdir /var/log
+
+	newinitd ${FILESDIR}/ipfw.initd ipfw
+	newinitd ${FILESDIR}/sysctl.initd sysctl
+
+	cd ${WORKDIR}/etc/
+	insinto /etc
+	doins devd.conf pccard_ether defaults/pccard.conf minfree rc.firewall \
+		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
+}