Added a security fix for the ISO9660 symlink issue (CAN-2004-0109)

4 files changed, 76 insertions, 5 deletions

diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index 797560ebaad1..ea47eb394a15 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.52 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.53 2004/04/15 12:36:43 joker Exp $
+
+*sparc-sources-2.4.25-r1 (15 Apr 2004)
+
+  15 Apr 2004; Christian Birchinger <joker@gentoo.org>
+  sparc-sources-2.4.25-r1.ebuild:
+  Added a security fix for the ISO9660 symlink issue (CAN-2004-0109)
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> sparc-sources-2.4.25.ebuild:
   Add eutils to inherit.
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index a3d95cfe7bf0..b979cd9afee5 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,10 +1,12 @@
 MD5 2d442fa2bd213fd95343bdeaf6706e8a sparc-sources-2.4.24-r2.ebuild 2126
 MD5 4a014f281ff7dcd5a5314ce439e31dec sparc-sources-2.4.25.ebuild 2135
-MD5 0b9b618d91f00dae32fbbc4bb741d625 ChangeLog 8795
+MD5 5a05bc71f5dbfb2279eceaefaafdf7df sparc-sources-2.4.25-r1.ebuild 2142
+MD5 3ac7eebbe7b2ec1a459cdea536a46f11 ChangeLog 8995
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
-MD5 a0aa4a974abbf9f5e698cf474c2716b2 files/digest-sparc-sources-2.4.25 140
 MD5 935f3a9c9a5209ad79a0cdbf9ca4b610 files/U1-hme-lockup.patch 263
-MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 296a426c487b12676eaa07a6abfc2edc files/digest-sparc-sources-2.4.24-r2 143
-MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
+MD5 a0aa4a974abbf9f5e698cf474c2716b2 files/digest-sparc-sources-2.4.25 140
+MD5 92b27a0c59e8fa37c47507f28ded3953 files/digest-sparc-sources-2.4.25-r1 143
+MD5 25553b42e5daa2638570a8b019a35069 files/generate-asm-sparc 1656
 MD5 13f20ae89e814fb87621b471e4d2ca68 files/2.4.19/sparc-asm_offsets.h 23156
+MD5 89fb52efc9018f970ceeeaadac9c0f9e files/2.4.19/sparc64-asm_offsets.h 35521
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.25-r1 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.25-r1
new file mode 100644
index 000000000000..ffc7c803f034
--- /dev/null
+++ b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.25-r1
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 7813eb2c5608e65098aba617f55ffc75 patches-2.4.25-sparc-r1.tar.bz2 141626
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.25-r1.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.25-r1.ebuild
new file mode 100644
index 000000000000..12c44c26de86
--- /dev/null
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.25-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.25-r1.ebuild,v 1.1 2004/04/15 12:36:43 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
+
+# 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}"
+
+# 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-${KV}.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 ${KV} || die "Unable to cd into ${KV}"
+
+	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
+}