dual headed version bumps to the 2.4.25 series

6 files changed, 188 insertions, 2 deletions

diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog
index b1b42bca904d..91659355ffe4 100644
--- a/sys-kernel/grsec-sources/ChangeLog
+++ b/sys-kernel/grsec-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/grsec-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.15 2004/02/19 22:43:51 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.16 2004/02/22 02:29:16 solar Exp $
+
+*grsec-sources-2.4.25.1.9.14 (21 Feb 2004)
+
+  21 Feb 2004; <solar@gentoo.org> grsec-sources-2.4.25.1.9.14.ebuild,
+  grsec-sources-2.4.25.2.0_rc5.ebuild:
+  dual headed version bumps to the 2.4.25 series
 
 *grsec-sources-2.4.24.1.9.13-r1 (19 Feb 2004)
 
diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest
index f77e01e1ce61..5fb035d129f8 100644
--- a/sys-kernel/grsec-sources/Manifest
+++ b/sys-kernel/grsec-sources/Manifest
@@ -1,7 +1,11 @@
+MD5 a575e84c898bd86a82a8e18c7016086c grsec-sources-2.4.25.2.0_rc5.ebuild 3174
+MD5 d3f9adabe58a3e2cc3ff6372c8ab2f7a grsec-sources-2.4.25.1.9.14.ebuild 3173
 MD5 225cb9e370f4e7d3bc1a98549377249e metadata.xml 484
-MD5 9bffec68e631092847d1038d980a79e5 ChangeLog 2978
+MD5 7ee9861094ccca290087682ed49dda34 ChangeLog 3177
 MD5 e835347034433ded93e325ff2304aff4 grsec-sources-2.4.24.1.9.13.ebuild 2952
 MD5 89adfa02b4202b938bfe85045eb80037 grsec-sources-2.4.24.1.9.13-r1.ebuild 2947
+MD5 3e6432ed3de7596318d58a3084f1bda8 files/digest-grsec-sources-2.4.25.2.0_rc5 221
+MD5 d8052b545fc3865a07f5d8df6b513a58 files/digest-grsec-sources-2.4.25.1.9.14 219
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/grsec-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/grsec-sources-2.4.23.rtc_fix.patch 7073
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14
new file mode 100644
index 000000000000..fbc2248dc1e6
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.1.9.14
@@ -0,0 +1,3 @@
+MD5 1b1448d09bb9baa3d386de4d664b3e85 grsecurity-1.9.14-2.4.25.patch 540235
+MD5 016bc2f0f69feb37a933f857ba99d599 grsecurity-1.9.14-2.4.25.patch.sign 238
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5
new file mode 100644
index 000000000000..7190f647f121
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.25.2.0_rc5
@@ -0,0 +1,3 @@
+MD5 397fe31144a2c38ec64a87712086fd82 grsecurity-2.0-rc5-2.4.25.patch 588130
+MD5 5a50a53753482cfa0734e80f769d2ec8 grsecurity-2.0-rc5-2.4.25.patch.sign 189
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild
new file mode 100644
index 000000000000..7511c6c64466
--- /dev/null
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.25.1.9.14.ebuild,v 1.1 2004/02/22 02:29:16 solar Exp $
+
+# We control what versions of what we download based on the KEYWORDS we
+# are using for the various arches. Thus if we want grsec1 stable we run
+# the with "arch" ACCEPT_KEYWORDS or ~arch and we will get the
+# grsec-2.0-preX which has alot more features.
+
+# the only thing that should ever differ in one of these 1.9.x ebuilds
+# and 2.x of the same kernel version is the KEYWORDS and header. 
+# shame cvs symlinks don't exist
+
+ETYPE="sources"
+IUSE=""
+
+inherit eutils
+inherit kernel
+
+[ "$OKV" == "" ] && OKV="2.4.25"
+
+PATCH_BASE="${PV/${OKV}./}"
+PATCH_BASE="${PATCH_BASE/_/-}"
+EXTRAVERSION="-grsec-${PATCH_BASE}"
+KV="${OKV}${EXTRAVERSION}"
+
+PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
+
+# hppa takes a special patch and usually has play catch up between
+# versions of this package we.
+
+HPPA_SRC_URI=""
+if [ "${ARCH}" == "hppa" ]; then
+	PARISC_KERNEL_VERSION="pa1"
+	KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}"
+	HPPA_PATCH_SRC_BASE="parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz"
+	HPPA_SRC_URI="mirror://gentoo/${HPPA_PATCH_SRC_BASE} http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/${HPPA_PATCH_SRC_BASE}"
+	PATCH_SRC_BASE="${HPPA_PATCH_SRC_BASE}"
+fi
+
+DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
+
+DYSFUNCTIONAL_SRC_URI="hppa? ( $HPPA_SRC_URI ) \
+	!hppa? ( http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
+		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign ) \
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
+	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign  \
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
+
+[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
+
+SLOT="${OKV}"
+S="${WORKDIR}/linux-${KV}"
+
+src_unpack() {
+	unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
+	mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
+	cd linux-"${KV}" || die "unable to cd into the kernel source tree"
+
+	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
+
+	# users are often confused by what settings should be set so
+	# here lets them an example of what a P4 desktop would look like.
+	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
+
+	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
+	case "${ARCH}" in
+		hppa)	zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
+		*)	cat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
+	esac
+	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
+	eend 0
+
+	mkdir docs
+	touch docs/patches.txt
+	kernel_universal_unpack
+
+	# fixed in .24
+	#epatch ${FILESDIR}/${PN}-${OKV}.CAN-2003-0985.patch
+	#epatch ${FILESDIR}/${PN}-${OKV}.rtc_fix.patch
+}
diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild
new file mode 100644
index 000000000000..d85cbc9c44aa
--- /dev/null
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.25.2.0_rc5.ebuild,v 1.1 2004/02/22 02:29:16 solar Exp $
+
+# We control what versions of what we download based on the KEYWORDS we
+# are using for the various arches. Thus if we want grsec1 stable we run
+# the with "arch" ACCEPT_KEYWORDS or ~arch and we will get the
+# grsec-2.0-preX which has alot more features.
+
+# the only thing that should ever differ in one of these 1.9.x ebuilds
+# and 2.x of the same kernel version is the KEYWORDS and header. 
+# shame cvs symlinks don't exist
+
+ETYPE="sources"
+IUSE=""
+
+inherit eutils
+inherit kernel
+
+[ "$OKV" == "" ] && OKV="2.4.25"
+
+PATCH_BASE="${PV/${OKV}./}"
+PATCH_BASE="${PATCH_BASE/_/-}"
+EXTRAVERSION="-grsec-${PATCH_BASE}"
+KV="${OKV}${EXTRAVERSION}"
+
+PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
+
+# hppa takes a special patch and usually has play catch up between
+# versions of this package we.
+
+HPPA_SRC_URI=""
+if [ "${ARCH}" == "hppa" ]; then
+	PARISC_KERNEL_VERSION="pa1"
+	KV="${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}"
+	HPPA_PATCH_SRC_BASE="parisc-linux-${OKV}-${PARISC_KERNEL_VERSION}${EXTRAVERSION}.gz"
+	HPPA_SRC_URI="mirror://gentoo/${HPPA_PATCH_SRC_BASE} http://dev.gentoo.org/~pappy/gentoo-x86/sys-kernel/grsec-sources/${HPPA_PATCH_SRC_BASE}"
+	PATCH_SRC_BASE="${HPPA_PATCH_SRC_BASE}"
+fi
+
+DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch"
+
+DYSFUNCTIONAL_SRC_URI="hppa? ( $HPPA_SRC_URI ) \
+	!hppa? ( http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
+		http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign ) \
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
+	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign  \
+	http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
+
+HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net"
+
+[ ${PATCH_BASE/.*/} == 1 ] && KEYWORDS="x86 -hppa" || KEYWORDS="~x86 ~sparc ~ppc ~alpha -hppa"
+
+SLOT="${OKV}"
+S="${WORKDIR}/linux-${KV}"
+
+src_unpack() {
+	unpack linux-"${OKV}".tar.bz2 || die "unable to unpack the kernel"
+	mv linux-"${OKV}" linux-"${KV}" || die "unable to move the kernel"
+	cd linux-"${KV}" || die "unable to cd into the kernel source tree"
+
+	[ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File does not exist?"
+
+	# users are often confused by what settings should be set so
+	# here lets them an example of what a P4 desktop would look like.
+	cp ${FILESDIR}/2.4.24-x86.config gentoo-grsec-custom-example-2.4.24-x86.config
+
+	ebegin "Patching the kernel with ${PATCH_SRC_BASE}"
+	case "${ARCH}" in
+		hppa)	zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
+		*)	cat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
+	esac
+	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
+	eend 0
+
+	mkdir docs
+	touch docs/patches.txt
+	kernel_universal_unpack
+
+	# fixed in .24
+	#epatch ${FILESDIR}/${PN}-${OKV}.CAN-2003-0985.patch
+	#epatch ${FILESDIR}/${PN}-${OKV}.rtc_fix.patch
+}