Version bump for the CAN-2004-0109 issue; bug #47881.

5 files changed, 213 insertions, 33 deletions

diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index dddb141ddbca..d1dc8ba4c771 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ppc-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.37 2004/04/12 16:36:23 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.38 2004/04/15 10:52:30 plasmaroo Exp $
+
+*ppc-sources-2.4.24-r3 (15 Apr 2004)
+
+  15 Apr 2004; <plasmaroo@gentoo.org> ppc-sources-2.4.24-r3.ebuild,
+  files/ppc-sources-2.4.24.CAN-2004-0109.patch:
+  Version bump for the CAN-2004-0109 issue; bug #47881.
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ppc-sources-2.4.24-r2.ebuild:
   Add IUSE=
diff --git a/sys-kernel/ppc-sources/Manifest b/sys-kernel/ppc-sources/Manifest
index 43375285c77d..6afb39179ae0 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,45 +1,48 @@
-MD5 d4e58b61f12c498d346f60a86a761e2e ppc-sources-2.4.22-r1.ebuild 1642
-MD5 22c490110a93d6c863712bc726399b94 ppc-sources-2.4.19-r6.ebuild 3266
-MD5 26bea5fa4bba93e3e7a3f43a3cc351f8 ppc-sources-2.4.24-r2.ebuild 2130
-MD5 f978892f6d9dd3e70c979bf6f39e587e ppc-sources-2.4.20-r2.ebuild 1786
-MD5 dbd76ccbaff3fae4f51181b226dd9298 ppc-sources-2.4.23.ebuild 2732
-MD5 dd69f92c8577ac71ea78362a6b074198 ppc-sources-2.4.19.ebuild 3208
+MD5 9c56c18871a364ddd21cb0356f1f0039 ppc-sources-2.4.21-r2.ebuild 2296
 MD5 3eb8aa8dc939aec206b54ce23327e690 ppc-sources-2.4.22-r3.ebuild 1558
-MD5 86407c79f5a0a1577cc83703a751ab52 ppc-sources-2.4.19-r3.ebuild 3280
-MD5 bfc3da75407a3332613f0db203585295 ppc-sources-2.4.21-r1.ebuild 2231
+MD5 c484e07e7aff40c08784a2be160d12e8 ChangeLog 7273
 MD5 b17034269d563cb16a9607b8c7d9d340 ppc-sources-2.4.20-r4.ebuild 1800
+MD5 dbd76ccbaff3fae4f51181b226dd9298 ppc-sources-2.4.23.ebuild 2732
+MD5 86407c79f5a0a1577cc83703a751ab52 ppc-sources-2.4.19-r3.ebuild 3280
 MD5 0ea988134d989ffe8413f926fa8e787a ppc-sources-2.4.19-r5.ebuild 3279
-MD5 3d724a97bfd650804c27c697d5c580f8 ppc-sources-2.4.24-r1.ebuild 2018
-MD5 03e6bd9e5b006cf33107865925e24d8d ppc-sources-2.4.20-r1.ebuild 3111
+MD5 26bea5fa4bba93e3e7a3f43a3cc351f8 ppc-sources-2.4.24-r2.ebuild 2130
+MD5 f978892f6d9dd3e70c979bf6f39e587e ppc-sources-2.4.20-r2.ebuild 1786
+MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
+MD5 d2aaf85ed8720eee1bef0fa212ba44e0 ppc-sources-2.4.19-r4.ebuild 3436
 MD5 e067af7bf5f5e3601087820c4396f186 ppc-sources-2.4.22-r2.ebuild 1546
-MD5 6dc8813f6e2b78559790bb8db8b4e75b ppc-sources-2.4.20-r3.ebuild 1787
 MD5 f5a8961f6bee81bb2c8feaef1f0268e0 ppc-sources-2.4.23-r1.ebuild 2993
+MD5 d4e58b61f12c498d346f60a86a761e2e ppc-sources-2.4.22-r1.ebuild 1642
+MD5 03e6bd9e5b006cf33107865925e24d8d ppc-sources-2.4.20-r1.ebuild 3111
+MD5 22c490110a93d6c863712bc726399b94 ppc-sources-2.4.19-r6.ebuild 3266
+MD5 bfc3da75407a3332613f0db203585295 ppc-sources-2.4.21-r1.ebuild 2231
 MD5 b89003febb60432b1eaa157cb1d532ff ppc-sources-2.4.24.ebuild 1925
-MD5 222e9436050596c2b916a0b4310a7502 ChangeLog 7057
-MD5 fe945af4911b04acd2c0f473c7c64f35 metadata.xml 267
-MD5 d2aaf85ed8720eee1bef0fa212ba44e0 ppc-sources-2.4.19-r4.ebuild 3436
-MD5 9c56c18871a364ddd21cb0356f1f0039 ppc-sources-2.4.21-r2.ebuild 2296
-MD5 88a216bd55a77f58510b9a1c5c3767ce files/digest-ppc-sources-2.4.19 149
+MD5 6dc8813f6e2b78559790bb8db8b4e75b ppc-sources-2.4.20-r3.ebuild 1787
+MD5 3d724a97bfd650804c27c697d5c580f8 ppc-sources-2.4.24-r1.ebuild 2018
+MD5 dd69f92c8577ac71ea78362a6b074198 ppc-sources-2.4.19.ebuild 3208
+MD5 f68f3f5b26dc37cef7186e0274e3f10d ppc-sources-2.4.24-r3.ebuild 2169
+MD5 9cab1e75f8fcaef7441998de95c9b452 files/digest-ppc-sources-2.4.19-r4 149
+MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
+MD5 572d02461dd09102519308d7b8fb8985 files/digest-ppc-sources-2.4.20-r3 142
+MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-2.4.22-r3 133
+MD5 21f3a4f186017d925067335e24db36a1 files/ppc-sources-2.4.24.CAN-2004-0109.patch 1877
+MD5 7990188a6520d862bd20c4104501604f files/digest-ppc-sources-2.4.20-r1 149
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 005ef6759b490e05bd30edadd451bca0 files/digest-ppc-sources-2.4.23 134
+MD5 a6763c046cc20eff0a42ca65f815cb27 files/digest-ppc-sources-2.4.19-r5 149
+MD5 a54eec24338bcac38c8801d23c526db0 files/digest-ppc-sources-2.4.21-r2 141
 MD5 723ae1e610044cb60592b1fa4493de6c files/digest-ppc-sources-2.4.24 203
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-2.4.23.rtc_fix.patch 7073
-MD5 6b15a062d96482772f860647c0088358 files/digest-ppc-sources-2.4.19-r3 149
-MD5 9cab1e75f8fcaef7441998de95c9b452 files/digest-ppc-sources-2.4.19-r4 149
-MD5 a6763c046cc20eff0a42ca65f815cb27 files/digest-ppc-sources-2.4.19-r5 149
-MD5 50f33b7bfe44f1b4ae1b3812603841cd files/digest-ppc-sources-2.4.19-r6 149
-MD5 7990188a6520d862bd20c4104501604f files/digest-ppc-sources-2.4.20-r1 149
 MD5 9af41c84869ffc48721d77b7557281e8 files/digest-ppc-sources-2.4.20-r2 141
-MD5 572d02461dd09102519308d7b8fb8985 files/digest-ppc-sources-2.4.20-r3 142
-MD5 33266b958177d39523bed77568596744 files/digest-ppc-sources-2.4.20-r4 142
+MD5 174438d215b70cad5ffb00ca8123c062 files/ppc-sources-2.4.24.munmap.patch 837
+MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-2.4.22-r2 133
+MD5 88a216bd55a77f58510b9a1c5c3767ce files/digest-ppc-sources-2.4.19 149
+MD5 50f33b7bfe44f1b4ae1b3812603841cd files/digest-ppc-sources-2.4.19-r6 149
 MD5 7e495d102909604f1af87a10949ee8ae files/digest-ppc-sources-2.4.21-r1 142
-MD5 a54eec24338bcac38c8801d23c526db0 files/digest-ppc-sources-2.4.21-r2 141
 MD5 d401640feba334b89b7426dc145901ee files/digest-ppc-sources-2.4.22-r1 133
-MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-2.4.22-r2 133
-MD5 c5fc0f3db2d2f44309007a4eb2574c03 files/digest-ppc-sources-2.4.22-r3 133
-MD5 005ef6759b490e05bd30edadd451bca0 files/digest-ppc-sources-2.4.23-r1 134
-MD5 9febafea82bcd2f9f8be8c85b8dede12 files/digest-ppc-sources-2.4.24-r1 134
 MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r2 136
-MD5 174438d215b70cad5ffb00ca8123c062 files/ppc-sources-2.4.24.munmap.patch 837
-MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
+MD5 6b15a062d96482772f860647c0088358 files/digest-ppc-sources-2.4.19-r3 149
+MD5 9febafea82bcd2f9f8be8c85b8dede12 files/digest-ppc-sources-2.4.24-r1 134
+MD5 005ef6759b490e05bd30edadd451bca0 files/digest-ppc-sources-2.4.23-r1 134
+MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r3 136
+MD5 33266b958177d39523bed77568596744 files/digest-ppc-sources-2.4.20-r4 142
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r3 b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r3
new file mode 100644
index 000000000000..e0aa79aa0c70
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r3
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 58bf0f69df04d07ed73237ee63ac09ac patch-2.4.24-ppc-r2.bz2 1706398
diff --git a/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.CAN-2004-0109.patch b/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.CAN-2004-0109.patch
new file mode 100644
index 000000000000..d02b51c57fc6
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.CAN-2004-0109.patch
@@ -0,0 +1,87 @@
+--- linux/fs/isofs/rock.c.orig
++++ linux/fs/isofs/rock.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/pagemap.h>
+ #include <linux/smp_lock.h>
++#include <asm/page.h>
+ 
+ #include "rock.h"
+ 
+@@ -419,7 +420,7 @@
+   return 0;
+ }
+ 
+-static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
++static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
+ {
+ 	int slen;
+ 	int rootflag;
+@@ -431,16 +432,25 @@
+ 		rootflag = 0;
+ 		switch (slp->flags & ~1) {
+ 		case 0:
++			if (slp->len > plimit - rpnt)
++				return NULL;
+ 			memcpy(rpnt, slp->text, slp->len);
+ 			rpnt+=slp->len;
+ 			break;
++		case 2:
++			if (rpnt >= plimit)
++				return NULL;
++			*rpnt++='.';
++			break;
+ 		case 4:
++			if (2 > plimit - rpnt)
++				return NULL;
+ 			*rpnt++='.';
+-			/* fallthru */
+-		case 2:
+ 			*rpnt++='.';
+ 			break;
+ 		case 8:
++			if (rpnt >= plimit)
++				return NULL;
+ 			rootflag = 1;
+ 			*rpnt++='/';
+ 			break;
+@@ -457,17 +467,23 @@
+ 			 * If there is another SL record, and this component
+ 			 * record isn't continued, then add a slash.
+ 			 */
+-			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
++			if ((!rootflag) && (rr->u.SL.flags & 1) &&
++			    !(oldslp->flags & 1)) {
++				if (rpnt >= plimit)
++					return NULL;
+ 				*rpnt++='/';
++			}
+ 			break;
+ 		}
+ 
+ 		/*
+ 		 * If this component record isn't continued, then append a '/'.
+ 		 */
+-		if (!rootflag && !(oldslp->flags & 1))
++		if (!rootflag && !(oldslp->flags & 1)) {
++			if (rpnt >= plimit)
++				return NULL;
+ 			*rpnt++='/';
+-
++		}
+ 	}
+ return rpnt;
+ }
+@@ -548,7 +564,10 @@
+ 			CHECK_SP(goto out);
+ 			break;
+ 		case SIG('S', 'L'):
+-			rpnt = get_symlink_chunk(rpnt, rr);
++			rpnt = get_symlink_chunk(rpnt, rr,
++						 link + (PAGE_SIZE - 1));
++			if (rpnt == NULL)
++				goto out;
+ 			break;
+ 		case SIG('C', 'E'):
+ 			/* This tells is if there is a continuation record */
+
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.24-r3.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.24-r3.ebuild
new file mode 100644
index 000000000000..980c55ccd0c6
--- /dev/null
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.24-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.24-r3.ebuild,v 1.1 2004/04/15 10:52:30 plasmaroo Exp $
+
+# Included patches:
+#  benh 2.4.24-0
+#  pegasos 2.4.24-2
+#  orinoco monitor 0.13
+#  O_STREAMING 2.4.20-pre9-1
+#  GRSecurity 2.0-rc4
+#  ea+acl+nfsacl 0.8.65
+#  XFS 2.4.23
+#  Loop-Jari 2.4.22.0
+#  FreeS/WAN 2.01
+#  x509 1.4.5
+#  Extra bootlogos
+#  pmac_pmu fix, see bug #41668
+#  munmap fix, see bug #42024
+
+ETYPE="sources"
+inherit kernel
+IUSE=""
+
+OKV="2.4.24"
+
+EXTRAVERSION="`echo ${PV}-${PN/-sources/}-${PR} | \
+	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
+
+KV=${PV}-${PN/-sources/}-${PR}
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
+
+DESCRIPTION="Full sources for the linux kernel 2.4.24 with benh's patchset"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/patch-${KV/r3/r2}.bz2"
+
+KEYWORDS="ppc -ppc64"
+DEPEND=">=sys-devel/binutils-2.11.90.0.31"
+RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
+
+SLOT=${KV}
+PROVIDE="virtual/linux-sources"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+
+	mv linux-${OKV} ${PF}
+	cd ${PF}
+	bzcat ${DISTDIR}/patch-${KV/r3/r2}.bz2 | patch -p1 || die "Patching failed!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
+	find . -iname "*~" | xargs rm 2> /dev/null
+
+	# Gentoo Linux uses /boot, so fix 'make install' to work properly
+	# also fix the EXTRAVERSION
+	mv Makefile Makefile.orig
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
+			Makefile.orig >Makefile || die # test, remove me if Makefile ok
+	rm Makefile.orig
+
+	cd ${WORKDIR}/${PF}
+	MY_ARCH=${ARCH}
+	unset ARCH
+
+	# Sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die "make mrproper died"
+	ARCH=${MY_ARCH}
+}
+
+src_install() {
+	dodir /usr/src
+	echo ">>> Copying sources..."
+	mv ${WORKDIR}/* ${D}/usr/src
+}
+pkg_postinst() {
+	if [ ! -e ${ROOT}usr/src/linux ]
+	then
+		ln -sf ${PF} ${ROOT}/usr/src/linux
+	fi
+}