- Version bump. - Added patch that fixes CAN-2004-0814 - Linux terminal layer races. - Added random poolsize from Brad Spengler. (CAN pending?)

8 files changed, 83 insertions, 16 deletions

diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog
index f62a6e030091..16fa83805989 100644
--- a/sys-kernel/grsec-sources/ChangeLog
+++ b/sys-kernel/grsec-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/grsec-sources
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.40 2004/12/25 13:15:40 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.41 2005/01/08 05:21:39 solar Exp $
+
+*grsec-sources-2.4.28.2.1.0 (08 Jan 2005)
+
+  08 Jan 2005; <solar@gentoo.org> +files/linux-2.4.28-random-poolsize.patch,
+  +grsec-sources-2.4.28.2.1.0.ebuild:
+  - Added patch that fixes CAN-2004-0814 - Linux terminal layer races.
+  - Added random poolsize from Brad Spengler. (CAN pending?)
 
 *grsec-sources-2.4.28.2.0.2-r3 (25 Dec 2004)
 
diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest
index 0c9847561da0..497a5d0dd8e6 100644
--- a/sys-kernel/grsec-sources/Manifest
+++ b/sys-kernel/grsec-sources/Manifest
@@ -1,15 +1,18 @@
-MD5 a19736662c53c21689809cb522f2adcd ChangeLog 8968
-MD5 e918c9ea6aded4469fb82783c5344749 grsec-sources-2.4.28.2.0.2-r3.ebuild 1357
+MD5 e1ade25f633065ab88c81f116f64abad grsec-sources-2.4.28.2.0.2-r1.ebuild 1253
+MD5 ac4d8afdedc09b9aa1af9bec1f96f6d5 grsec-sources-2.4.28.2.0.2-r3.ebuild 1357
+MD5 3baad7147f2cb7181c87157e0a8acc6e grsec-sources-2.4.28.2.0.2-r2.ebuild 1281
+MD5 9c1cffc60912ca49c86bab47cb434837 grsec-sources-2.4.28.2.1.0.ebuild 1614
+MD5 e7be06d0d80d81dfc4cba3b19078c29f ChangeLog 9178
 MD5 0b2ea9b53b5d526e39afbdc5040ff07a metadata.xml 487
-MD5 cd30257dfb2bafb1560f0ce3b2b68cbf grsec-sources-2.4.28.2.0.2-r1.ebuild 1253
-MD5 90c06150068d30bac2c7f7eb43215bc4 grsec-sources-2.4.28.2.0.2-r2.ebuild 1281
+MD5 0adbefda5e0d752b23dd2f930e6f6bbf files/linux-2.4.28-random-poolsize.patch 452
 MD5 4263daf594b58ea0c0b59e87afe3a7c9 files/CAN-2004-1074.patch 11121
-MD5 c829ff92477a5a9e4fcbc370303217f8 files/digest-grsec-sources-2.4.28.2.0.2-r3 144
 MD5 757ee1239c3f14645ccea3640d551e11 files/CAN-2004-1056.patch 11249
 MD5 3dac23b6e285462a7cda41505cc698e1 files/2.4.26-CAN-2004-0394.patch 319
-MD5 d1ccc2047be533c992f67270a150a210 files/2.4.27-cmdline-race.patch 388
-MD5 c829ff92477a5a9e4fcbc370303217f8 files/digest-grsec-sources-2.4.28.2.0.2-r2 144
 MD5 b293289df61d6f42ff54e4e0ceae53cf files/2.4.24-x86.config 2397
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/CAN-2004-1016.patch 2835
+MD5 d639c90a69a4fc7e8997df074bbfefa0 files/digest-grsec-sources-2.4.28.2.1.0 231
 MD5 4a0215139f9aebfe2cc2747743763f08 files/2.4.28-binfmt_a.out.patch 1887
 MD5 c829ff92477a5a9e4fcbc370303217f8 files/digest-grsec-sources-2.4.28.2.0.2-r1 144
+MD5 c829ff92477a5a9e4fcbc370303217f8 files/digest-grsec-sources-2.4.28.2.0.2-r2 144
+MD5 c829ff92477a5a9e4fcbc370303217f8 files/digest-grsec-sources-2.4.28.2.0.2-r3 144
+MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/CAN-2004-1016.patch 2835
+MD5 d1ccc2047be533c992f67270a150a210 files/2.4.27-cmdline-race.patch 388
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0
new file mode 100644
index 000000000000..14bf3af228dd
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.28.2.1.0
@@ -0,0 +1,3 @@
+MD5 afbd071ae702af4668b2aea32868a698 grsecurity-2.1.0-2.4.28-200501051112.patch 691305
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 50396cf54380f4525f94bca93e4b5b8a linux-2.4.28-CAN-2004-0814.patch 145448
diff --git a/sys-kernel/grsec-sources/files/linux-2.4.28-random-poolsize.patch b/sys-kernel/grsec-sources/files/linux-2.4.28-random-poolsize.patch
new file mode 100644
index 000000000000..6d153e2cd061
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/linux-2.4.28-random-poolsize.patch
@@ -0,0 +1,12 @@
+diff -ur linux-2.4.28/drivers/char/random.c.orig linux-2.4.28.orig/drivers/char/random.c
+--- linux-2.4.28.orig/drivers/char/random.c.orig	2004-11-17 11:54:21.000000000 +0000
++++ linux-2.4.28/drivers/char/random.c	2005-01-08 02:54:49.198635736 +0000
+@@ -1787,7 +1787,7 @@
+ 			     void *oldval, size_t *oldlenp,
+ 			     void *newval, size_t newlen, void **context)
+ {
+-	int	len;
++	size_t	len;
+ 	
+ 	sysctl_poolsize = random_state->poolinfo.POOLBYTES;
+ 
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild
index c9f33687eefd..cb2eddb9a0d6 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild,v 1.1 2004/12/13 17:36:09 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r1.ebuild,v 1.2 2005/01/08 05:21:39 solar Exp $
 
 ETYPE="sources"
 UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild
index 6ff9b2e06ac0..18d3ef15fb8c 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild,v 1.1 2004/12/15 06:59:46 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r2.ebuild,v 1.2 2005/01/08 05:21:39 solar Exp $
 
 ETYPE="sources"
 UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild
index 8b087bc76f21..80b76063cdbd 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild,v 1.1 2004/12/25 13:15:40 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.0.2-r3.ebuild,v 1.2 2005/01/08 05:21:39 solar Exp $
 
 ETYPE="sources"
 UNIPATCH_STRICTORDER="yes"
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.1.0.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.1.0.ebuild
new file mode 100644
index 000000000000..f6fbeb38daa5
--- /dev/null
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.28.2.1.0.ebuild,v 1.1 2005/01/08 05:21:39 solar Exp $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="yes"
+inherit kernel-2
+detect_version
+
+OKV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH/.*/}"
+PATCH_BASE="${PV/${OKV}./}"
+PATCH_BASE="${PATCH_BASE/_/-}"
+EXTRAVERSION="-grsec-${PATCH_BASE}"
+PATCH_STAMP=200501051112
+KV_FULL="${OKV}${EXTRAVERSION}"
+PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}-${PATCH_STAMP}.patch"
+DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
+SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}-${PATCH_STAMP}.patch \
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 \
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.28-CAN-2004-0814.patch"
+
+HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
+KEYWORDS="x86 sparc ppc alpha amd64 -hppa"
+KEYWORDS="-*"
+RESTRICT="buildpkg"
+IUSE=""
+
+UNIPATCH_LIST="${DISTDIR}/${PATCH_SRC_BASE} \
+	${FILESDIR}/2.4.28-binfmt_a.out.patch \
+	${FILESDIR}/CAN-2004-1016.patch \
+	${FILESDIR}/CAN-2004-1074.patch \
+	${FILESDIR}/CAN-2004-1056.patch \
+	${DISTDIR}/linux-2.4.28-CAN-2004-0814.patch \
+	${FILESDIR}/linux-2.4.28-random-poolsize.patch"
+
+src_unpack() {
+	kernel-2_src_unpack
+
+	# users are often confused by what settings should be set.
+	# so we provide an  example of what a P4 desktop would look like.
+	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.2x-x86.config
+}