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

(Portage version: 2.1_rc3-r3)

6 files changed, 190 insertions, 1 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index 0d17c94c82a7..69c76d9e7e0f 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.13 2006/05/31 23:42:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.14 2006/06/01 11:36:19 flameeyes Exp $
+
+*freebsd-sources-6.1-r1 (01 Jun 2006)
+*freebsd-sources-6.0-r5 (01 Jun 2006)
+
+  01 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/SA-06-16-smbfs.patch, -freebsd-sources-6.0-r4.ebuild,
+  +freebsd-sources-6.0-r5.ebuild, -freebsd-sources-6.1.ebuild,
+  +freebsd-sources-6.1-r1.ebuild:
+  Revision bumps to fix security issue SA-06:16.
 
   31 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/freebsd-sources-6.1-gcc41.patch, freebsd-sources-6.1.ebuild:
diff --git a/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch b/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch
new file mode 100644
index 000000000000..826af157b273
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/SA-06-16-smbfs.patch
@@ -0,0 +1,27 @@
+Index: sys/fs/smbfs/smbfs_vnops.c
+===================================================================
+RCS file: /home/ncvs/src/sys/fs/smbfs/smbfs_vnops.c,v
+retrieving revision 1.61
+diff -u -I__FBSDID -r1.61 smbfs_vnops.c
+--- sys/fs/smbfs/smbfs_vnops.c	13 Apr 2005 10:59:08 -0000	1.61
++++ sys/fs/smbfs/smbfs_vnops.c	27 May 2006 10:18:33 -0000
+@@ -1018,11 +1018,18 @@
+ static int
+ smbfs_pathcheck(struct smbmount *smp, const char *name, int nmlen, int nameiop)
+ {
+-	static const char *badchars = "*/\\:<>;?";
++	static const char *badchars = "*/:<>;?";
+ 	static const char *badchars83 = " +|,[]=";
+ 	const char *cp;
+ 	int i, error;
+ 
++	/*
++	 * Backslash characters, being a path delimiter, are prohibited
++	 * within a path component even for LOOKUP operations.
++	 */
++	if (index(name, '\\') != NULL)
++		return ENOENT;
++
+ 	if (nameiop == LOOKUP)
+ 		return 0;
+ 	error = ENOENT;
diff --git a/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r5 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r5
new file mode 100644
index 000000000000..8ece252ae3b5
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.0-r5
@@ -0,0 +1,3 @@
+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-r1 b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
new file mode 100644
index 000000000000..ed81a3f45c74
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/files/digest-freebsd-sources-6.1-r1
@@ -0,0 +1,3 @@
+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-r5.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r5.ebuild
new file mode 100644
index 000000000000..3a54803c61d1
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.0-r5.ebuild
@@ -0,0 +1,74 @@
+# 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-r5.ebuild,v 1.1 2006/06/01 11:36:19 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"
+	epatch "${FILESDIR}/SA-06-16-smbfs.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-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
new file mode 100644
index 000000000000..cea468e88222
--- /dev/null
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-6.1-r1.ebuild
@@ -0,0 +1,73 @@
+# 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-r1.ebuild,v 1.1 2006/06/01 11:36:19 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"
+
+	epatch "${FILESDIR}/SA-06-16-smbfs.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
+}