Security fix for CAN-2004-1074 (Bug #72452). Added a sparc64 smbfs fix.

5 files changed, 86 insertions, 15 deletions

diff --git a/sys-kernel/development-sources/Manifest b/sys-kernel/development-sources/Manifest
index 61d2ba021ec9..df1560e6b10e 100644
--- a/sys-kernel/development-sources/Manifest
+++ b/sys-kernel/development-sources/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 57fb79c7661372af342f2b8f71e85b3c development-sources-2.6.6.ebuild 998
-MD5 c078c8e3829422a0e07e8449924a0ba2 development-sources-2.6.10_rc2.ebuild 560
-MD5 8d0cbf804fccdd471293e6a0b1bec3da development-sources-2.6.8.1.ebuild 554
-MD5 6af9a30de85cf5cabcc25813359d15a3 development-sources-2.6.5.ebuild 1395
-MD5 9500776fef319e29d38f69aed8da4853 development-sources-2.6.10_rc1.ebuild 560
-MD5 90a7550b1634a8a0c20e26c3acab3e3b development-sources-2.6.7.ebuild 1000
-MD5 bd08b165c3ce345e21c57ee2b66727ac development-sources-2.6.9.ebuild 646
 MD5 3c94e6af688fb088d4dac0c6df5857ce ChangeLog 28087
+MD5 d39c2a06165273b25849969fbea15b74 development-sources-2.6.9.ebuild 649
 MD5 5caccd9193acfe5a3a07ea88861cb11b metadata.xml 660
+MD5 6af9a30de85cf5cabcc25813359d15a3 development-sources-2.6.5.ebuild 1395
+MD5 9500776fef319e29d38f69aed8da4853 development-sources-2.6.10_rc1.ebuild 560
+MD5 c1c46b86fe54073cdff3a6a3cd7ca077 development-sources-2.6.7.ebuild 1002
+MD5 c078c8e3829422a0e07e8449924a0ba2 development-sources-2.6.10_rc2.ebuild 560
+MD5 57fb79c7661372af342f2b8f71e85b3c development-sources-2.6.6.ebuild 998
+MD5 9b8ec087f9faec9820b80552737abd4d development-sources-2.6.8.1.ebuild 557
+MD5 414403f6046e06086e6d2fb0e2d5be60 files/digest-development-sources-2.6.9 135
+MD5 a09d4ddd7fe62bbf298879c6450cb6e7 files/digest-development-sources-2.6.5 208
 MD5 8918a5917e25131489724d3911e9afaf files/digest-development-sources-2.6.10_rc1 132
+MD5 23e1b75850b5a41b95c65e7771f39c48 files/digest-development-sources-2.6.7 137
 MD5 5bbea795fcd0161e3caa1e9d7db4e54b files/digest-development-sources-2.6.10_rc2 132
-MD5 a09d4ddd7fe62bbf298879c6450cb6e7 files/digest-development-sources-2.6.5 208
 MD5 214f14a8b49844fc44f74d8ab84019de files/digest-development-sources-2.6.6 137
-MD5 23e1b75850b5a41b95c65e7771f39c48 files/digest-development-sources-2.6.7 137
-MD5 414403f6046e06086e6d2fb0e2d5be60 files/digest-development-sources-2.6.9 135
 MD5 18bed04a1b45de515096089cc10913ec files/digest-development-sources-2.6.8.1 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBqH4jI1lqEGTUzyQRAlPEAJ0fdp/TWy+kZNinV9plW5P4Ek8yXgCg3Tyv
-ax/eZ1EtcGMNCKS3v8Rnkow=
-=WchC
+iD8DBQFBr8xjroRuSHgZdywRAmcPAJ9i5pIOqNcWcCM3I2QQ8xxnVU4l9gCfWAsY
+RutzW04RGQp9X7VwckAAkHI=
+=yaXm
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index 0c7dcaa758e8..2da9e91ecfee 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.69 2004/11/27 15:34:58 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.70 2004/12/03 02:11:12 joker Exp $
+
+  02 Dec 2004; Christian Birchinger <joker@gentoo.org> :
+  Security fix for CAN-2004-1074 (Bug #72452).
+  Added a sparc64 smbfs fix.
 
   27 Nov 2004; Christian Birchinger <joker@gentoo.org>
   -files/gentoo-sources-2.4.27-binfmt_elf.patch,
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 171597a886b4..f589e3c8dcd2 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,6 +1,8 @@
-MD5 cbcea94c6c45f66ae744cf249b8bb772 ChangeLog 11784
+MD5 e958d5e0e47d7ec959c2c65587567750 ChangeLog 11918
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
+MD5 1a1ce2e743460d535bacf776ff5210c6 sparc-sources-2.4.28-r1.ebuild 2196
 MD5 41d2f5b33c43ebbd36608920b3e670dd sparc-sources-2.4.28.ebuild 2193
+MD5 8100ed8276f69a4b404939a5570ee0d0 files/digest-sparc-sources-2.4.28-r1 143
 MD5 9e5e031b4149825faa227a3fc3969ef5 files/digest-sparc-sources-2.4.28 140
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
 MD5 387e70ce7c98618810dea0f521df76eb files/generate-asm-sparc 1661
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r1 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r1
new file mode 100644
index 000000000000..8eca5b3cc081
--- /dev/null
+++ b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.28-r1
@@ -0,0 +1,2 @@
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 1f3b29948122dc9dff19fde8d3631419 patches-2.4.28-sparc-r1.tar.bz2 178778
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.28-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.28-r1.ebuild
new file mode 100644
index 000000000000..e1b82c3bc0dd
--- /dev/null
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.28-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.28-r1.ebuild,v 1.1 2004/12/03 02:11:12 joker Exp $
+
+IUSE="ultra1"
+
+# Kernel ebuilds using the kernel.eclass can remove any patch that you
+# do not want to apply by simply setting the KERNEL_EXCLUDE shell
+# variable to the string you want to exclude (for instance
+# KERNEL_EXCLUDE="grsecurity" would not patch any patches whose names match
+# *grsecurity*).  Kernels are only tested in the default configuration, but
+# this may be useful if you know that a particular patch is causing a
+# conflict with a patch you personally want to apply, or some other
+# similar situation.
+
+ETYPE="sources"
+inherit kernel eutils
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+[ "$OKV" == "" ] && OKV="${PV}"
+
+EXTRAVERSION="-${PN/-*/}"
+[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
+KV="${OKV}${EXTRAVERSION}"
+
+PATCH_VERSION="${KV}"
+
+# Documentation on the patches contained in this kernel will be installed
+# to /usr/share/doc/sparc-sources-${PV}/patches.txt.gz
+
+DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
+SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+	mirror://gentoo/patches-${PATCH_VERSION}.tar.bz2"
+
+S=${WORKDIR}/linux-${KV}
+KEYWORDS="~x86 -ppc sparc"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack ${A}
+	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
+	cd ${PATCH_VERSION} || die "Unable to cd into ${PATCH_VERSION}"
+
+	kernel_src_unpack
+
+	# Patch the HME driver only on Ultra1 machines.
+	use ultra1 && epatch ${FILESDIR}/U1-hme-lockup.patch
+}
+
+pkg_postinst() {
+
+	kernel_pkg_postinst
+
+	# Display SUN Ultra 1 HME warning if it can be detected or if the machinetype is unknown.
+	if [ ! -r "/proc/openprom/name" -o "`cat /proc/openprom/name 2>/dev/null`" = "'SUNW,Ultra-1'" ]; then
+		einfo
+		einfo "For users with an Enterprise model Ultra 1 using the HME network interface,"
+		einfo "please emerge the kernel using the following command:"
+		einfo
+		einfo "USE=ultra1 emerge sparc-sources"
+		einfo
+	fi
+}