security version bump #72221, keyword x86

10 files changed, 321 insertions, 22 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index e82665d717b3..5af2c793e2b5 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.60 2004/10/12 21:34:49 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.61 2004/11/24 20:50:02 axxo Exp $
+
+*blackdown-jdk-1.4.2.01 (24 Nov 2004)
+
+  24 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/blackdown-jdk-1.4.2.01, +blackdown-jdk-1.4.2.01.ebuild:
+  security version bump #72221, keyword x86
 
   12 Oct 2004; Thomas Matthijs <axxo@gentoo.org> blackdown-jdk-1.4.2.ebuild:
   DEPEND on fixed java-config, see bug #66969
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index e577c82e5c75..f059e36aa1fe 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -1,15 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9188a678adcbcb490e9a8f2084f9d4fc blackdown-jdk-1.4.2_rc1.ebuild 4225
 MD5 d69038c27d436b60db4fcb57b9e1b215 blackdown-jdk-1.4.2.ebuild 4184
 MD5 e9d0a60a1cfb2dfc50c81394805b8494 blackdown-jdk-1.4.2_rc1-r1.ebuild 4233
 MD5 0052da924a28441c6378160ecf4a58f9 blackdown-jdk-1.3.1-r8.ebuild 2310
+MD5 0ae007f12e59f81d628633cae698895e blackdown-jdk-1.4.2.01.ebuild 4231
 MD5 c3a1674a9be9f34f261b9e0613a76680 blackdown-jdk-1.3.1-r10.ebuild 2164
 MD5 e99ca75fa6b43db00511d8e515f2a2e0 blackdown-jdk-1.4.1.ebuild 3502
 MD5 873a71e029c39412cc51ddde0381246d ChangeLog 10873
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1-r1 162
+MD5 e0dbef65973e09094b82b9293c2edbfe files/blackdown-jdk-1.4.2.01 589
 MD5 4180217fbbedc728995047569e9bd581 files/blackdown-jdk-1.3.1 594
 MD5 984b14608fd00915095caceed8bc3e00 files/blackdown-jdk-1.4.1 593
 MD5 e0dbef65973e09094b82b9293c2edbfe files/blackdown-jdk-1.4.2 589
@@ -17,13 +16,7 @@ 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 4e91fa8beedb2d7c135e05318b097702 files/digest-blackdown-jdk-1.4.2.01 153
 MD5 a61878251515677261fbc5607b6e5a4b files/digest-blackdown-jdk-1.4.2_rc1 162
 MD5 8009bc4bb09e243860795380d025f0e5 files/digest-blackdown-jdk-1.4.1 167
 MD5 28c197e72ead945fc266905d593c5fc7 files/digest-blackdown-jdk-1.4.2 162
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBbE4J/rLF9B432nYRAuG6AJ4y6Gg+hMItctBzWDvE4fxw2BAdLwCeLS0s
-FUwfPSe5iSzp6M7PDQiW5Yc=
-=y9IG
------END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..850c104f7f5d
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
@@ -0,0 +1,151 @@
+# 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.01.ebuild,v 1.1 2004/11/24 20:50:02 axxo 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"
+
+		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 b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01
new file mode 100644
index 000000000000..027778b73f10
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/blackdown-jdk-1.4.2.01
@@ -0,0 +1,12 @@
+# 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,v 1.1 2004/11/24 20:50:02 axxo 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.01 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01
new file mode 100644
index 000000000000..1e5705ea8a8d
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.01
@@ -0,0 +1,2 @@
+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-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 43f08f4e6b96..4207ef35b2d7 100644
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2004/10/09 09:52:58 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.48 2004/11/24 20:51:37 axxo Exp $
+
+*blackdown-jre-1.4.2.01 (24 Nov 2004)
+
+  24 Nov 2004; Thomas Matthijs <axxo@gentoo.org>
+  +files/blackdown-jre-1.4.2.01, +blackdown-jre-1.4.2.01.ebuild:
+  security version bump #72221, keyword x86
 
 *blackdown-jre-1.4.2 (09 Oct 2004)
 
diff --git a/dev-java/blackdown-jre/Manifest b/dev-java/blackdown-jre/Manifest
index 358351684f7b..59af51a35a95 100644
--- a/dev-java/blackdown-jre/Manifest
+++ b/dev-java/blackdown-jre/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 54de075f50df725f051f559c6258f4af blackdown-jre-1.4.2.01.ebuild 3283
 MD5 a08a19a36bcbc231440fe02887dd7f58 blackdown-jre-1.4.1.ebuild 2351
 MD5 6cef0129aa702d492e901f2acf3267c2 blackdown-jre-1.4.2_rc1-r2.ebuild 3263
 MD5 ba7a0a5afe09b6aba7eb272554806e4d blackdown-jre-1.3.1-r9.ebuild 1726
@@ -11,17 +9,12 @@ MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 4d1e4299a9d265e31c10498f5457dc1c files/blackdown-jre-1.4.2_rc1-r1 436
 MD5 2fc6969da09d5d87a161f71b371141e4 files/blackdown-jre-1.4.2_rc1 433
 MD5 44d855f52a687d922d2230b27bccad0f files/digest-blackdown-jre-1.3.1-r9 79
+MD5 7d186c2364cc118125d06076161306a8 files/digest-blackdown-jre-1.4.2.01 151
 MD5 773e3dae29edd26397f43c1e1ab99dae files/digest-blackdown-jre-1.4.1 248
 MD5 59321a1d883e9a72002841f77c68a3fb files/digest-blackdown-jre-1.4.2 160
 MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1-r1 160
 MD5 8cf05da3360f161e42c019159bccda1d files/digest-blackdown-jre-1.4.2_rc1-r2 160
+MD5 7ec35bbf16b0ad3897017db2491d312a files/blackdown-jre-1.4.2.01 425
 MD5 3facc5cbb2965471e9b1986926221552 files/blackdown-jre-1.3.1 429
 MD5 c1a405150b814133a77c5a7c249517b9 files/blackdown-jre-1.4.1 429
 MD5 7ec35bbf16b0ad3897017db2491d312a files/blackdown-jre-1.4.2 425
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBZ7WH/rLF9B432nYRAlPgAJ93RC7kzOABU2/qB3f/0a1u268DmQCcCRpw
-9wmEmJDKOjwTSrFVZLJTKG8=
-=UUwE
------END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild
new file mode 100644
index 000000000000..dfe5e5edb039
--- /dev/null
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild
@@ -0,0 +1,123 @@
+# 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.01.ebuild,v 1.1 2004/11/24 20:51:37 axxo Exp $
+
+inherit java versionator
+
+JREV="01"
+
+JV="${PV}"
+JV=$(get_version_component_range 1-3 ${JV})
+DESCRIPTION="Blackdown Java Runtime Environment ${PV}"
+J_URI="mirror://blackdown.org/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.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-1.2.11
+	>=sys-apps/sed-4
+	>=sys-devel/gcc-3.2"
+
+PROVIDE="virtual/jre-1.4.2
+	virtual/java-scheme-2"
+
+S="${WORKDIR}/j2re${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`"
+
+	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.01 b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01
new file mode 100644
index 000000000000..d73959204f90
--- /dev/null
+++ b/dev-java/blackdown-jre/files/blackdown-jre-1.4.2.01
@@ -0,0 +1,11 @@
+# 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.01,v 1.1 2004/11/24 20:51:37 axxo 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.01 b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.01
new file mode 100644
index 000000000000..f13a261c78a2
--- /dev/null
+++ b/dev-java/blackdown-jre/files/digest-blackdown-jre-1.4.2.01
@@ -0,0 +1,2 @@
+MD5 29c1f49b997e5bdf5aac5ebde4d8c59c j2re-1.4.2-01-linux-amd64.bin 14441646
+MD5 7943dbe0e6449ff9976b5bef9e892af6 j2re-1.4.2-01-linux-i586.bin 14725596