From 13b02bc670a13aa4356346f8273a8c06ef3efa9e Mon Sep 17 00:00:00 2001
From: Adam Mondl <tocharian@gentoo.org>
Date: Fri, 14 Jan 2005 03:07:39 +0000
Subject: [PATCH] Updates security fixes and adds squashfs 2.1 support.  Thanks
 to Peter S. Mazinger for grsecurity patches as well.

---
 sys-kernel/hardened-sources/ChangeLog         | 11 ++++--
 sys-kernel/hardened-sources/Manifest          | 22 ++++++------
 .../files/digest-hardened-sources-2.4.28-r2   |  2 ++
 .../hardened-sources-2.4.27-r2.ebuild         |  4 +--
 .../hardened-sources-2.4.27-r3.ebuild         |  4 +--
 .../hardened-sources-2.4.28-r1.ebuild         |  4 +--
 .../hardened-sources-2.4.28-r2.ebuild         | 35 +++++++++++++++++++
 .../hardened-sources-2.4.28.ebuild            |  4 +--
 8 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2
 create mode 100644 sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 64f0e4b74986..46da5371e2aa 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,13 @@
 # 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.41 2004/12/24 19:45:08 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.42 2005/01/14 03:07:38 tocharian Exp $
+
+*hardened-sources-2.4.28-r2 (13 Jan 2005)
+
+  13 Jan 2005; Adam Mondl <tocharian@gentoo.org>
+  +hardened-sources-2.4.28-r2.ebuild:
+  Updates security fixes and adds squashfs 2.1 support. Thanks to Peter S.
+  Mazinger for grsecurity patches as well.
 
 *hardened-sources-2.4.28-r1 (23 Dec 2004)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 4f17be1b5f1d..0758c7f9a229 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,16 +1,18 @@
-MD5 d52beea9e4becac0c9cdd1eb88cd9c08 ChangeLog 10992
-MD5 bd0830e661b5db2e328ff31ef4b41024 hardened-sources-2.4.28-r1.ebuild 1022
+MD5 dc6dc2dfc15431cd10f425b526db15bf hardened-sources-2.4.27-r2.ebuild 1032
+MD5 466238e40bed9071a61227e357ed6095 hardened-sources-2.4.28-r1.ebuild 1022
+MD5 d7a5e7625d9ce5a4d72f118220d46aee hardened-sources-2.4.27-r3.ebuild 1033
+MD5 9b45f8ff020930324af8c15412fa2e2e hardened-sources-2.4.28-r2.ebuild 1029
+MD5 28ec99a475105b50f43e0bd4aa2cdd12 hardened-sources-2.4.28.ebuild 1792
+MD5 60a220112b3ab15123684f80e98b01ee ChangeLog 11241
 MD5 0a473e60c059cb41c96a6bbcbff84769 metadata.xml 459
-MD5 ec13a8435dc6785ca17db91918579f3d hardened-sources-2.4.27-r2.ebuild 1027
-MD5 d4ecb98afe62804ab5f6aff4d9315a8e hardened-sources-2.4.28.ebuild 1792
-MD5 91d88b3126d4cc0b7cc5a22819808e68 hardened-sources-2.4.27-r3.ebuild 1028
+MD5 4a0215139f9aebfe2cc2747743763f08 files/2.4.28-grsec-binfmt_a.out.patch 1887
 MD5 c8985a5695cfda1c35d1b433d62604ce files/2.4.28-selinux-binfmt_a.out.patch 1743
-MD5 8652613a5ac92aa0ad7fdf0cc6c01716 files/digest-hardened-sources-2.4.28 339
+MD5 073eb0c263e55f7f1d72d14c8957f4e2 files/digest-hardened-sources-2.4.27-r2 145
 MD5 3cfa2f10ac7a4d62112f84dcb047b050 files/digest-hardened-sources-2.4.27-r3 145
+MD5 fcf28c7e79f13550bec1b88ead0be365 files/digest-hardened-sources-2.4.28-r1 145
+MD5 bf22baab393ca4ea4f1a2dcbe51b4442 files/digest-hardened-sources-2.4.28-r2 145
+MD5 376d0153645489845937a4ffd83e761b files/2.4.28-grsec-cmdline-race.patch 352
+MD5 8652613a5ac92aa0ad7fdf0cc6c01716 files/digest-hardened-sources-2.4.28 339
 MD5 8850fb5244d9d10736d95a85f3c5b3f1 files/2.4.27-CAN-2004-0394.patch 448
-MD5 4a0215139f9aebfe2cc2747743763f08 files/2.4.28-grsec-binfmt_a.out.patch 1887
-MD5 073eb0c263e55f7f1d72d14c8957f4e2 files/digest-hardened-sources-2.4.27-r2 145
 MD5 d1ccc2047be533c992f67270a150a210 files/2.4.27-cmdline-race.patch 388
-MD5 fcf28c7e79f13550bec1b88ead0be365 files/digest-hardened-sources-2.4.28-r1 145
 MD5 98e84c850a16b9cb458be21ae4fb82df files/2.4.28-selinux-cmdline-race.patch 352
-MD5 376d0153645489845937a4ffd83e761b files/2.4.28-grsec-cmdline-race.patch 352
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2
new file mode 100644
index 000000000000..7a1993b10d39
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.4.28-r2
@@ -0,0 +1,2 @@
+MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
+MD5 b1afe28a997834ad11d3d534503801a1 hardened-patches-2.4-28.3.tar.bz2 575101
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.27-r2.ebuild
index 1dd823463591..79dfed33a0b4 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r2.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.27-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/hardened-sources/hardened-sources-2.4.27-r2.ebuild,v 1.2 2004/09/05 14:07:43 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.27-r2.ebuild,v 1.3 2005/01/14 03:07:38 tocharian Exp $
 
 IUSE="selinux"
 ETYPE="sources"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild
index 9ce8961ed9d7..51f98b79cb6d 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.27-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/hardened-sources/hardened-sources-2.4.27-r3.ebuild,v 1.1 2004/09/08 20:42:21 scox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.27-r3.ebuild,v 1.2 2005/01/14 03:07:38 tocharian Exp $
 
 IUSE="selinux"
 ETYPE="sources"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild
index b07fe55ae253..3db2dfe16391 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.28-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/hardened-sources/hardened-sources-2.4.28-r1.ebuild,v 1.1 2004/12/24 19:45:08 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.28-r1.ebuild,v 1.2 2005/01/14 03:07:38 tocharian Exp $
 
 IUSE="selinux"
 ETYPE="sources"
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild
new file mode 100644
index 000000000000..f9f77cd0f8dc
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.28-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2005 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.28-r2.ebuild,v 1.1 2005/01/14 03:07:38 tocharian Exp $
+
+IUSE="selinux"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+HGPV=28.3
+HGPV_SRC="http://dev.gentoo.org/~tocharian/kernels/${PN}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+
+UNIPATCH_STRICTORDER="yes"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}.tar.bz2"
+
+UNIPATCH_DOCS="${WORKDIR}/patches/hardened-patches-${KV_MAJOR}.${KV_MINOR}-${HGPV}/0000_README"
+
+# According to the patchset numbering scheme, 31xx patches are grsec related
+# while 32xx are SELinux related.
+
+if use selinux; then
+	UNIPATCH_LIST="${UNIPATCH_LIST} 31"
+else
+	UNIPATCH_LIST="${UNIPATCH_LIST} 32"
+fi
+
+DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+
+SRC_URI="${KERNEL_URI} ${HGPV_SRC}"
+KEYWORDS="~x86"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild
index 15e825385c5a..5ab63f150ad8 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.4.28.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/hardened-sources/hardened-sources-2.4.28.ebuild,v 1.6 2004/12/08 19:24:43 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.4.28.ebuild,v 1.7 2005/01/14 03:07:38 tocharian Exp $
 
 IUSE="selinux"
 ETYPE="sources"
-- 
2.26.2