Apply fix from gentoo-sources for CVE-2012-0056 to 3.0.X series. Affected ebuilds from this series dropped

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 12 insertions, 70 deletions

diff --git a/sys-kernel/pf-sources/ChangeLog b/sys-kernel/pf-sources/ChangeLog
index 3ae3d9fefd1f..59d8672f2606 100644
--- a/sys-kernel/pf-sources/ChangeLog
+++ b/sys-kernel/pf-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/pf-sources
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.47 2012/01/23 21:02:04 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.48 2012/01/23 21:46:52 hwoarang Exp $
+
+*pf-sources-3.0.7-r1 (23 Jan 2012)
+
+  23 Jan 2012; Markos Chandras <hwoarang@gentoo.org>
+  +pf-sources-3.0.7-r1.ebuild, -pf-sources-3.0.6.ebuild,
+  -pf-sources-3.0.7.ebuild:
+   Apply fix from gentoo-sources for CVE-2012-0056 to 3.0.X series. Affected
+  ebuilds from this series dropped
 
 *pf-sources-3.1.6-r1 (23 Jan 2012)
 *pf-sources-3.2.1-r1 (23 Jan 2012)
diff --git a/sys-kernel/pf-sources/pf-sources-3.0.6.ebuild b/sys-kernel/pf-sources/pf-sources-3.0.7-r1.ebuild
index f09bf0b7fb45..5b20fcd59d2c 100644
--- a/sys-kernel/pf-sources/pf-sources-3.0.6.ebuild
+++ b/sys-kernel/pf-sources/pf-sources-3.0.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.6.ebuild,v 1.1 2011/10/18 18:34:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.0.7-r1.ebuild,v 1.1 2012/01/23 21:46:52 hwoarang Exp $
 
 EAPI="2"
 
@@ -51,11 +51,7 @@ pkg_setup(){
 
 src_prepare(){
 	epatch "${DISTDIR}"/"${PF_FILE}"
-	#if use experimental; then
-		#for patch in ${EXPERIMENTAL_PATCHES[@]}; do
-			#epatch "${DISTDIR}"/"${patch/*\/}"
-		#done
-	#fi
+	epatch "${FILESDIR}"/2100_proc-mem-handling-fix.patch
 }
 
 K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, see: \
diff --git a/sys-kernel/pf-sources/pf-sources-3.0.7.ebuild b/sys-kernel/pf-sources/pf-sources-3.0.7.ebuild
deleted file mode 100644
index 9b41d673cf3c..000000000000
--- a/sys-kernel/pf-sources/pf-sources-3.0.7.ebuild
+++ /dev/null
@@ -1,62 +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/pf-sources/pf-sources-3.0.7.ebuild,v 1.1 2011/10/20 18:23:52 hwoarang Exp $
-
-EAPI="2"
-
-inherit versionator
-
-COMPRESSTYPE=".bz2"
-K_USEPV="yes"
-UNIPATCH_STRICTORDER="yes"
-K_SECURITY_UNSUPPORTED="1"
-
-CKV="$(get_version_component_range 1-2)"
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-
-DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and LinuxIMQ"
-HOMEPAGE="http://pf.natalenko.name/"
-
-PF_FILE="patch-${PV}-pf${COMPRESSTYPE}"
-PF_URI="http://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
-EXPERIMENTAL_PATCHES=(
-	# http://ck-hack.blogspot.com/2010/11/create-task-groups-by-tty-comment.html
-	# http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch
-)
-EXPERIMENTAL_URI="
-	experimental? (
-		${EXPERIMENTAL_PATCHES[@]}
-	)
-"
-SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
-
-KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
-IUSE="" # experimental
-
-KV_FULL="${PVR}-pf"
-S="${WORKDIR}"/linux-"${KV_FULL}"
-
-pkg_setup(){
-	ewarn
-	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
-	ewarn "If you need support, please contact the pf developers directly."
-	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
-	ewarn "the ebuilds. Thank you."
-	ewarn
-	kernel-2_pkg_setup
-}
-
-src_prepare(){
-	epatch "${DISTDIR}"/"${PF_FILE}"
-	#if use experimental; then
-		#for patch in ${EXPERIMENTAL_PATCHES[@]}; do
-			#epatch "${DISTDIR}"/"${patch/*\/}"
-		#done
-	#fi
-}
-
-K_EXTRAEINFO="For more info on pf-sources and details on how to report problems, see: \
-${HOMEPAGE}."