New c1pher-sources

5 files changed, 60 insertions, 122 deletions

diff --git a/sys-kernel/c1pher-sources/ChangeLog b/sys-kernel/c1pher-sources/ChangeLog
index 073cbaa..a727799 100644
--- a/sys-kernel/c1pher-sources/ChangeLog
+++ b/sys-kernel/c1pher-sources/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*c1pher-sources-2.6.38 (11 May 2011)
+
+  11 May 2011; Dane Smith <c1pher@gentoo.org> -c1pher-sources-2.6.36_p1.ebuild,
+  -c1pher-sources-2.6.37.ebuild, +c1pher-sources-2.6.38.ebuild:
+  Remove old. Bump to 2.6.38. Now hardened+gentoo+tuxonice
+
 *c1pher-sources-2.6.37 (22 Feb 2011)
 
   22 Feb 2011; Dane Smith <c1pher@gentoo.org> +c1pher-sources-2.6.37.ebuild:
diff --git a/sys-kernel/c1pher-sources/Manifest b/sys-kernel/c1pher-sources/Manifest
index acb22a2..5c8066a 100644
--- a/sys-kernel/c1pher-sources/Manifest
+++ b/sys-kernel/c1pher-sources/Manifest
@@ -1,13 +1,10 @@
-DIST 2.6.36-zen1.patch.lzma 903291 RMD160 bfa6771abbaccbe3abd2a78454acbaead95f6bea SHA1 d70edaa2d31ff2414544f15782a6f92cd6990eef SHA256 93278a9e0bd18a4c9e352fd3a61d2aeca6fdbc6db5216fa4596605ef96b27708
-DIST deblob-2.6.36 90559 RMD160 32cc73f2b3fa0304e7ebf8c35f0501570ad08ce7 SHA1 71c2cc4bcdb800d46deac61cb9ac8c2cc51b1faa SHA256 fe4fb0cb06d017d1ec70f50c1c06e184c31c9bba6c4b359e43d54125d60501df
-DIST deblob-check-2.6.36 285794 RMD160 2e3232ec9cbbb4874e90a4995372e2f10c0036e1 SHA1 f06f75e3b96d8bce109aa30ccab491624602795c SHA256 5e6fcb7110da5fb62edb0b85f169090de714cba2aac3cbfafbd84b6a860c8641
-DIST genpatches-2.6.36-1.base.tar.bz2 765 RMD160 2a838b4e9dad9509690cc91eefb00d18345d245a SHA1 61b38cefd7698a6fdd30a67246de8f024c0efdfb SHA256 ad82531741525b188229792e71d95075f7155cc5968464008e25314e2ab4bc6b
-DIST genpatches-2.6.37-1.base.tar.bz2 770 RMD160 64dcca357f523eeac74500e78310d56a8a07be30 SHA1 895e5c7ce4e8c9e01857457d8b3b9f030a99e173 SHA256 8bc3cd19243410dc4862e8903eb6738eebf01668de861f6fa2d2f6c654ec9a7d
-DIST linux-2.6.36.tar.bz2 70277083 RMD160 d739da505a79e71a1370d36e1373b36be055c123 SHA1 b546ab66458d7d614151d80adbc03b4d28977ae2 SHA256 15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04
-DIST linux-2.6.37.tar.bz2 73577826 RMD160 fced3801f3c94aa545c90e10981de616376a3b41 SHA1 eba83c89e71a86060ef6ff76aefff660aef819e2 SHA256 edbf091805414739cf57a3bbfeba9e87f5e74f97e38f04d12060e9e0c71e383a
-DIST tuxonice-3.2-rc2-for-2.6.36.patch.bz2 127163 RMD160 62c2604737d590fab70532949d8315fd11dd0447 SHA1 32a36184928eb13cc390469ced8596c48e05db61 SHA256 f3ac4329f059ff7b33da1221031b9ab8a29b0dbb674843229d16be26ef1b9ced
-DIST v2.6.37-zen_master.diff.gz 16515646 RMD160 0655cdf32960be0e5f55d27693b470f4efe329f9 SHA1 4eaf08fc24fc50bf21e3937c1832fc17213860d2 SHA256 f771a7e5764f4fc9211fd99ca84f1a911ec0df7d39a8a6729b136761ed801d99
-EBUILD c1pher-sources-2.6.36_p1.ebuild 1705 RMD160 146124c167fb68ef82fe326f0dd5d705556ce9ef SHA1 a2d32a7dc65cd63e22921ef8cd3e7bd45c5dc3cd SHA256 0c282565e724b0446f67c44baa4eb1519667879aabeb09ad0df4b4d1a29f94af
-EBUILD c1pher-sources-2.6.37.ebuild 1737 RMD160 6b6ded02eed172a6a15b95bbe51d43aff772cfba SHA1 902b28cdce0e5c6d3dfe201716138fe78f2defc8 SHA256 1b7776cdc4630a6d1eaa19951689aa6030c5803b2bada5fd10a7223354e0c3f3
-MISC ChangeLog 463 RMD160 a5390bc3253965b686c3bb38f98ff8d308153771 SHA1 a9b84ea8518c04773b09695fdc46d793e744d1c0 SHA256 94a715927f2420cd6573e2d40352c0788e7cf81bae5a7c2127e68ef662fb9a95
+DIST deblob-2.6.38 99773 RMD160 f52e78df8e819319d0aabf24fe471e2ef9e02140 SHA1 0d176aa88f0525123d293e26617f2d287fabdddc SHA256 ddabcd846baa19b7e82adec3ca8ff17f2f7425c292516889098559f639e763eb
+DIST deblob-check-2.6.38 345831 RMD160 1caea73e54a21cb1100a4ee8226201ddd8a89985 SHA1 44de3ac14d9a3e94b97553051aff0ebfada45274 SHA256 6f681dbd1c1c44cba2c9902dd77a5a51b2d1cc81567cffc60ba92bd0bdd4ff2f
+DIST genpatches-2.6.38-5.base.tar.bz2 121256 RMD160 df96fd9e8a18a2b0738b90122dc1be14042f30a2 SHA1 604117bfd1d8d5901ec3dabe5d83285e411748e8 SHA256 1c34e81dde44f2a6a07ad679d68276d22cb59da3245b8a6bd845ecd885b592cc
+DIST genpatches-2.6.38-5.extras.tar.bz2 15665 RMD160 39abb5818bdc5025ff9b6648f976e48ded035776 SHA1 c89301b292e398a31051fae885312aeb938c9278 SHA256 e4335af53a45ccb40396a6cbcac753ceb48c63aeea4f8fbb578070c1ab24d33f
+DIST hardened-patches-2.6.38-4.extras.tar.bz2 417075 RMD160 2d30a4bf41a75d8252324f06d2ff9b555c800af6 SHA1 50c913db315e768c5634af49f99885be10a4306b SHA256 d75f20527ca2ccb8622a0c61bf3aa99e231527c25f2a64480d4499e90dc40687
+DIST linux-2.6.38.tar.bz2 74739098 RMD160 d1179be93f1309303b9aa6008a25b6247726e764 SHA1 02aade5ad3dedd70739c9b4a05de40edbe432d25 SHA256 72f0cfaefb8dc86b219d5a742dd0375332627641ecbdf5badd3158e2127b9304
+DIST tuxonice-3.2-for-2.6.38.patch.bz2 129795 RMD160 c9fac77978ae5fb61664f61a212db3a0ba6b214e SHA1 e17940ccfff4bf51072428a10e3ed9d7ee764c4d SHA256 b3728a7c473d9291901a434363aa2033cf00937ca223768fc605059dd772b50e
+EBUILD c1pher-sources-2.6.38.ebuild 1518 RMD160 445cd230e750724c4b3661287f428b916d1573ef SHA1 858f1be9f8661215894ffe2e81f9014b467a75d9 SHA256 bb34fe76c67fb0cd8b12f7d1af9e1d7fc66ccc5d80fafb475460564ea307efbc
+MISC ChangeLog 705 RMD160 3d8c04bd18e62b5c1c5a87a49e744e72ca7616bf SHA1 5fe73a7e660a5283cfb15e9020ff4b589560d885 SHA256 a417b4157dd1f572bbf78adad9d3e126263f1eb2d7a16f2a52c739a7dd10f82a
 MISC metadata.xml 335 RMD160 3eb26b2e6dcf94814a646547a64efdafa5a237a2 SHA1 c24c4644403079bab40f44579af09a156e2b050b SHA256 26ce665d3a67e95eeaebb4ef7c095205bdb253b023a784f8c185c618d8159cdd
diff --git a/sys-kernel/c1pher-sources/c1pher-sources-2.6.36_p1.ebuild b/sys-kernel/c1pher-sources/c1pher-sources-2.6.36_p1.ebuild
deleted file mode 100644
index 7c23d78..0000000
--- a/sys-kernel/c1pher-sources/c1pher-sources-2.6.36_p1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild,v 1.1 2011/01/24 16:21:12 scarabeus Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-COMPRESSTYPE=".lzma"
-UNIPATCH_STRICTORDER="1"
-CKV="${PV/_p[0-9]*}"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Zen Patches + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net \
-http://zen-kernel.org"
-IUSE=""
-
-TUXONICE_SNAPSHOT=""
-TUXONICE_VERSION="3.2-rc2"
-TUXONICE_TARGET="2.6.36"
-TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
-TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
-
-ZEN_PATCHSET="${PV/*_p}"
-ZEN_KERNEL="${PV/_p[0-9]*}"
-ZEN_KERNEL="${ZEN_KERNEL/_/-}"
-ZEN_FILE="${ZEN_KERNEL}-zen${ZEN_PATCHSET}.patch${COMPRESSTYPE}"
-ZEN_URI="http://downloads.zen-kernel.org/$(get_version_component_range \
-1-3)/${ZEN_FILE}"
-
-UNIPATCH_LIST="${DISTDIR}/${ZEN_FILE} ${DISTDIR}/${TUXONICE_SRC}.bz2"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI} ${ZEN_URI}"
-
-KEYWORDS=""
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-
-S="${WORKDIR}"/"linux-${PV/_p*/}-c1pher"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/c1pher-sources/c1pher-sources-2.6.37.ebuild b/sys-kernel/c1pher-sources/c1pher-sources-2.6.37.ebuild
deleted file mode 100644
index 9a64237..0000000
--- a/sys-kernel/c1pher-sources/c1pher-sources-2.6.37.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.37.ebuild,v 1.1 2011/01/24 16:21:12 scarabeus Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base"
-K_GENPATCHES_VER="1"
-K_SECURITY_UNSUPPORTED="1"
-UNIPATCH_STRICTORDER="1"
-CKV="${PV/_p[0-9]*}"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-DESCRIPTION="TuxOnIce + Zen Patches + Gentoo patchset sources"
-HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net \
-http://zen-kernel.org"
-IUSE=""
-
-TUXONICE_SNAPSHOT=""
-TUXONICE_VERSION="3.2-rc2"
-TUXONICE_TARGET="2.6.36"
-
-if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
-	TUXONICE_SRC="current-tuxonice-for-${TUXONICE_TARGET}.patch_${TUXONICE_SNAPSHOT}"
-else
-	TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
-fi
-
-TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
-
-ZEN_FILE="v${PV}-zen_master.diff.gz"
-ZEN_URI="http://downloads.zen-kernel.org/snapshots/zen-stable/diffs/${ZEN_FILE}"
-
-UNIPATCH_LIST="${DISTDIR}/${ZEN_FILE} ${DISTDIR}/${TUXONICE_SRC}.bz2"
-#UNIPATCH_LIST="${DISTDIR}/${ZEN_FILE}"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI} ${ZEN_URI}"
-
-KEYWORDS=""
-
-RDEPEND="${RDEPEND}
-	>=sys-apps/tuxonice-userui-1.0
-	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
-
-K_EXTRAELOG="If there are issues with this kernel, please direct any
-queries to the tuxonice-users mailing list:
-http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
-
-S="${WORKDIR}"/"linux-${PV/_p*/}-c1pher"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-	einfo "For more info on this patchset, and how to report problems, see:"
-	einfo "${HOMEPAGE}"
-}
diff --git a/sys-kernel/c1pher-sources/c1pher-sources-2.6.38.ebuild b/sys-kernel/c1pher-sources/c1pher-sources-2.6.38.ebuild
new file mode 100644
index 0000000..bb3ff8a
--- /dev/null
+++ b/sys-kernel/c1pher-sources/c1pher-sources-2.6.38.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-2.6.38.ebuild,v 1.1 2011/05/07 22:48:56 nelchael Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras"
+K_GENPATCHES_VER="5"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources + Hardened patchset"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://www.tuxonice.net \
+http://gentoo.org/proj/en/hardened/"
+IUSE=""
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-4"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+
+TUXONICE_SNAPSHOT=""
+TUXONICE_VERSION="3.2"
+TUXONICE_TARGET="2.6.38"
+
+if [[ -n "${TUXONICE_SNAPSHOT}" ]]; then
+	TUXONICE_SRC="current-tuxonice-for-${TUXONICE_TARGET}.patch_${TUXONICE_SNAPSHOT}"
+else
+	TUXONICE_SRC="tuxonice-${TUXONICE_VERSION}-for-${TUXONICE_TARGET}.patch"
+fi
+
+TUXONICE_URI="http://www.tuxonice.net/files/${TUXONICE_SRC}.bz2"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2 ${DISTDIR}/${TUXONICE_SRC}.bz2"
+UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI} ${HGPV_URI}"
+
+KEYWORDS=""
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="This is a custom kernel. Do not use."
+K_SECURITY_UNSUPPORTED="1"