upstream fixed an idt_table bug in PaX that effected i386/i586 users without rolling a new patch, so we gentoo fetched new version and bz2 it to avoid md5sum conflicts.. removed old ebuild as well

5 files changed, 24 insertions, 16 deletions

diff --git a/sys-kernel/grsec-sources/ChangeLog b/sys-kernel/grsec-sources/ChangeLog
index 6d32707b48e1..2a2d7e3dd405 100644
--- a/sys-kernel/grsec-sources/ChangeLog
+++ b/sys-kernel/grsec-sources/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2004/04/18 07:56:37 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/ChangeLog,v 1.19 2004/04/19 02:13:08 solar Exp $
+
+  18 Apr 2004; <solar@gentoo.org> grsec-sources-2.4.26.2.0.ebuild:
+  upstream fixed an idt_table bug in PaX that effected i386/i586 users without
+  rolling a new patch, so we gentoo fetched new version and bz2 it to avoid
+  md5sum conflicts.. removed old ebuild as well
 
 *grsec-sources-2.4.26.2.0 (18 Apr 2004)
 
diff --git a/sys-kernel/grsec-sources/Manifest b/sys-kernel/grsec-sources/Manifest
index 0e046f005de9..d2098df043b7 100644
--- a/sys-kernel/grsec-sources/Manifest
+++ b/sys-kernel/grsec-sources/Manifest
@@ -1,5 +1,5 @@
-MD5 3d272d2fd0025d39fcf6eec76968c1c7 ChangeLog 3956
+MD5 a457f2a4fd652a9c5e87c508d673e579 ChangeLog 4227
+MD5 f094d1d934b42b44ca8a8a3649d223de grsec-sources-2.4.26.2.0-r1.ebuild 3238
 MD5 140d8af1d66f9f6cd030e7d9902f38d9 metadata.xml 478
-MD5 d342cc8ea4985b1a081a5392155fc1d8 grsec-sources-2.4.26.2.0.ebuild 2997
 MD5 b293289df61d6f42ff54e4e0ceae53cf files/2.4.24-x86.config 2397
-MD5 c8e36f5dbfbf5b4c8adc12dd5aaaa810 files/digest-grsec-sources-2.4.26.2.0 213
+MD5 67eb43cb5340a7a671c2d375c0516888 files/digest-grsec-sources-2.4.26.2.0-r1 143
diff --git a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0
deleted file mode 100644
index e002df4c833f..000000000000
--- a/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ee2f2a447a6bbef50b6be1dab656a263 grsecurity-2.0-2.4.26.patch 609900
-MD5 fb6785a246082c638d966e11e7cdd508 grsecurity-2.0-2.4.26.patch.sign 189
-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-r1 b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r1
new file mode 100644
index 000000000000..6952b0eafedc
--- /dev/null
+++ b/sys-kernel/grsec-sources/files/digest-grsec-sources-2.4.26.2.0-r1
@@ -0,0 +1,2 @@
+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/grsec-sources-2.4.26.2.0.ebuild b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r1.ebuild
index 77144d38b7f2..0fb8010a99be 100644
--- a/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0.ebuild
+++ b/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.26.2.0.ebuild,v 1.1 2004/04/18 07:56:37 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/grsec-sources/grsec-sources-2.4.26.2.0-r1.ebuild,v 1.1 2004/04/19 02:13:08 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
@@ -24,7 +24,7 @@ PATCH_BASE="${PATCH_BASE/_/-}"
 EXTRAVERSION="-grsec-${PATCH_BASE}"
 KV="${OKV}${EXTRAVERSION}"
 
-PATCH_SRC_BASE="grsecurity-${PATCH_BASE}-${OKV}.patch"
+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 we.
@@ -40,13 +40,17 @@ 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"
+#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"
+
+# grr... gotta love it when upstream changes a patch without rolling a revision number.
+#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"
 
-SRC_URI="http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch \
-	http://grsecurity.net/grsecurity-${PATCH_BASE}-${OKV}.patch.sign  \
+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"
@@ -70,7 +74,7 @@ src_unpack() {
 	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 ;;
+		*)	bzcat  ${DISTDIR}/${PATCH_SRC_BASE} | patch -g0 -p1 --quiet ;;
 	esac
 	[ $? == 0 ] || die "failed patching with ${PATCH_SRC_BASE}"
 	eend 0