Fixes #55468.

5 files changed, 178 insertions, 6 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 084237322e4a..2aaaa84a716f 100644
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.53 2004/07/02 04:18:37 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.54 2004/07/06 22:27:39 karltk Exp $
+
+*blackdown-jdk-1.4.2_rc1-r1 07 Jul 2004
+
+  07 Jul 2004; Karl Trygve Kalleberg <karltk@gentoo.org> 
+  blackdown-jdk-1.4.2_rc1-r1.ebuild: Fixes #55468, thanks to
+  Andy Daniels <danielsa@uwstout.edu>.
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   blackdown-jdk-1.3.1-r10.ebuild, blackdown-jdk-1.3.1-r7.ebuild,
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index 593a197c11c8..7e21f2122c6c 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,17 +1,20 @@
-MD5 5204de43c69cc3f67c807c400bd5a81e ChangeLog 9535
+MD5 6ccb83e19b6e4206850a229acd8fb15e ChangeLog 9731
 MD5 5537a44f2cc7405308039419507fe21a blackdown-jdk-1.3.1-r10.ebuild 2208
 MD5 596305d356aed4282563242b8cdc3834 blackdown-jdk-1.3.1-r7.ebuild 2280
 MD5 442ae7df772b17a28d23497615076672 blackdown-jdk-1.3.1-r8.ebuild 2113
 MD5 d1996ad9b5511b3c70500a735e403e11 blackdown-jdk-1.3.1-r9.ebuild 2108
 MD5 09ba8247db21f30e9d6abaa5bd925ce6 blackdown-jdk-1.4.1.ebuild 3702
-MD5 6fba9be2b09e9181ea5e51f4c6d697c1 blackdown-jdk-1.4.2_rc1.ebuild 4133
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7f2cec16f9789da84bc5d01d00d11bab files/blackdown-jdk-1.3.1 602
-MD5 bcf1975900616bbcbe87100fd362cd67 files/blackdown-jdk-1.4.1 601
-MD5 13d676d2788d6adca4d6ded7aa21e396 files/blackdown-jdk-1.4.2_rc1 605
+MD5 6fba9be2b09e9181ea5e51f4c6d697c1 blackdown-jdk-1.4.2_rc1.ebuild 4133
+MD5 2745148405e49bda6d46766e26a486e2 blackdown-jdk-1.4.2_rc1-r1.ebuild 4233
+MD5 c2a9578c5cd914ca2a82dd9243ff0120 files/blackdown-jdk-1.3.1 603
+MD5 20fdf50b6a3b45c472a1c5a4ade690ef files/blackdown-jdk-1.4.1 602
+MD5 41546d2d354142ca9c566e6f03ed0c8d files/blackdown-jdk-1.4.2_rc1 606
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r7 243
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r9 80
 MD5 487f303d5be4535fb85c518938476de5 files/digest-blackdown-jdk-1.4.1 251
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1 162
+MD5 edd58176eda28d10ab3b18320263ca02 files/blackdown-jdk-1.4.2_rc1-r1 606
+MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1-r1 162
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
new file mode 100644
index 000000000000..d50191a3cd4e
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2_rc1-r1.ebuild
@@ -0,0 +1,149 @@
+# 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-r1.ebuild,v 1.1 2004/07/06 22:27:39 karltk Exp $
+
+IUSE="doc mozilla"
+
+inherit java nsplugins
+
+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"
+
+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" ;;
+			ppc) platform="ppc" ;;
+			sparc*) platform="sparc" ;;
+			x86) platform="i386" ;;
+		esac
+		inst_plugin /opt/${P}/jre/plugin/${platform}/mozilla/libjavaplugin_oji.so
+	fi
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	dosed -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
+		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.2_rc1/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-r1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1-r1
new file mode 100644
index 000000000000..610b18aae2b6
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1-r1
@@ -0,0 +1,12 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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-r1,v 1.1 2004/07/06 22:27:39 karltk 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-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2_rc1-r1
new file mode 100644
index 000000000000..c38575f43dd3
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2_rc1-r1
@@ -0,0 +1,2 @@
+MD5 a6244fa37641d8478c38744c8677aef3 j2sdk-1.4.2-rc1-linux-amd64.bin 33748879
+MD5 52ff3a059845ee8487faeaa7b0c157c8 j2sdk-1.4.2-rc1-linux-i586-gcc3.2.bin 34072058