Update to 6.1_rc2.

Package-Manager: portage-2.1_pre10-r2

3 files changed, 20 insertions, 125 deletions

diff --git a/sys-freebsd/freebsd-sbin/Manifest b/sys-freebsd/freebsd-sbin/Manifest
index 77f12f2a43c0..eab6172d6945 100644
--- a/sys-freebsd/freebsd-sbin/Manifest
+++ b/sys-freebsd/freebsd-sbin/Manifest
@@ -26,29 +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-contrib-6.1_rc2.tar.bz2 36015082 RMD160 47ca46c243370ea38f37d2b9f69b5b0f89f25618 SHA256 028663543fc040a4919b51218715745e8dd323934767ce713e81bb2ada8c92f4 size 36015082
 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-etc-6.1_rc2.tar.bz2 183869 RMD160 4726980691b6eb6f11387bfd3411d0aaeca63d85 SHA256 842e360d2bb6825bbce5a38404825525bc63edd79129a7952ea00a58a3e2d4be size 183869
 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-lib-6.1_rc2.tar.bz2 2613579 RMD160 ed3f9dc5afe9896ee685934978f888c816562574 SHA256 0a12857f45472fc8c825b088d05c77ce1c8725b0c4615f1a670924911b4a5108 size 2613579
 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-libexec-6.1_rc2.tar.bz2 277785 RMD160 7e6c035b414287241d22a48e809aae8a243bff38 SHA256 26a2879833cb9d02b0624eda8175801684e4d7af0fbfbaf558f2a31310615b42 size 277785
 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-sbin-6.1_rc2.tar.bz2 1157065 RMD160 e9267a624270b20d05147ff14ceb58d73bdc02b6 SHA256 110abd8c057c1aad0a3e034adb77206901b01814702dbb0c740eb0e22945970f size 1157065
 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
+DIST freebsd-usbin-6.1_rc2.tar.bz2 2663193 RMD160 f183a024fcbce51156330410ba08bae2aeae055f SHA256 5318ca0379f5719b5d8fdf4a6112fac9ba62620c5517d28df7f836127bf27ee1 size 2663193
 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
-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
+EBUILD freebsd-sbin-6.1_rc2.ebuild 2194 RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 SHA1 9768a8914f889bd0a89e72f58ffd3823c8637900 SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc size 2194
+MD5 ca8a19d175a7557a32d1ae71f1683c92 freebsd-sbin-6.1_rc2.ebuild 2194
+RMD160 869c2e5baf55b29c5a81f5d1511c0b5a4290d3b6 freebsd-sbin-6.1_rc2.ebuild 2194
+SHA256 ff789006715eb680f4d86049e195d50422448c44e6fd570a8a2641056e9667fc freebsd-sbin-6.1_rc2.ebuild 2194
+MISC ChangeLog 4583 RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 SHA1 d4829b75a33a9484409a5f0f4f8c7f10ac5fe1f2 SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b size 4583
+MD5 8872834568a0871ff0c85b1d4e97b46e ChangeLog 4583
+RMD160 ee21175e6bac32a9a5dde29004cc6507839ab668 ChangeLog 4583
+SHA256 8140b0c94c36b98254e9bf4407f272f0e80d85cdf31bf4e0ff69e6474274293b ChangeLog 4583
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 size 156
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -56,13 +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
-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
+MD5 1d07ec06d5e2c43bf7e3832813d71deb files/digest-freebsd-sbin-6.1_rc2 1620
+RMD160 b91ef2a5cfd9e7f37b982410975a889c13251cae files/digest-freebsd-sbin-6.1_rc2 1620
+SHA256 587e973d251300bb09571b9ca2a35031ac20cbd1e95fbc1c99a691d97807bc9c files/digest-freebsd-sbin-6.1_rc2 1620
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEVVTuAiZjviIA2XgRAoChAKCuR1+6e+Y5WMdB29wtIxcbG5LD4wCglQ/r
-Ljv420pUtbhuHFXTtgvtapk=
-=OvfA
+iD8DBQFEV9ZYAiZjviIA2XgRAuz6AJ4n4bBwifXf3uh1pnflqQ4iTwkHYQCdEpBz
+hC3KPmdzyLUfZFikr0KM3zQ=
+=6Q29
 -----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
deleted file mode 100644
index 8320fb22c087..000000000000
--- a/sys-freebsd/freebsd-sbin/files/digest-freebsd-sbin-6.1_rc1
+++ /dev/null
@@ -1,18 +0,0 @@
-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/freebsd-sbin-6.1_rc1.ebuild b/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
deleted file mode 100644
index a2d3c84a6ff1..000000000000
--- a/sys-freebsd/freebsd-sbin/freebsd-sbin-6.1_rc1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
-}