Revision bumps to fix security issue SA-06:16.

(Portage version: 2.1_rc3-r3)
 (Signed Manifest commit)

5 files changed, 25 insertions, 171 deletions

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index c677866db959..16959ebe02d1 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -25,6 +25,10 @@ AUX SA-06-14-fpu.patch 3778 RMD160 d76db671e257ad3310ddd02484c60829562ad9f7 SHA1
 MD5 fe620e5fe67345b123180d225957c9ee files/SA-06-14-fpu.patch 3778
 RMD160 d76db671e257ad3310ddd02484c60829562ad9f7 files/SA-06-14-fpu.patch 3778
 SHA256 b8a630eb05974fc69424c0f64a90134976de12126131cad1ba472d316d3ff887 files/SA-06-14-fpu.patch 3778
+AUX SA-06-16-smbfs.patch 874 RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee SHA1 f6157a02e0cfdcdc2f3fceed56a15f451ba219ac SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6
+MD5 05e64e6f86c3e33185f6a1a0d2ccddf4 files/SA-06-16-smbfs.patch 874
+RMD160 73c3680d7ed5c452c4160105baf1407e69b71eee files/SA-06-16-smbfs.patch 874
+SHA256 73dab3542ffb63818151b9d6fe21d6d0b0734da992c76d80525b711d02efaee6 files/SA-06-16-smbfs.patch 874
 AUX freebsd-sources-6.0-asm.patch 4172 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 SHA1 350d5453ec523a6835ff7ad36bcff7f3bc7dce3f SHA256 2431b2dae991eef15c00c3e19ac01e23e374a1e8e6992053e64486032631b52e
 MD5 d7ba170be5603b2bc377cbd544c82a23 files/freebsd-sources-6.0-asm.patch 4172
 RMD160 7872cbedbbe9fbead0d69f26674489b335317606 files/freebsd-sources-6.0-asm.patch 4172
@@ -51,32 +55,32 @@ RMD160 1c8ce1849d767a995f075fe43b7313b341bd0805 files/freebsd-sources-gentoo.pat
 SHA256 e5e7186858259e7d6d21e925dde640a68b27255cf69ab089ee82675568e7d9a7 files/freebsd-sources-gentoo.patch 1191
 DIST freebsd-sys-6.0.tar.bz2 16069887 RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 SHA1 745fd503ff464463252d5729d924f54be60d99f8 SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70
 DIST freebsd-sys-6.1.tar.bz2 17361671 RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 SHA1 f9da69cabdaaad268c79670c06ba4fff3e3ef6a8 SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f
-EBUILD freebsd-sources-6.0-r4.ebuild 2090 RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 SHA1 2ed100aea8b5964045a3d3c2e679a1514c535767 SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98
-MD5 aff23c6739f5cd117e5266494e740154 freebsd-sources-6.0-r4.ebuild 2090
-RMD160 845d1ef4c577205fa735ce5d11cee0b340b87181 freebsd-sources-6.0-r4.ebuild 2090
-SHA256 03bc841690e36a1159faf7987c8255fd6533b84943b43524913341b9ebc12e98 freebsd-sources-6.0-r4.ebuild 2090
-EBUILD freebsd-sources-6.1.ebuild 2090 RMD160 e7496d82a844345701e222b51bde196e2e22f5ce SHA1 cf797d41541d341c3c2e4c6e554adb9d1786a471 SHA256 d4b961339401212e92cad6d86717b77a51839a72bc3f5345253b2d92fe7c4a01
-MD5 6752266c99ce49460da4eb139f3b022f freebsd-sources-6.1.ebuild 2090
-RMD160 e7496d82a844345701e222b51bde196e2e22f5ce freebsd-sources-6.1.ebuild 2090
-SHA256 d4b961339401212e92cad6d86717b77a51839a72bc3f5345253b2d92fe7c4a01 freebsd-sources-6.1.ebuild 2090
-MISC ChangeLog 5867 RMD160 3b800edb0d1aac5855446abd87416fa1dab7232c SHA1 85d039199a97dc1fb2191232893e8a85e6fb6d2c SHA256 2bcb9cd151f01c57e0d9e677ac49724c81e8e504bd3055c5d1837fbca40c6f13
-MD5 70fd46e7296504452d8adfec6c27296e ChangeLog 5867
-RMD160 3b800edb0d1aac5855446abd87416fa1dab7232c ChangeLog 5867
-SHA256 2bcb9cd151f01c57e0d9e677ac49724c81e8e504bd3055c5d1837fbca40c6f13 ChangeLog 5867
+EBUILD freebsd-sources-6.0-r5.ebuild 2133 RMD160 f707107948afc244e3aeb99bb3f105a171fdbed4 SHA1 9460cf182cced9f7c8d941524f55bbebeb7ab58e SHA256 4c86b43f5517f9a89ec98fd46b98b3dbcae9930111fdebf7a51c711b38e221db
+MD5 1d749d4486a44f958babd076db87e303 freebsd-sources-6.0-r5.ebuild 2133
+RMD160 f707107948afc244e3aeb99bb3f105a171fdbed4 freebsd-sources-6.0-r5.ebuild 2133
+SHA256 4c86b43f5517f9a89ec98fd46b98b3dbcae9930111fdebf7a51c711b38e221db freebsd-sources-6.0-r5.ebuild 2133
+EBUILD freebsd-sources-6.1-r1.ebuild 2137 RMD160 f2e989aab462f1ad2fce6668144786d57154ad66 SHA1 ce93d7f142fb8f97e0bec279214e2d66dbc57ede SHA256 1ece5824b7cc1624dbc247bcd81deb78b44ed8fb3fe7e10ef7e25562a3d8eda6
+MD5 a6ffb5dbe231512cf0375b7b20dd44a6 freebsd-sources-6.1-r1.ebuild 2137
+RMD160 f2e989aab462f1ad2fce6668144786d57154ad66 freebsd-sources-6.1-r1.ebuild 2137
+SHA256 1ece5824b7cc1624dbc247bcd81deb78b44ed8fb3fe7e10ef7e25562a3d8eda6 freebsd-sources-6.1-r1.ebuild 2137
+MISC ChangeLog 6207 RMD160 e366d6ffe719244090ccdf5ba085a64566059c85 SHA1 c20870a19d01ad4161eba00b216bd84a946bb81e SHA256 90b4fec68b5d60fcb4e1f186f25690b1aca98c664bf2b1115896421ad6a98159
+MD5 a4c40a2c81c7f61c582be50c50d0994b ChangeLog 6207
+RMD160 e366d6ffe719244090ccdf5ba085a64566059c85 ChangeLog 6207
+SHA256 90b4fec68b5d60fcb4e1f186f25690b1aca98c664bf2b1115896421ad6a98159 ChangeLog 6207
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
 SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 metadata.xml 156
-MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r4 256
-RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r4 256
-SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r4 256
-MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1 256
-RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1 256
-SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1 256
+MD5 fdd5f9464a24e94d9c07afb96d280ec8 files/digest-freebsd-sources-6.0-r5 256
+RMD160 f0a1c1e21d535da51ee9e2839293c99a8b3fea3b files/digest-freebsd-sources-6.0-r5 256
+SHA256 d131f7b9b2b777da5691e816935b626d3c2bb33eaf3085b5dac2e64f1c9011ad files/digest-freebsd-sources-6.0-r5 256
+MD5 bfcb2966c1ec6e468c2575c36179479c files/digest-freebsd-sources-6.1-r1 256
+RMD160 e3e91956a4a0e172a5a548c6b069c24f9864b6d9 files/digest-freebsd-sources-6.1-r1 256
+SHA256 a390411c7d0ce30970aac523a261176bf7fcb5235d6f782156ec5d52ddc382a1 files/digest-freebsd-sources-6.1-r1 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEfinfAiZjviIA2XgRAm0BAJ9DFogjwFNtrCICr5m9tBYGJBLjHQCdGqGU
-dc7vo6Ygcupxob/p3773vKg=
-=E20w
+iD8DBQFEftE+AiZjviIA2XgRAldbAKCOZmBUVONlmLMhQUDEiVxvoU0pmwCbBOR4
+7jNqIYW42lviYQf3lQPXJB0=
+=SYaA
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r4 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r4
deleted file mode 100644
index 8ece252ae3b5..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fa4633806f9ecd13eba57e45e5b6031f freebsd-sys-6.0.tar.bz2 16069887
-RMD160 02b446bb5a3dde2f91ecba2617a887e817d038a9 freebsd-sys-6.0.tar.bz2 16069887
-SHA256 416fc69ab15d28686d461ca115964091409abc9e5855260d89e2370cad77ad70 freebsd-sys-6.0.tar.bz2 16069887
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1
deleted file mode 100644
index ed81a3f45c74..000000000000
--- a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8893a0a0ddfa8959f71e8ee561a11333 freebsd-sys-6.1.tar.bz2 17361671
-RMD160 eb19f6a345c665542df694a4f9170d227beaf3b6 freebsd-sys-6.1.tar.bz2 17361671
-SHA256 d2ecd79b83ba06c12e358adfccc7e057e15fb7c5be76d92c537b99cbe1d84f0f freebsd-sys-6.1.tar.bz2 17361671
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild
deleted file mode 100644
index 58fd1cc6969a..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r4.ebuild
+++ /dev/null
@@ -1,73 +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-sources/freebsd-sources-6.0-r4.ebuild,v 1.2 2006/05/01 03:10:10 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="nostrip"
-
-S=${WORKDIR}/sys
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-gentoover.patch"
-	epatch "${FILESDIR}/${P}-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${P}-asm.patch"
-	epatch "${FILESDIR}/${P}-werror.patch"
-
-	epatch "${FILESDIR}/SA-06-04-ipfw.patch"
-	epatch "${FILESDIR}/SA-06-05-80211.patch"
-	epatch "${FILESDIR}/SA-06-06-kmem60.patch"
-	epatch "${FILESDIR}/SA-06-07-pf.patch"
-	epatch "${FILESDIR}/SA-06-11-ipsec.patch"
-	epatch "${FILESDIR}/SA-06-14-fpu.patch"
-
-	sed -i -e "s:%GENTOOPVR%:${PVR}:" conf/newvers.sh
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto /usr/src/sys-${MY_PVR}
-	doins -r ${S}/*
-}
-
-pkg_postinst() {
-	if [[ ! -L ${ROOT}/usr/src/sys ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating..."
-		ln -sf sys-${MY_PVR} ${ROOT}/usr/src/sys || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf sys-${MY_PVR} ${ROOT}/usr/src/sys-${RV} || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink..."
-		rm ${ROOT}/usr/src/sys ${ROOT}/usr/src/sys-${RV}
-		ln -sf sys-${MY_PVR} ${ROOT}/usr/src/sys || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf sys-${MY_PVR} ${ROOT}/usr/src/sys-${RV} || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-}
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild
deleted file mode 100644
index addfb3867a17..000000000000
--- a/sys-freebsd/freebsd-sources/freebsd-sources-6.1.ebuild
+++ /dev/null
@@ -1,71 +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-sources/freebsd-sources-6.1.ebuild,v 1.3 2006/05/31 23:42:08 flameeyes Exp $
-
-inherit bsdmk freebsd
-
-DESCRIPTION="FreeBSD kernel sources"
-SLOT="${PVR}"
-KEYWORDS="~x86-fbsd"
-
-IUSE="symlink"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2"
-
-RDEPEND=">=sys-freebsd/freebsd-mk-defs-6.0-r1"
-DEPEND=""
-
-RESTRICT="strip binchecks"
-
-S="${WORKDIR}/sys"
-
-MY_PVR="${PVR}"
-
-[[ ${MY_PVR} == "${RV}" ]] && MY_PVR="${MY_PVR}-r0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# This replaces the gentoover patch, it doesn't need reapply every time.
-	sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \
-		-e 's:^BRANCH=.*:BRANCH="Gentoo":' \
-		-e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \
-		"${S}/conf/newvers.sh"
-
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch"
-	epatch "${FILESDIR}/${PN}-6.0-asm.patch"
-	epatch "${FILESDIR}/${PN}-6.0-werror.patch"
-	epatch "${FILESDIR}/${PN}-6.1-gcc41.patch"
-
-	# Disable SSP for the kernel
-	grep -Zlr -- -ffreestanding "${S}" | xargs -0 sed -i -e \
-		's:-ffreestanding:-ffreestanding -fno-stack-protector -fno-stack-protector-all:g'
-}
-
-src_compile() {
-	einfo "Nothing to compile.."
-}
-
-src_install() {
-	insinto "/usr/src/sys-${MY_PVR}"
-	doins -r "${S}/"*
-}
-
-pkg_postinst() {
-	if [[ ! -L $"{ROOT}/usr/src/sys" ]]; then
-		einfo "/usr/src/sys symlink doesn't exist; creating..."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	elif use symlink; then
-		einfo "Updating /usr/src/sys symlink..."
-		rm "${ROOT}/usr/src/sys" "${ROOT}/usr/src/sys-${RV}"
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys symlink."
-		ln -sf "sys-${MY_PVR}" "${ROOT}/usr/src/sys-${RV}" || \
-			eerror "Couldn't create ${ROOT}/usr/src/sys-${RV} symlink."
-	fi
-}