Bumped to 2.4.26-r6 and to 2.4.27-r1 in order to fix bug #59905

10 files changed, 50 insertions, 53 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 041322017dfb..382d5578a5e9 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.35 2004/08/08 20:45:05 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.36 2004/08/10 00:11:08 scox Exp $
+
+*hardened-sources-2.4.27-r1 (09 Aug 2004)
+
+  09 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.27-r1.ebuild,
+  -hardened-sources-2.4.27.ebuild,
+  +files/2.4.27-cmdline-race.patch:
+  Version bump, fix for cmdline race. See bug #59905.
+
+*hardened-sources-2.4.26-r6 (09 Aug 2004)
+
+  09 Aug 2004; Andrea Luzzardi <scox@gentoo.org>
+  +hardened-sources-2.4.26-r6.ebuild,
+  -hardened-sources-2.4.26-r5.ebuild,
+  -hardened-sources-2.4.26-r4.ebuild,
+  +files/2.4.26-cmdline-race.patch:
+  Version bump, fix for cmdline race. See bug #59905.
 
 *hardened-sources-2.4.27 (08 Aug 2004)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 25ac5b7abd73..0291cdf33ec3 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,14 +1,14 @@
-MD5 1741288522d81cb3af00710a3b025a41 hardened-sources-2.4.26-r5.ebuild 1195
-MD5 1849872c6d457517db9e0ba1dd79e67b hardened-sources-2.4.27.ebuild 1025
-MD5 758c55fabf65a03bc4c56ee9165366bc hardened-sources-2.4.26-r4.ebuild 1194
-MD5 13f07abfdac7c8229bfc36d1e3005ec0 ChangeLog 9235
+MD5 85fde34c83f10a74cf99174a22bb702f hardened-sources-2.4.27-r1.ebuild 907
+MD5 9e5117ca98c4878504559ba30ac5f2f0 hardened-sources-2.4.26-r6.ebuild 1073
+MD5 5ba2561758a81f8562d70ca15534fa9b ChangeLog 9690
 MD5 0a473e60c059cb41c96a6bbcbff84769 metadata.xml 459
 MD5 0f66013f643c79c97fda489618a4e2fd files/2.4.26-CAN-2004-0535.patch 476
 MD5 dc18e982f8149588a291956481885a8c files/2.4.26-CAN-2004-0495.patch 17549
 MD5 5fd02bd0257e7bad717354021bcba268 files/2.4.26-signal-race.patch 469
 MD5 8850fb5244d9d10736d95a85f3c5b3f1 files/2.4.26-CAN-2004-0394.patch 448
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/2.4.26-CAN-2004-0497.patch 707
-MD5 672a867210b52775742afbe2c3f3d44b files/digest-hardened-sources-2.4.26-r4 221
-MD5 9885017f71e3c5b392a163359d2467aa files/digest-hardened-sources-2.4.26-r5 221
-MD5 b6117ce855b957361c71b35e8c035dc8 files/digest-hardened-sources-2.4.27 145
+MD5 9885017f71e3c5b392a163359d2467aa files/digest-hardened-sources-2.4.26-r6 221
+MD5 b6117ce855b957361c71b35e8c035dc8 files/digest-hardened-sources-2.4.27-r1 145
+MD5 d1ccc2047be533c992f67270a150a210 files/2.4.26-cmdline-race.patch 388
 MD5 8850fb5244d9d10736d95a85f3c5b3f1 files/2.4.27-CAN-2004-0394.patch 448
+MD5 d1ccc2047be533c992f67270a150a210 files/2.4.27-cmdline-race.patch 388
diff --git a/sys-kernel/hardened-sources/files/2.4.26-cmdline-race.patch b/sys-kernel/hardened-sources/files/2.4.26-cmdline-race.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/2.4.26-cmdline-race.patch
@@ -0,0 +1,11 @@
+--- linux-2.4/fs/proc/base.c	2004-04-15 07:09:32.000000000 +0100
++++ linux-2.4/fs/proc/base.c.plasmaroo	2004-08-09 23:30:43.869195800 +0100
+@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
+ 	if (mm)
+ 		atomic_inc(&mm->mm_users);
+ 	task_unlock(task);
+-	if (mm) {
++	if (mm && mm->arg_end) {
+ 		int len = mm->arg_end - mm->arg_start;
+ 		if (len > PAGE_SIZE)
+ 			len = PAGE_SIZE;
diff --git a/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch b/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch
new file mode 100644
index 000000000000..5f26f7f388f6
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/2.4.27-cmdline-race.patch
@@ -0,0 +1,11 @@
+--- linux-2.4/fs/proc/base.c	2004-04-15 07:09:32.000000000 +0100
++++ linux-2.4/fs/proc/base.c.plasmaroo	2004-08-09 23:30:43.869195800 +0100
+@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
+ 	if (mm)
+ 		atomic_inc(&mm->mm_users);
+ 	task_unlock(task);
+-	if (mm) {
++	if (mm && mm->arg_end) {
+ 		int len = mm->arg_end - mm->arg_start;
+ 		if (len > PAGE_SIZE)
+ 			len = PAGE_SIZE;
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r4 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r4
deleted file mode 100644
index 86e4efbcc031..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 b9841dfdd4583bf63c8306f45abf00f0 hardened-patches-2.4-26.0.tar.bz2 456490
-MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r5 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r6
index 2130849973e8..2130849973e8 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r5
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.26-r6
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27-r1
index 7342da8d549d..7342da8d549d 100644
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.27-r1
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.26-r4.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.26-r4.ebuild
deleted file mode 100644
index 2b53d1570d36..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.26-r4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.26-r4.ebuild,v 1.2 2004/08/04 20:18:12 scox Exp $
-
-IUSE="selinux"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-HGPV=26.0
-HGPV_SRC="http://dev.gentoo.org/~scox/kernels/v2.4/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
-
-CAN_SRC="http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0415.patch"
-
-UNIPATCH_STRICTORDER="yes"
-
-# According to the patchset numbering scheme, 12xx patches are grsec related
-# while 13xx are SELinux related.
-
-if use selinux; then
-	UNIPATCH_EXCLUDE="12"
-else
-	UNIPATCH_EXCLUDE="13"
-fi
-
-UNIPATCH_LIST=" ${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2 \
-				${FILESDIR}/${OKV}*.patch \
-				${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch"
-
-UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
-
-DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-
-SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${CAN_SRC}"
-KEYWORDS="x86 -ppc"
-
-pkg_postinst() {
-	postinst_sources
-}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.26-r5.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.26-r6.ebuild
index 0f8e64b26b99..8cd7d95baa2c 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.26-r5.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.26-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.26-r5.ebuild,v 1.1 2004/08/08 06:31:28 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.26-r6.ebuild,v 1.1 2004/08/10 00:11:08 scox Exp $
 
 IUSE="selinux"
 ETYPE="sources"
@@ -32,7 +32,7 @@ UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGP
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${HGPV_SRC} ${CAN_SRC}"
-KEYWORDS="~x86 -ppc"
+KEYWORDS="x86 -ppc"
 
 pkg_postinst() {
 	postinst_sources
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.27.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.27-r1.ebuild
index 2fc372a54896..64d19cfc806c 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.27.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.27.ebuild,v 1.1 2004/08/08 20:45:05 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.27-r1.ebuild,v 1.1 2004/08/10 00:11:08 scox Exp $
 
 IUSE="selinux"
 ETYPE="sources"