remove older vulnerable versions

8 files changed, 12 insertions, 306 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index d628300ec8fc..93f42a86d206 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.64 2004/11/26 12:46:53 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.65 2004/11/27 12:24:05 axxo Exp $
+
+  27 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  -files/blackdown-jdk-1.4.2_rc1, -blackdown-jdk-1.4.2_rc1.ebuild:
+  remove older vulnerable versions
 
   26 Nov 2004; Travis Tilley <lv@gentoo.org> blackdown-jdk-1.4.2.01.ebuild:
   stable on amd64
@@ -15,7 +19,7 @@
   24 Nov 2004; Thomas Matthijs <axxo@gentoo.org> -files/blackdown-jdk-1.4.1,
   -files/blackdown-jdk-1.4.2, -blackdown-jdk-1.4.1.ebuild,
   -blackdown-jdk-1.4.2.ebuild, -blackdown-jdk-1.4.2_rc1-r1.ebuild:
-  remove older
+  remove older vulnerable versions
 
 *blackdown-jdk-1.4.2.01 (24 Nov 2004)
 
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
deleted file mode 100644
index 680bbfb55e99..000000000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1.ebuild,v 1.15 2004/10/01 04:40:56 axxo Exp $
-
-inherit java
-
-JREV=${PV#*_}
-JV=${PV%_*}
-
-S="${WORKDIR}/j2sdk${JV}"
-DESCRIPTION="Blackdown Java Development Kit ${PV}"
-J_URI="ftp://ftp.tux.org/pub/java/JDK-${JV}"
-SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
-	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
-#	sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${JV}-${JREV}-linux-sparc.bin )"
-
-HOMEPAGE="http://www.blackdown.org"
-
-SLOT="1.4.2"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* ~x86 amd64"
-IUSE="doc mozilla"
-
-DEPEND="virtual/libc
-	>=dev-java/java-config-0.2.6
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-PROVIDE="virtual/jdk-1.4.2
-	virtual/jre-1.4.2
-	virtual/java-scheme-2"
-
-
-# Extract the 'skip' value (offset of tarball) we should pass to tail
-get_offset() {
-	[ ! -f "$1" ] && return
-
-	local offset=$(gawk '
-		/^[[:space:]]*skip[[:space:]]*=/ {
-			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
-			SKIP = $0
-		}
-		END { print SKIP }' $1)
-
-	echo $offset
-}
-
-src_unpack() {
-	local offset=$(get_offset ${DISTDIR}/${A})
-
-	if [ -z "${offset}" ] ; then
-		die "Failed to get offset of tarball!"
-	fi
-
-	echo ">>> Unpacking ${A}..."
-	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxpf - || die
-}
-
-unpack_jars() {
-	# New to 1.4.2
-	local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/javaws/javaws.jar"
-	local JAVAHOME="${D}/opt/${P}"
-	local UNPACK_CMD=""
-	if [ -f "$JAVAHOME/lib/unpack" ]; then
-		UNPACK_CMD="$JAVAHOME/lib/unpack"
-		chmod +x "$UNPACK_CMD"
-		packerror=""
-		for i in $PACKED_JARS; do
-			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
-				einfo "Creating ${JAVAHOME}/${i}\n"
-				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i"
-				if [ ! -f "$JAVAHOME/$i" ]; then
-					ewarn "Failed to unpack jar files ${i}. Please refer\n"
-					ewarn "to the Troubleshooting section of the Installation\n"
-					ewarn "Instructions on the download page for more information.n"
-					packerror="1"
-				fi
-				rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack"
-			fi
-		done
-	fi
-	rm -f "$UNPACK_CMD"
-}
-
-src_install() {
-	typeset platform
-
-	dodir /opt/${P}
-
-	cp -a ${S}/{bin,jre,lib,man,include} ${D}/opt/${P}
-
-	dodir /opt/${P}/share/java
-	cp -a ${S}/{demo,src.zip} ${D}/opt/${P}/share
-
-	dodoc COPYRIGHT LICENSE README INSTALL
-	dohtml README.html
-
-	# Install mozilla plugin if mozilla use flag is set
-	if use mozilla; then
-		case ${ARCH} in
-			amd64) platform="amd64" ;;
-			x86) platform="i386" ;;
-			ppc) platform="ppc" ;;
-			sparc*) platform="sparc" ;;
-		esac
-
-		install_mozilla_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
-	fi
-
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/jre/lib/font.properties
-
-	# install env into /etc/env.d
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-
-	# Fix for bug 26629
-	if [ "${PROFILE_ARCH}" = "sparc64" ]
-	then
-		dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
-	fi
-
-	unpack_jars
-}
-
-pkg_postinst() {
-	# Set as default system VM if none exists
-	java_pkg_postinst
-
-	# if chpax is on the target system, set the appropriate PaX flags
-	# this will not hurt the binary, it modifies only unused ELF bits
-	# but may confuse things like AV scanners and automatic tripwire
-	if has_version "sys-apps/chpax"
-	then
-		echo
-		einfo "setting up conservative PaX flags for jar and javac"
-
-		for paxkills in "jar" "javac" "java"
-		do
-			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/bin/$paxkills
-		done
-
-		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
-		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${PN}-${PV}/jre/bin/java_vm
-
-		einfo "you should have seen lots of chpax output above now"
-		ewarn "make sure the grsec ACL contains those entries also"
-		ewarn "because enabling it will override the chpax setting"
-		ewarn "on the physical files - help for PaX and grsecurity"
-		ewarn "can be given by #gentoo-hardened + pappy@gentoo.org"
-	fi
-}
diff --git a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1
deleted file mode 100644
index d22ddf63b4eb..000000000000
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1,v 1.4 2004/07/14 21:43:48 agriffis Exp $
-
-VERSION="Blackdown JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/opt/@P@
-JAVAC=${JAVA_HOME}/bin/javac
-ADDPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ADDLDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/"
-MANPATH=/opt/@P@/man
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2_rc1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2_rc1
deleted file mode 100644
index c38575f43dd3..000000000000
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2_rc1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a6244fa37641d8478c38744c8677aef3 j2sdk-1.4.2-rc1-linux-amd64.bin 33748879
-MD5 52ff3a059845ee8487faeaa7b0c157c8 j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin 34072058
diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index da9c9f2c60b7..9bfcaa17b20e 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.50 2004/11/26 12:48:02 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.51 2004/11/27 12:20:15 axxo Exp $
 
+  27 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  -files/blackdown-jre-1.4.2_rc1, -blackdown-jre-1.4.2_rc1-r2.ebuild:
+  remove older vulnerable versions
+ 
   26 Nov 2004; Travis Tilley <lv@gentoo.org> blackdown-jre-1.4.2.01.ebuild:
   stable on amd64
 
@@ -9,7 +13,7 @@
   -files/blackdown-jre-1.4.2, -files/blackdown-jre-1.4.2_rc1-r1,
   -blackdown-jre-1.4.1.ebuild, -blackdown-jre-1.4.2.ebuild,
   -blackdown-jre-1.4.2_rc1-r1.ebuild:
-  remove older
+  remove older vulnerable versions
 
 *blackdown-jre-1.4.2.01 (24 Nov 2004)
 
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild
deleted file mode 100644
index f2b5cf64656b..000000000000
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2_rc1-r2.ebuild,v 1.1 2004/10/05 21:15:51 axxo Exp $
-
-inherit java
-
-JREV="rc1"
-
-JV="${PV}"
-JV="${JV/_rc1/}"
-
-S="${WORKDIR}/j2re${JV}"
-DESCRIPTION="Blackdown Java Runtime Environment ${PV}"
-J_URI="ftp://ftp.tux.org/pub/java/JDK-${JV}"
-SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2re-${JV}-${JREV}-linux-amd64.bin )
-	x86? ( ${J_URI}/i386/${JREV}/j2re-${JV}-${JREV}-linux-i586-gcc3.2.bin )"
-#	sparc? ( ${J_URI}/sparc/${JREV}/j2re-${JV}-${JREV}-linux-sparc.bin )"
-#	ppc? ( ${J_URI}/ppc/${JREV}j2re-${JV}-${JREV}-linux-ppc.bin )"
-
-HOMEPAGE="http://www.blackdown.org"
-
-SLOT="1.4.2"
-LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* amd64 ~x86"
-IUSE="mozilla"
-DEPEND="virtual/libc
-	>=dev-java/java-config-0.2.6
-	>=sys-apps/sed-4
-	>=sys-devel/gcc-3.2"
-
-PROVIDE="virtual/jre-1.4.2
-	virtual/java-scheme-2"
-
-# Extract the 'skip' value (offset of tarball) we should pass to tail
-get_offset() {
-	[ ! -f "$1" ] && return
-
-	local offset="`gawk '
-		/^[[:space:]]*skip[[:space:]]*=/ {
-
-			sub(/^[[:space:]]*skip[[:space:]]*=/, "")
-			SKIP = $0
-		}
-
-		END { print SKIP }
-	' $1`"
-
-	eval echo $offset
-}
-
-src_unpack () {
-	local offset="`get_offset ${DISTDIR}/${A}`"
-
-	if [ -z "${offset}" ] ; then
-		eerror "Failed to get offset of tarball!"
-		die "Failed to get offset of tarball!"
-	fi
-
-	echo ">>> Unpacking ${A}..."
-	tail -n +${offset} ${DISTDIR}/${A} | tar --no-same-owner -jxp
-}
-
-unpack_jars() {
-	# New to 1.4.2
-	local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar"
-	local JAVAHOME="${D}/opt/${P}"
-	local UNPACK_CMD=""
-	if [ -f "$JAVAHOME/lib/unpack" ]; then
-		UNPACK_CMD="$JAVAHOME/lib/unpack"
-		chmod +x "$UNPACK_CMD"
-		#packerror=""
-		for i in $PACKED_JARS; do
-			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
-				einfo "Creating ${JAVAHOME}/${i}\n"
-				"$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i"
-				if [ ! -f "$JAVAHOME/$i" ]; then
-					die "Failed to unpack jar files ${i}." # Please refer\n"
-					#ewarn "to the Troubleshooting section of the Installation\n"
-					#ewarn "Instructions on the download page for more information.n"
-					#packerror="1"
-				fi
-				rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack"
-			fi
-		done
-	fi
-	rm -f "$UNPACK_CMD"
-}
-
-src_install () {
-	typeset platform
-
-	dodir /opt/${P}
-
-	cp -a ${S}/{bin,lib,man,plugin} ${D}/opt/${P} || die "failed to copy"
-
-	dodoc COPYRIGHT LICENSE README INSTALL
-	dohtml README.html
-
-	# Install mozilla plugin
-	if use mozilla; then
-		case ${ARCH} in
-			x86) platform="i386" ;;
-			ppc) platform="ppc" ;;
-			sparc*) platform="sparc" ;;
-			amd64) platform="amd64" ;;
-		esac
-		install_mozilla_plugin /opt/${P}/plugin/${platform}/mozilla/libjavaplugin_oji.so
-	fi
-
-	sed -i "s/standard symbols l/symbol/g" ${D}/opt/${P}/lib/font.properties
-
-	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
-
-	# install env into /etc/env.d
-	set_java_env ${FILESDIR}/${VMHANDLE} || die
-
-	# Fix for bug 26629
-	if [ "${PROFILE_ARCH}" = "sparc64" ]
-	then
-		dosym /opt/${P}/lib/sparc /opt/${P}/lib/sparc64
-	fi
-
-	unpack_jars
-}
diff --git a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1
deleted file mode 100644
index 3f81d3e4e125..000000000000
--- a/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/files/blackdown-jre-1.4.2_rc1,v 1.4 2004/07/14 21:45:42 agriffis Exp $
-
-VERSION="Blackdown JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-ADDPATH="${JAVA_HOME}/bin"
-ADDLDPATH="/opt/@P@/lib/"
-MANPATH=/opt/@P@/man
-ENV_VARS="JAVA_HOME JRE_HOME ADDPATH ADDLDPATH MANPATH"
diff --git a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2
deleted file mode 100644
index c88b1f57e96d..000000000000
--- a/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2_rc1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 db7acfb2ef3f1f9e9193ffe44b3a1d8e j2re-1.4.2-rc1-linux-amd64.bin 13121741
-MD5 50c0faa2d536b09a48eb0584df84e32a j2re-1.4.2-rc1-linux-i586-gcc3.2.bin 13315794