give sparc there jdk back, no longer installs the mozilla plugin, security vuln #72221

5 files changed, 160 insertions, 7 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index dfebd3a0b62e..71b1d9e78f9e 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.62 2004/11/24 20:59:54 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.63 2004/11/25 13:27:22 axxo Exp $
+
+*blackdown-jdk-1.4.1-r1 (25 Nov 2004)
+
+  25 Nov 2004; Thomas Matthijs <axxo@gentoo.org> +files/blackdown-jdk-1.4.1,
+  -files/blackdown-jdk-1.4.2_rc1-r1, +blackdown-jdk-1.4.1-r1.ebuild:
+  give sparc there jdk back, no longer installs the mozilla plugin, security
+  vuln #72221
 
   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,
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index fe4226f7d59f..c8d417eed9b7 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -3,22 +3,24 @@ Hash: SHA1
 
 MD5 9188a678adcbcb490e9a8f2084f9d4fc blackdown-jdk-1.4.2_rc1.ebuild 4225
 MD5 0052da924a28441c6378160ecf4a58f9 blackdown-jdk-1.3.1-r8.ebuild 2310
+MD5 d6f9d33ab37807e3feba5c7bdae209f3 blackdown-jdk-1.4.1-r1.ebuild 3773
 MD5 bd223a65d6d2dce425e23ac87c53e07c blackdown-jdk-1.4.2.01.ebuild 4234
 MD5 c3a1674a9be9f34f261b9e0613a76680 blackdown-jdk-1.3.1-r10.ebuild 2164
-MD5 da1e9bec93e928d4384f507dcc3b4a26 ChangeLog 11290
+MD5 63cc6bab8a1fa443c1fa9892e40fa035 ChangeLog 11567
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 fc3e5f204dcfe4d99ac75d70f55ab2c8 files/blackdown-jdk-1.4.2.01 592
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
+MD5 b553ff878f45505a9285c3a9612c7584 files/blackdown-jdk-1.4.1 589
 MD5 df9f7a9474494654fa07776f1e4054c9 files/blackdown-jdk-1.4.2_rc1 597
 MD5 729ed4be8a29fe7d7c3d946b8f14d8d4 files/digest-blackdown-jdk-1.3.1-r10 80
-MD5 0a02494663d4bc5af49ce0092ba238a8 files/blackdown-jdk-1.4.2_rc1-r1 600
 MD5 f150863fcc96f4ca2d2bdd75f1c0a1c5 files/digest-blackdown-jdk-1.3.1-r8 243
+MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1-r1 167
 MD5 4e91fa8beedb2d7c135e05318b097702 files/digest-blackdown-jdk-1.4.2.01 153
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1 162
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBpPZn/rLF9B432nYRAlpWAJ9ySEvqlcPxCuPI1P3TJjR99enwGwCfR1S/
-qXyPyUZAIu2Z1pBgcaZy8CA=
-=RsLP
+iD8DBQFBpd3M/rLF9B432nYRAk4gAJ9N17lfopCd8u1iSeNZgBBK/dd4SgCaArDy
+MqhZZhuxXVLuTl23HDomlco=
+=hQE5
 -----END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..9871df0d18dd
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
@@ -0,0 +1,142 @@
+# 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.1-r1.ebuild,v 1.1 2004/11/25 13:27:22 axxo Exp $
+
+
+inherit java
+
+JREV="01"
+
+S="${WORKDIR}/j2sdk${PV}"
+DESCRIPTION="Blackdown Java Development Kit ${PV}"
+HOMEPAGE="http://www.blackdown.org"
+J_URI="ftp://ftp.gwdg.de/pub/languages/java/linux/JDK-${PV}"
+SRC_URI="x86? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )
+		amd64? ( ${J_URI}/i386/${JREV}/j2sdk-${PV}-${JREV}-linux-i586-gcc3.2.bin )
+		sparc? ( ${J_URI}/sparc/${JREV}/j2sdk-${PV}-${JREV}-linux-sparc-gcc3.2.bin )"
+
+# this is needed for proper operating under a PaX kernel without activated grsecurity acl
+CHPAX_CONSERVATIVE_FLAGS="pemsv"
+
+LICENSE="sun-bcla-java-vm"
+SLOT="1.4.1"
+KEYWORDS="-* x86 sparc amd64"
+IUSE="doc mozilla"
+
+DEPEND="virtual/libc
+	>=dev-java/java-config-0.2.6
+	doc? ( =dev-java/java-sdk-docs-1.4.1* )
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
+PROVIDE="virtual/jdk-1.4.1
+	virtual/jre-1.4.1
+	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 -jxpf -
+}
+
+
+src_install() {
+	local 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
+
+	# do not install plugins, security vulnerability   #72221
+	rm -rf ${D}/opt/${P}/jre/plugin/
+
+	#if use mozilla; then
+	#	if [ "${ARCH}" = "x86" ] ; then
+	#		PLATFORM="i386"
+	#	fi
+
+	#	if [ "${ARCH}" = "amd64" ] ; then
+	#		PLATFORM="i386"
+	#	fi
+
+	#	if [ "${ARCH}" = "sparc" ] ; then
+	#		PLATFORM="sparc"
+	#	fi
+
+	#	install_mozilla_plugin /opt/${P}/jre/plugin/${PLATFORM}/mozilla/javaplugin_oji.so
+	#fi
+
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+
+	dosed "s/standard symbols l/symbol/g" \
+		/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
+}
+
+pkg_postinst() {
+	# Set as default system VM if none exists
+	java_pkg_postinst
+
+	if use mozilla; then
+		echo
+		einfo "mozilla plugin NOT installed"
+		einfo "http://www.blackdown.org/java-linux/java2-status/security/Blackdown-SA-2004-01.txt"
+	fi
+	# 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-r1 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.1
index 6a8c96ddfe9c..b68cc07ee9d2 100644
--- a/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2_rc1-r1
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.1
@@ -1,6 +1,6 @@
 # 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-r1,v 1.2 2004/07/14 21:43:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.1,v 1.8 2004/11/25 13:27:22 axxo Exp $
 
 VERSION="Blackdown JDK @PV@"
 JAVA_HOME=/opt/@P@
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.1-r1 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.1-r1
new file mode 100644
index 000000000000..992be0bc4817
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.1-r1
@@ -0,0 +1,2 @@
+MD5 a0c7838233603fccb30641998195e8bc j2sdk-1.4.1-01-linux-i586-gcc3.2.bin 40813906
+MD5 4e4d248a5b415e5d3e25f53fa682ed33 j2sdk-1.4.1-01-linux-sparc-gcc3.2.bin 40292565