Fixing bugs 116832 115771 114635, updating grsec, removing selinux/pax network hooks.

5 files changed, 21 insertions, 14 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 41e28fdb1690..c9a0294d0f0a 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.69 2005/12/06 12:18:54 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.70 2005/12/27 19:07:38 johnm Exp $
+
+*hardened-sources-2.6.14-r2 (27 Dec 2005)
+
+  27 Dec 2005; John Mylchreest <johnm@gentoo.org>
+  -hardened-sources-2.6.14-r1.ebuild, +hardened-sources-2.6.14-r2.ebuild:
+  Fixing bugs 116832 115771 114635, updating grsec, removing selinux/pax
+  network hooks.
 
   06 Dec 2005; John Mylchreest <johnm@gentoo.org>
   hardened-sources-2.6.14-r1.ebuild:
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 41e02273bfef..a513485c2045 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b2ecae71d979a88e1570a2345763f294 ChangeLog 17720
+MD5 d7494580f66fc38f52d93e8fa9255c06 ChangeLog 17978
 MD5 31b0edc023e247961a1743f3661da443 files/digest-hardened-sources-2.4.30-r1 145
 MD5 4c68ccd8c0fb38ead3d209ef4b0d03d6 files/digest-hardened-sources-2.4.31 145
 MD5 c2bcd0a74245bc60987ce63c3d39e3bb files/digest-hardened-sources-2.4.32 145
 MD5 dd9860be46684ce346eb3979cd1ce668 files/digest-hardened-sources-2.6.11-r15 230
-MD5 3e291ae2c9a1f5f01ab7e0121707d1f2 files/digest-hardened-sources-2.6.14-r1 228
+MD5 8a4a3aef2cdd2f1bcd1097f8826a4332 files/digest-hardened-sources-2.6.14-r2 228
 MD5 93a4d00db58486dd65300eedce38b154 hardened-sources-2.4.30-r1.ebuild 780
 MD5 441c0d8e71fbd8b34be5c5482190376a hardened-sources-2.4.31.ebuild 777
 MD5 f6a0b9ae27df3b10a8a26cecfb387e29 hardened-sources-2.4.32.ebuild 932
 MD5 d63b70be4c4c070ce524bf69824563db hardened-sources-2.6.11-r15.ebuild 838
-MD5 abdb3572a5d168181b9adda3d9f6d3b9 hardened-sources-2.6.14-r1.ebuild 696
+MD5 64aee3d1c807eb103074f4b547bda3ae hardened-sources-2.6.14-r2.ebuild 698
 MD5 ea581939769338f7f2905ba91ed91c6f metadata.xml 979
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDlYDdz7mlh8wQzGMRAqjYAJ9mH2CfGHUnDBmhgbeQnCBCosyy8QCdEQyh
-FJ9tWqv858IM0+p4w8GMf7g=
-=RWIk
+iD8DBQFDsZEXz7mlh8wQzGMRApSyAJ91nPfAo91C+HZ6eATmqUlisQ0RNACeN77x
+dN9/PrWthrvMVTZNbLAhOgY=
+=u06V
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r1 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r1
deleted file mode 100644
index 4505b4f9077a..000000000000
--- a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d7c6b3a322fd6f164af6b363e3adbe22 genpatches-2.6.14-5.base.tar.bz2 33008
-MD5 95200fb6c5ee9dde314aee76d5bc5163 hardened-patches-2.6.14-2.extras.tar.bz2 152131
-MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
diff --git a/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r2 b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r2
new file mode 100644
index 000000000000..f907b8bbf904
--- /dev/null
+++ b/sys-kernel/hardened-sources/files/digest-hardened-sources-2.6.14-r2
@@ -0,0 +1,3 @@
+MD5 7b4596d457b6ee6555467510f93beae1 genpatches-2.6.14-6.base.tar.bz2 43416
+MD5 eed1d64314c2775e33b996abd09f44f5 hardened-patches-2.6.14-3.extras.tar.bz2 153960
+MD5 66d02cbd723876c6d69846a067875a22 linux-2.6.14.tar.bz2 39172170
diff --git a/sys-kernel/hardened-sources/hardened-sources-2.6.14-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-2.6.14-r2.ebuild
index fd12fca6abf6..f4d2fe5d8158 100644
--- a/sys-kernel/hardened-sources/hardened-sources-2.6.14-r1.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-2.6.14-r2.ebuild
@@ -1,19 +1,19 @@
 # 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.6.14-r1.ebuild,v 1.2 2005/12/06 12:18:54 johnm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-2.6.14-r2.ebuild,v 1.1 2005/12/27 19:07:39 johnm Exp $
 
 ETYPE="sources"
 K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="5"
+K_GENPATCHES_VER="6"
 
 inherit kernel-2
 detect_version
 detect_arch
 
-HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2
+HGPV=${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3
 HGPV_URI="mirror://gentoo/hardened-patches-${HGPV}.extras.tar.bz2"
 UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
 DESCRIPTION="Hardened sources for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-KEYWORDS="x86 ~ppc amd64"
+KEYWORDS="~x86 ~ppc ~amd64"