diff options
author | Ned Ludd <solar@gentoo.org> | 2004-08-08 19:38:44 +0000 |
---|---|---|
committer | Ned Ludd <solar@gentoo.org> | 2004-08-08 19:38:44 +0000 |
commit | 8413a0cd9dd8fa5083f7bbae9de5c25939c3e19c (patch) | |
tree | 5047653938ef8c8b29c8b25e4b51a8bed1eb7500 /sys-kernel/grsec-sources | |
parent | fixing deps (Manifest recommit) (diff) | |
download | gentoo-2-8413a0cd9dd8fa5083f7bbae9de5c25939c3e19c.tar.gz gentoo-2-8413a0cd9dd8fa5083f7bbae9de5c25939c3e19c.tar.bz2 gentoo-2-8413a0cd9dd8fa5083f7bbae9de5c25939c3e19c.zip |
version bump. Removed all older versions <2.4.26.2.0-r7
Diffstat (limited to 'sys-kernel/grsec-sources')
-rw-r--r-- | sys-kernel/grsec-sources/ChangeLog | 10 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/Manifest | 11 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/2.4.26-i2cproc_bus_read.patch | 12 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r3 | 2 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r4 | 2 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r5 | 2 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r6 | 2 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.27.2.0.1 | 2 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r4.ebuild | 85 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r5.ebuild | 88 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r6.ebuild | 96 | ||||
-rw-r--r-- | sys-kernel/grsec-sources/grsec-sources-2.4.27.2.0.1.ebuild (renamed from sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r3.ebuild) | 49 |
12 files changed, 32 insertions, 329 deletions
diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog index ed42ba41949d..5d8ef3bd77f1 100644 --- a/sys-kernel/grsec-sources/ChangeLog +++ b/sys-kernel/grsec-sources/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-kernel/grsec-sources # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.29 2004/08/04 18:41:10 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.30 2004/08/08 19:38:44 solar Exp $ + +*grsec-sources-2.4.27.2.0.1 (08 Aug 2004) + + 08 Aug 2004; <solar@gentoo.org> grsec-sources-2.4.26.2.0-r3.ebuild, + grsec-sources-2.4.26.2.0-r4.ebuild, grsec-sources-2.4.26.2.0-r5.ebuild, + grsec-sources-2.4.26.2.0-r6.ebuild, grsec-sources-2.4.27.2.0.1.ebuild, + files/2.4.26-i2cproc_bus_read.patch: + version bump. Removed all older versions *grsec-sources-2.4.26.2.0-r7 (04 Aug 2004) diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest index 40f96f4b8264..efbaa66b7efe 100644 --- a/sys-kernel/grsec-sources/Manifest +++ b/sys-kernel/grsec-sources/Manifest @@ -1,20 +1,13 @@ MD5 49c9741593c223ee98f6ce3b3d6b6ef2 grsec-sources-2.4.26.2.0-r7.ebuild 3568 -MD5 b969d312ac4266769ab295c44748ffc4 grsec-sources-2.4.26.2.0-r4.ebuild 3065 -MD5 22d142953a39883a2c9c839978510f9d grsec-sources-2.4.26.2.0-r6.ebuild 3331 -MD5 ea8807d44eed01d93f651bd7254e3a83 grsec-sources-2.4.26.2.0-r3.ebuild 2817 +MD5 29a13ebb2c03f2181b8c68859fe4836c grsec-sources-2.4.27.2.0.1.ebuild 2300 MD5 e3749af61aed899c571a82bdb2887b46 ChangeLog 6190 MD5 140d8af1d66f9f6cd030e7d9902f38d9 metadata.xml 478 -MD5 d1056a17aa337464259468e329785e46 grsec-sources-2.4.26.2.0-r5.ebuild 3181 MD5 c47b7075dd1e065b09bb08936c1901a1 files/2.4.26-signal-race.patch 365 -MD5 9d8a823d0e0ada1ec1e84305d1698afa files/2.4.26-i2cproc_bus_read.patch 512 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707 MD5 3dac23b6e285462a7cda41505cc698e1 files/2.4.26-CAN-2004-0394.patch 319 +MD5 f48595ebd029212cbe8db846556b93cb files/digest-grsec-sources-2.4.27.2.0.1 141 MD5 36615aa14e3aed91008beeeb406693bf files/2.4.26-pax-binfmt_elf-page-size.patch 427 MD5 b293289df61d6f42ff54e4e0ceae53cf files/2.4.24-x86.config 2397 MD5 0f66013f643c79c97fda489618a4e2fd files/gentoo-sources-2.4.CAN-2004-0535.patch 476 MD5 dc18e982f8149588a291956481885a8c files/gentoo-sources-2.4.CAN-2004-0495.patch 17549 -MD5 67eb43cb5340a7a671c2d375c0516888 files/digest-grsec-sources-2.4.26.2.0-r3 143 -MD5 67eb43cb5340a7a671c2d375c0516888 files/digest-grsec-sources-2.4.26.2.0-r4 143 -MD5 67eb43cb5340a7a671c2d375c0516888 files/digest-grsec-sources-2.4.26.2.0-r5 143 -MD5 67eb43cb5340a7a671c2d375c0516888 files/digest-grsec-sources-2.4.26.2.0-r6 143 MD5 2dc3a7f7f036e87ce4af63af31989311 files/digest-grsec-sources-2.4.26.2.0-r7 219 diff --git a/sys-kernel/grsec-sources/files/2.4.26-i2cproc_bus_read.patch b/sys-kernel/grsec-sources/files/2.4.26-i2cproc_bus_read.patch deleted file mode 100644 index 2f7de0dbe5b3..000000000000 --- a/sys-kernel/grsec-sources/files/2.4.26-i2cproc_bus_read.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrup linux-2.4.26-grsec-2.0/drivers/i2c/i2c-core.c linux/drivers/i2c/i2c-core.c ---- linux-2.4.26-grsec-2.0/drivers/i2c/i2c-core.c 2004-02-18 08:36:31.000000000 -0500 -+++ linux/drivers/i2c/i2c-core.c 2004-06-17 10:27:36.000000000 -0400 -@@ -625,7 +625,7 @@ ssize_t i2cproc_bus_read(struct file * f - size_t len_total; - int order[I2C_CLIENT_MAX]; - -- if (count > 4000) -+ if ((count > 4000) || (count < 0)) - return -EINVAL; - len_total = file->f_pos + count; - /* Too bad if this gets longer (unlikely) */ diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r3 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r3 deleted file mode 100644 index 6952b0eafedc..000000000000 --- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r3 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a6adfd65720201d600bf05e884cd78a grsecurity-2.0-2.4.26.patch.bz2 104358 -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r4 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r4 deleted file mode 100644 index 6952b0eafedc..000000000000 --- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r4 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a6adfd65720201d600bf05e884cd78a grsecurity-2.0-2.4.26.patch.bz2 104358 -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r5 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r5 deleted file mode 100644 index 6952b0eafedc..000000000000 --- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r5 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a6adfd65720201d600bf05e884cd78a grsecurity-2.0-2.4.26.patch.bz2 104358 -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r6 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r6 deleted file mode 100644 index 6952b0eafedc..000000000000 --- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r6 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 9a6adfd65720201d600bf05e884cd78a grsecurity-2.0-2.4.26.patch.bz2 104358 -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.27.2.0.1 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.27.2.0.1 new file mode 100644 index 000000000000..2a2cfcf855ce --- /dev/null +++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.27.2.0.1 @@ -0,0 +1,2 @@ +MD5 3431156a47f26a1306f69de009941c63 grsecurity-2.0.1-2.4.27.patch 638046 +MD5 59a2e6fde1d110e2ffa20351ac8b4d9e linux-2.4.27.tar.bz2 30898453 diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r4.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r4.ebuild deleted file mode 100644 index c0b16118ad86..000000000000 --- a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r4.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r4.ebuild,v 1.3 2004/06/24 22:57:03 agriffis 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 kernel - -[ "$OKV" == "" ] && OKV="2.4.26" - -PATCH_BASE="${PV/${OKV}./}" -PATCH_BASE="${PATCH_BASE/_/-}" -EXTRAVERSION="-grsec-${PATCH_BASE}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch.bz2" - -# hppa takes a special patch and usually has play catch up between -# versions of this package. -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" - -SRC_URI="mirror://gentoo/grsecurity-${PATCH_BASE}-${OKV}.patch.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" - -HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net" - -KEYWORDS="x86 sparc ppc alpha amd64 -hppa" - -SLOT="${KV}" -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 we provide 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 ;; - *) bzcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - esac - [ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}" - eend 0 - - # fix format string problem in panic() - epatch ${FILESDIR}/2.4.26-CAN-2004-0394.patch - # Fix local DoS bug #53804 - epatch ${FILESDIR}/2.4.26-signal-race.patch - - # i2c integer overflow vulnerability during the allocation of memory - # epatch ${FILESDIR}/2.4.26-i2cproc_bus_read.patch - - # patch to force randomization to always at least PAGE_SIZE big. - epatch ${FILESDIR}/2.4.26-pax-binfmt_elf-page-size.patch - - mkdir docs - touch docs/patches.txt - kernel_universal_unpack - -} diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r5.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r5.ebuild deleted file mode 100644 index 4475826c0de2..000000000000 --- a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r5.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r5.ebuild,v 1.1 2004/06/26 04:45:18 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 kernel - -[ "$OKV" == "" ] && OKV="2.4.26" - -PATCH_BASE="${PV/${OKV}./}" -PATCH_BASE="${PATCH_BASE/_/-}" -EXTRAVERSION="-grsec-${PATCH_BASE}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch.bz2" - -# hppa takes a special patch and usually has play catch up between -# versions of this package. -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" - -SRC_URI="mirror://gentoo/grsecurity-${PATCH_BASE}-${OKV}.patch.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" - -HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net" - -KEYWORDS="x86 sparc ppc alpha amd64 -hppa" - -SLOT="${KV}" -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 we provide 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 ;; - *) bzcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - esac - [ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}" - eend 0 - - # fix format string problem in panic() - epatch ${FILESDIR}/2.4.26-CAN-2004-0394.patch - # Fix local DoS bug #53804 - epatch ${FILESDIR}/2.4.26-signal-race.patch - - # i2c integer overflow vulnerability during the allocation of memory - # epatch ${FILESDIR}/2.4.26-i2cproc_bus_read.patch - - # patch to force randomization to always at least PAGE_SIZE big. - epatch ${FILESDIR}/2.4.26-pax-binfmt_elf-page-size.patch - - epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0495.patch - epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0535.patch - - mkdir docs - touch docs/patches.txt - kernel_universal_unpack - -} diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r6.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r6.ebuild deleted file mode 100644 index 1c60d581838c..000000000000 --- a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r6.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r6.ebuild,v 1.2 2004/07/11 13:15:04 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 kernel - -[ "$OKV" == "" ] && OKV="2.4.26" - -PATCH_BASE="${PV/${OKV}./}" -PATCH_BASE="${PATCH_BASE/_/-}" -EXTRAVERSION="-grsec-${PATCH_BASE}" -KV="${OKV}${EXTRAVERSION}" - -PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch.bz2" - -# hppa takes a special patch and usually has play catch up between -# versions of this package. -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" - -SRC_URI="mirror://gentoo/grsecurity-${PATCH_BASE}-${OKV}.patch.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" - -HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net" - -KEYWORDS="x86 sparc ppc alpha amd64 -hppa" - -SLOT="${KV}" -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" - - patch_grsec_kernel - - mkdir docs - touch docs/patches.txt - kernel_universal_unpack - -} - -patch_grsec_kernel() { - # users are often confused by what settings should be set. - # so we provide 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 - - - [ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File ${PATCH_SRC_BASE} does not exist?" - ebegin "Patching the kernel with ${PATCH_SRC_BASE}" - case "${ARCH}" in - hppa) zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - *) bzcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - esac - [ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}" - eend 0 - - # fix format string problem in panic() - epatch ${FILESDIR}/2.4.26-CAN-2004-0394.patch - # Fix local DoS bug #53804 - epatch ${FILESDIR}/2.4.26-signal-race.patch - - # i2c integer overflow vulnerability during the allocation of memory - #epatch ${FILESDIR}/2.4.26-i2cproc_bus_read.patch - - # patch to force randomization to always at least PAGE_SIZE big. - epatch ${FILESDIR}/2.4.26-pax-binfmt_elf-page-size.patch - - epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0495.patch - epatch ${FILESDIR}/gentoo-sources-2.4.CAN-2004-0535.patch - - # Bug 56479 - fchown-attr - epatch ${FILESDIR}/openmosix-sources.CAN-2004-0497.patch -} - diff --git a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r3.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.27.2.0.1.ebuild index ed271ed7b99d..3ca40def2b6a 100644 --- a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r3.ebuild +++ b/sys-kernel/grsec-sources/grsec-sources-2.4.27.2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r3.ebuild,v 1.4 2004/06/24 22:57:02 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.27.2.0.1.ebuild,v 1.1 2004/08/08 19:38:44 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 @@ -16,33 +16,21 @@ IUSE="" inherit eutils kernel -[ "$OKV" == "" ] && OKV="2.4.26" +[ "$OKV" == "" ] && OKV="2.4.27" PATCH_BASE="${PV/${OKV}./}" PATCH_BASE="${PATCH_BASE/_/-}" EXTRAVERSION="-grsec-${PATCH_BASE}" KV="${OKV}${EXTRAVERSION}" -PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch.bz2" - -# hppa takes a special patch and usually has play catch up between -# versions of this package. -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 - +PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch" DESCRIPTION="Vanilla sources of the linux kernel with the grsecurity ${PATCH_BASE} patch" - -SRC_URI="mirror://gentoo/grsecurity-${PATCH_BASE}-${OKV}.patch.bz2 \ - http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2" +CAN_PATCHES="" +SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \ + http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2 ${CAN_PATCHES}" +#mirror://gentoo/grsecurity-${PATCH_BASE}-${OKV}.patch.bz2 HOMEPAGE="http://www.kernel.org/ http://www.grsecurity.net" - KEYWORDS="x86 sparc ppc alpha amd64 -hppa" SLOT="${KV}" @@ -53,27 +41,28 @@ src_unpack() { 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?" + patch_grsec_kernel + mkdir -p docs + touch docs/patches.txt + kernel_universal_unpack +} + +patch_grsec_kernel() { # users are often confused by what settings should be set. # so we provide 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 + + [ -f "${DISTDIR}/${PATCH_SRC_BASE}" ] || die "File ${PATCH_SRC_BASE} does not exist?" ebegin "Patching the kernel with ${PATCH_SRC_BASE}" - case "${ARCH}" in - hppa) zcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - *) bzcat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;; - esac + cat ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet [ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}" eend 0 # fix format string problem in panic() epatch ${FILESDIR}/2.4.26-CAN-2004-0394.patch - # Fix local DoS bug #53804 - epatch ${FILESDIR}/2.4.26-signal-race.patch - - mkdir docs - touch docs/patches.txt - kernel_universal_unpack + return 0 } + |