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

(Portage version: 2.1_pre10)

4 files changed, 189 insertions, 1 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/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
+}