Based on hardened-sources-3.4.2 + fix for FW_MIPS_FILE_06 regression

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

3 files changed, 63 insertions, 5 deletions

diff --git a/sys-kernel/hardened-sources/ChangeLog b/sys-kernel/hardened-sources/ChangeLog
index 42a64b59045a..9d7a08ac7919 100644
--- a/sys-kernel/hardened-sources/ChangeLog
+++ b/sys-kernel/hardened-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/hardened-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.623 2012/07/01 20:37:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/ChangeLog,v 1.624 2012/07/03 13:11:40 blueness Exp $
+
+*hardened-sources-3.4.2-r1 (03 Jul 2012)
+
+  03 Jul 2012; Anthony G. Basile <blueness@gentoo.org>
+  +hardened-sources-3.4.2-r1.ebuild:
+  Based on hardened-sources-3.4.2 + fix for FW_MIPS_FILE_06 regression
 
 *hardened-sources-3.2.21-r2 (01 Jul 2012)
 
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 2d1dfbd2f6ba..40716461735e 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -40,6 +40,7 @@ DIST hardened-patches-3.2.21-1.extras.tar.bz2 563495 RMD160 3756d134285056b3a4c9
 DIST hardened-patches-3.2.21-2.extras.tar.bz2 563622 RMD160 cfd319f525229b277446a58a7942d399ffa9b86a SHA1 09173557d61eb01fe314c012c27ebafaf70b1fcb SHA256 5e3532665389e95060996ff293e292c9d2ead72fd2cb3a26d2371497a63be1f3
 DIST hardened-patches-3.2.21-3.extras.tar.bz2 563724 RMD160 d4a2abec6c3f187654a2416a665f41598e999f4b SHA1 519903ceeab5537aff468a8219f76b2bf2ede7a8 SHA256 8b2c0305acc6ae4709131c875427ff4006822f1e78ffb9a1b1e38fb720f75e04
 DIST hardened-patches-3.4.2-1.extras.tar.bz2 546639 RMD160 23b07aaa0c87b11b4945fd6f84e31e286dc2c964 SHA1 29fd884c8f4bd53a923bb08835b15a26fa20b9bf SHA256 a513ad66af2e1feccc40c89b492336525db3c4c9e9227b6d957a05ee9fcabfd3
+DIST hardened-patches-3.4.2-2.extras.tar.bz2 547441 RMD160 0580673c4be633b81ea8be2400697720e3131600 SHA1 0a3e8436a50bf197bda7ac9ab3fc896b68971c29 SHA256 183726315c7e4e82d8f02e4eede81e561284300b52205c490d26e6ff6d448d09
 DIST hardened-patches-3.4.3-1.extras.tar.bz2 562591 RMD160 afea8d716eb27286b9179446f688b68174959150 SHA1 7617f40c7e23562566d47ddd8232874fd401c1a0 SHA256 a2d3d78f5ec904239aeb084965c628da96aaa60f576f73628aedba15f261494b
 DIST hardened-patches-3.4.3-2.extras.tar.bz2 551688 RMD160 76ca77896b19f72a216300b420a8372575a54abf SHA1 500c26c2b03585668426c8eef41b5e8fbae4b3de SHA256 d7aa3138473eedae5772a1a24b7d023ec7bf498183222fa0fe9bd396d9ca0491
 DIST hardened-patches-3.4.4-1.extras.tar.bz2 551869 RMD160 fd71e173f27758104223feeaa8705393cb521493 SHA1 a01540f84d4e64270a63277b335f9c57be00d17f SHA256 3f421dc66cf727d494188991a7d0ef0ea20df8382868a5a9dcbfc4b5e2061be9
@@ -61,18 +62,19 @@ EBUILD hardened-sources-3.2.20.ebuild 1811 RMD160 18402b2e55fbf2be4f30e061898d0a
 EBUILD hardened-sources-3.2.21-r1.ebuild 1816 RMD160 a835a0e647375a73010811a24ac3c62b79f01cf9 SHA1 25225423e8dea4c90a9960801fccbe605f548e0e SHA256 71b70786ba74255d258a57f3df3b544e56e8044dc36092f13d7e96383f97c1b3
 EBUILD hardened-sources-3.2.21-r2.ebuild 1816 RMD160 24890753b0e81f426ae022de234d2c2484b81f42 SHA1 d5a91c6c813b8ec327349ecbda17adfd25f87ef6 SHA256 9598c44680bd52b9b522091b007a6d92ca8451d0360f18f0c9f76d7227eb6db2
 EBUILD hardened-sources-3.2.21.ebuild 1813 RMD160 4d0683e5130bcc984c1be805aaadc6311623e4a2 SHA1 6550733433505e316ac97a480b3d99599c892f55 SHA256 6ec6abd8e141a1b24b169057a3db0be6efec5dfb30477608cc0678507510ead6
+EBUILD hardened-sources-3.4.2-r1.ebuild 1814 RMD160 f3b44974895dd54fd141510c281bc87bafb43440 SHA1 428a27856d83f10c127bfd957d22615004c31f65 SHA256 64f08334a4cdd4de379ab950d52ee154c7c5973ef24d0eae185d5514eb10180f
 EBUILD hardened-sources-3.4.2.ebuild 1809 RMD160 6338fb1bd9da765df876384f1d9f37c23f8b0830 SHA1 99111e00e86e2fb22773cec4253a5696ae3be183 SHA256 de6d09b7d497ba147b598ec55931fd6762010004d174f02981bcb63382e8d238
 EBUILD hardened-sources-3.4.3-r1.ebuild 1814 RMD160 690a611afc22311a147dc9793a13fdfa0a6d2a4e SHA1 e7dd767555666c01a6f35c394ef169462acba64b SHA256 20b3341c9894d8137fbe371cdd373b6f0975785b6ed4a7a00ac1426a106f2f46
 EBUILD hardened-sources-3.4.3.ebuild 1811 RMD160 accc5ff862170325f05c95b3f4544b2e5cc837cc SHA1 89ec0b23ea0abcd236f6edb9796f7ca6f62a5378 SHA256 8c42b23b301674b40f44137a85bbf9bf045f45275fdcadc0f03c8ebd161d6a19
 EBUILD hardened-sources-3.4.4-r1.ebuild 1881 RMD160 bf8bdf2c81644ad5008785f39cc67ed93db276ff SHA1 f9f32f99d597318f9264bab52a1843aced03588f SHA256 7fcce40000ac84a6771a1212a6216d5e19e2c9ea6945c66b27d2949f36465fa7
 EBUILD hardened-sources-3.4.4.ebuild 1811 RMD160 82ac02a3ba72bce40f65f3bc5fdb03b964797cc4 SHA1 fa382d16099da8dc484e1db0051892f70af80aeb SHA256 1544db859c343dc48300e05ed932233d523790a91e7d447b0b32c99535b6a9bb
-MISC ChangeLog 23613 RMD160 b60e83c4d53feba0820428461d438de88b7fa19e SHA1 497a343a5f02513c3f17d761f3fd578b97550550 SHA256 aaee67d72faa989598cc2794ab27417d78745b702e113d017d8e15b8de60d888
+MISC ChangeLog 23819 RMD160 ccec83c34a24e2adde7c02a856940a4cfe5c9956 SHA1 750704d2f19d8f5242dcc58582ab0e4f0e4310fd SHA256 9e11aed0b084bc46c320bc1469b396563b063739aefedf8750596cd3ca9fc731
 MISC ChangeLog-2011 112069 RMD160 2a385edf0499f6dc30581100b66f641fb64f77ef SHA1 af33094b92426b6abd963227d817db249ccbe877 SHA256 39bac69a08709be5b79c6e711fd94aac7e53191b76fef64f9b3d09f7b5ac0f82
 MISC metadata.xml 651 RMD160 bd2f856b7c5aea29652610491cd60135e1e9b9f1 SHA1 1741d5fc80ad8f934fa7ad177b4662d1993d8584 SHA256 614ce0d6e8cfcf0b4dbf344b2758f25375afdaadccbfa4f68c3f8f058218f0a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAk/wtRkACgkQl5yvQNBFVTU2/wCeNSezl/NMwRnEVn5Yu26aXH/r
-BOMAn25gHygapYCBzE5H04YNM0nEeeqf
-=mKBS
+iEYEAREIAAYFAk/y75YACgkQl5yvQNBFVTWMWgCfeyBdEAEf6mHn/QgWxJoj6zfo
+vq0AnjTmlB6agyKY6Y2p1qf/XbirHPH9
+=js16
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.4.2-r1.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.4.2-r1.ebuild
new file mode 100644
index 000000000000..a487d26f89aa
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-3.4.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.4.2-r1.ebuild,v 1.1 2012/07/03 13:11:40 blueness Exp $
+
+EAPI="4"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="2"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	local GRADM_COMPAT="sys-apps/gradm-2.9.1"
+
+	ewarn
+	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
+	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
+	ewarn "use one of these predefined grsecurity levels should read the help"
+	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
+	ewarn "users with more, than one version of gcc installed should use gcc-config"
+	ewarn "to select a compatible version."
+	ewarn
+	ewarn "Users of grsecurity's RBAC system must ensure they are using"
+	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+	ewarn "It is strongly recommended that the following command is issued"
+	ewarn "prior to booting a ${PF} kernel for the first time:"
+	ewarn
+	ewarn "emerge -na =${GRADM_COMPAT}*"
+	ewarn
+}