applied patch to fix insecure temporary file handling, see #86585

(Portage version: 2.0.51.19)

6 files changed, 10 insertions, 168 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 1ee229a086df..1d96efbd1241 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.73 2005/03/24 03:19:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.74 2005/03/25 22:37:32 luckyduck Exp $
+
+*blackdown-jdk-1.4.2.01-r2 (25 Mar 2005)
+
+  25 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/blackdown-jdk-1.4.2.01-r1, -blackdown-jdk-1.4.2.01-r1.ebuild,
+  +blackdown-jdk-1.4.2.01-r2.ebuild, -blackdown-jdk-1.4.2.01.ebuild:
+  applied patch to fix insecure temporary file handling, see #86585.
 
   24 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org>
   blackdown-jdk-1.3.1-r10.ebuild:
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild
index d9fa49709388..06c5b48a32e6 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.01-r1.ebuild,v 1.6 2005/02/14 12:42:24 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r2.ebuild,v 1.1 2005/03/25 22:37:32 luckyduck Exp $
 
 inherit java versionator
 
@@ -64,6 +64,7 @@ unpack_jars() {
 		UNPACK_CMD="$JAVAHOME/lib/unpack"
 		chmod +x "$UNPACK_CMD"
 		packerror=""
+		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
 		for i in $PACKED_JARS; do
 			if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then
 				einfo "Creating ${JAVAHOME}/${i}\n"
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
deleted file mode 100644
index d0152bf240f6..000000000000
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2005 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.01.ebuild,v 1.6 2005/02/14 12:42:24 eradicator Exp $
-
-inherit java versionator
-
-JREV="01"
-JV=${PV%_*}
-JV=$(get_version_component_range 1-3 ${JV})
-J_URI="mirror://blackdown.org/JDK-${JV}"
-
-DESCRIPTION="Blackdown Java Development Kit"
-SRC_URI="amd64? ( ${J_URI}/amd64/${JREV}/j2sdk-${JV}-${JREV}-linux-amd64.bin )
-	x86? ( ${J_URI}/i386/${JREV}/j2sdk-${JV}-${JREV}-linux-i586.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-1.2.11
-	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
-
-PROVIDE="virtual/jdk-1.4.2
-	virtual/jre-1.4.2
-	virtual/java-scheme-2"
-
-S="${WORKDIR}/j2sdk${JV}"
-
-# 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} || die "failed to copy"
-
-	dodir /opt/${P}/share/java
-	cp -a ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
-
-	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"
-
-		CHPAX_CONSERVATIVE_FLAGS="pemrxs"
-
-		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.01-r1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
deleted file mode 100644
index 9fac4df89de6..000000000000
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01-r1
+++ /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.01-r1,v 1.2 2005/01/24 20:03:45 luckyduck 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/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-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.01-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r1
deleted file mode 100644
index 1e5705ea8a8d..000000000000
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 00cb18fe9ea91c536360c70a219b1867 j2sdk-1.4.2-01-linux-amd64.bin 37307243
-MD5 dbb87efd16b8d25cdd3fe6a8782a8e75 j2sdk-1.4.2-01-linux-i586.bin 37639008
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r2
index 1e5705ea8a8d..1e5705ea8a8d 100644
--- a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01-r2