Removed redundant unpatched versions.

8 files changed, 3 insertions, 310 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index 83e61580c403..c953ea13c9df 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for sys-kernel/alpha-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.17 2004/01/06 16:16:49 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.18 2004/01/06 23:02:34 plasmaroo Exp $
 
   06 Jan 2004; <plasmaroo@gentoo.org> alpha-sources-2.4.19-r1.ebuild,
   alpha-sources-2.4.19-r2.ebuild, alpha-sources-2.4.20-r1.ebuild,
@@ -8,7 +8,7 @@
   alpha-sources-2.4.21-r2.ebuild, files/alpha-sources.CAN-2003-0985.patch,
   files/alpha-sources.rtc_fix.patch:
   Added patches to address the security vulnerabilities in bugs #37292 and
-  #37317.
+  #37317. Unpatched revisions were removed.
 
   09 Dec 2003; <spider@gentoo.org> alpha-sources-2.4.19-r1.ebuild,
   alpha-sources-2.4.19-r2.ebuild, alpha-sources-2.4.20-r1.ebuild,
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index d47eef6e4317..bc4e5a7f988a 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,17 +1,11 @@
-MD5 4bc52d11ac9672ea44794e34ee5912da ChangeLog 2695
-MD5 ea7d2294cccc9460836d336879f804c1 alpha-sources-2.4.20-r1.ebuild 3374
-MD5 b6b6e07781d740a97871ba5dfcc219b9 alpha-sources-2.4.19-r1.ebuild 3388
+MD5 0c9274bad5f4146c0a99108d611e25f3 ChangeLog 2729
 MD5 8982b442d584bf387714d8aa3673edc1 alpha-sources-2.4.21-r2.ebuild 2039
-MD5 58faf9e0e7e449ae715a86c3c4b1e675 alpha-sources-2.4.21-r1.ebuild 2040
 MD5 04b9cc43c6e54c93b099095e67c7c06a alpha-sources-2.4.19-r2.ebuild 3413
 MD5 303dc442671ad54b72cba9a280210609 alpha-sources-2.4.20-r2.ebuild 3253
-MD5 16670f1bb65727ad1fe9fe73fc73e5be files/digest-alpha-sources-2.4.19-r1 149
-MD5 5b44fd1e2632e313a3774ce690891a94 files/digest-alpha-sources-2.4.21-r1 144
 MD5 ef1326d11a9e944b46ded8ed8cd13556 files/digest-alpha-sources-2.4.19-r2 150
 MD5 d9fdbd53c213583e18020e159a338371 files/digest-alpha-sources-2.4.21-r2 144
 MD5 df40eece807d039cba79f477e80ebda2 files/alpha-sources-2.4.19.rtc_fix.patch 4974
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/alpha-sources.rtc_fix.patch 6769
 MD5 b8ec46a23797770246c82ec38b1168b0 files/digest-alpha-sources-2.4.20-r2 149
-MD5 460dfb4e575d23adc1229940ebcac3b8 files/digest-alpha-sources-2.4.20-r1 150
 MD5 d641cd49ae63ca2989672d2209691bb5 files/alpha-sources.CAN-2003-0985.patch 414
 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.19-r1.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.19-r1.ebuild
deleted file mode 100644
index a222df46edad..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.19-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.19-r1.ebuild,v 1.14 2004/01/06 16:31:48 plasmaroo Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.19
-KV=${PVR}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#
-# super page patch by Naohiki Shimizu. increases load performance
-# cia fix of qlogic isp scsi on alcor boards
-
-
-DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://www.tuxnetwork.de/gentoo/linux-gentoo-alpha-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-GENTOOPATCH=${DISTDIR}/linux-gentoo-alpha-${KV}.patch.bz2
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	pwd
-	bzcat ${GENTOOPATCH} | patch -p1 || die # Patch the kernel
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch the do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		cd ${S}
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-		make dep
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-alpha/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.20-r1.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.20-r1.ebuild
deleted file mode 100644
index 313f869d81f1..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.20-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.20-r1.ebuild,v 1.11 2004/01/06 16:16:49 plasmaroo Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-#we use this next variable to avoid duplicating stuff on cvs
-GFILESDIR=${PORTDIR}/sys-kernel/linux-sources/files
-OKV=2.4.20
-KV=${PVR}
-S=${WORKDIR}/linux-${KV}
-ETYPE="sources"
-
-# What's in this kernel?
-
-# INCLUDED:
-#
-# cia fix of qlogic isp scsi on alcor boards
-# module unloading fixed
-# xfs filesystem patches
-
-
-DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 http://www.tuxnetwork.de/gentoo/linux-gentoo-alpha-${KV}.patch.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="~alpha"
-
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	#console-tools is needed to solve the loadkeys fiasco; binutils version needed to avoid Athlon/PIII/SSE assembler bugs.
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
-fi
-
-GENTOOPATCH=${DISTDIR}/linux-gentoo-alpha-${KV}.patch.bz2
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd ${S}
-	pwd
-	bzcat ${GENTOOPATCH} | patch -p1 || die # Patch the kernel
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch the do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	#sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	#this file is required for other things to build properly, so we autogenerate it
-	make include/linux/version.h || die
-
-	#fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-
-	# Gentoo Linux uses /boot, so fix 'make install' to work properly
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
-		Makefile.orig >Makefile || die # test, remove me if Makefile ok
-	rm Makefile.orig
-}
-
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
-src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		cd ${S}
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-		make dep
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-alpha/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild
deleted file mode 100644
index a74047393ba7..000000000000
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r1.ebuild,v 1.10 2004/01/06 16:16:49 plasmaroo Exp $
-
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE="build crypt usagi"
-ETYPE="sources"
-inherit kernel
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${KV}.tar.bz2"
-SLOT="${KV}"
-KEYWORDS="alpha -sparc -x86 -ppc -hppa -mips -arm"
-
-src_unpack() {
-	unpack ${A}
-	mv linux-${OKV} linux-${KV} || die
-	cd ${WORKDIR}/${KV}
-
-	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
-	if [ -z "`use crypt`" ]; then
-	    einfo "No Cryptographic support, dropping patches..."
-	    for file in 6* 8* ;do
-		einfo "Dropping ${file}..."
-		rm -f ${file}
-	    done
-	else
-	    einfo "Cryptographic patches will be applied"
-	fi
-
-	# This is the usagi USE flag, keeps USAGI, drops {superfreeswan/patch-int/loop-jari}
-	# Using USAGI will also cause you to drop all iptables ipv6 patches
-	if [ -z "`use usagi`" ]; then
-		einfo "Keeping {superfreeswan/patch-int/loop-jari} patches, dropping USAGI"
-		for file in 6* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	else
-		einfo "Keeping USAGI patch, dropping {superfreeswan/patch-int/loop-jari}"
-		for file in *.ipv6 8* ;do
-			einfo "Dropping ${file}..."
-			rm -f ${file}
-		done
-	fi
-
-	kernel_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch the do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-}
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r1 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r1
deleted file mode 100644
index 3879a6fd7a2c..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.19-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2bb60b7594a416f2c593923ce446160b linux-2.4.19.tar.bz2 26042494
-MD5 3ced47f1299a7fd729a7b28db1c9fdb0 linux-gentoo-alpha-2.4.19-r1.patch.bz2 14018
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r1 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r1
deleted file mode 100644
index 0c2285d3cf92..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.20-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
-MD5 4a826e8414c4992c9c23b5846b20af46 linux-gentoo-alpha-2.4.20-r1.patch.bz2 825295
diff --git a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r1 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r1
deleted file mode 100644
index 534a3262c0f5..000000000000
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
-MD5 28094d6a3d68f228bda98af459ad1310 patches-2.4.21-alpha-r1.tar.bz2 1696825