Reverted -r12 (it was stable), rev-bumped for the PaX flag marking change - bug #156135

Package-Manager: portage-2.1.2_rc2-r3

5 files changed, 189 insertions, 18 deletions

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 1a827f60c5ae..916f27fc32fc 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.112 2006/12/10 14:01:15 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.113 2006/12/16 12:39:24 kevquinn Exp $
+
+*blackdown-jdk-1.4.2.03-r13 (16 Dec 2006)
+
+  16 Dec 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  blackdown-jdk-1.4.2.03-r12.ebuild, +blackdown-jdk-1.4.2.03-r13.ebuild:
+  Reverted -r12 (it was stable), rev-bumped for the PaX flag marking change.
+  Bug #156135
 
   10 Dec 2006; Kevin F. Quinn <kevquinn@gentoo.org>
   blackdown-jdk-1.4.2.03-r12.ebuild:
diff --git a/dev-java/blackdown-jdk/Manifest b/dev-java/blackdown-jdk/Manifest
index 0ac21974a39c..d75ffdbcf3b9 100644
--- a/dev-java/blackdown-jdk/Manifest
+++ b/dev-java/blackdown-jdk/Manifest
@@ -7,14 +7,18 @@ RMD160 499ca9b989c5276713248d4f23482bff9d9f63bd files/blackdown-jdk-1.4.2.env 91
 SHA256 f81ba9d5b8f5e03d68426241a578337223d8e309f2625bd2cddce20349733f5d files/blackdown-jdk-1.4.2.env 916
 DIST j2sdk-1.4.2-03-linux-amd64.bin 33997205 RMD160 de0e4ad5201315f99e9d1f26e5b2827ced37b9f5 SHA1 e3be6bc1c31691123a396351478b58e1b09e9489 SHA256 1810ffc356d7a10d773de003d074050de3c7322ca480ec0344e2b8798498f1dd
 DIST j2sdk-1.4.2-03-linux-i586.bin 34375872 RMD160 47e06e37867237106caf8e5a2c635055a5203d90 SHA1 1d7dd1b91ece6f9a9895bb03986eb865934716ea SHA256 728f661fdf9510de3c01a79259d492a98d9b636034d14e1c930118280dba9df9
-EBUILD blackdown-jdk-1.4.2.03-r12.ebuild 3602 RMD160 0eaa3e5e1a9b9627fe7e36389516987407ed8de8 SHA1 5710d2e46fd8d1d8c09be332fccc72f7b01f58c0 SHA256 174a7d90dacef0aaadb7230c9c878d9cac576c9e2c017a3430540afa7f024c55
-MD5 8a3da21790760f00c6369a4830d3984a blackdown-jdk-1.4.2.03-r12.ebuild 3602
-RMD160 0eaa3e5e1a9b9627fe7e36389516987407ed8de8 blackdown-jdk-1.4.2.03-r12.ebuild 3602
-SHA256 174a7d90dacef0aaadb7230c9c878d9cac576c9e2c017a3430540afa7f024c55 blackdown-jdk-1.4.2.03-r12.ebuild 3602
-MISC ChangeLog 20188 RMD160 e4dc132fc2d1f58672f70bbe452c73596c0dead2 SHA1 aac7f6c79189b5220cf997b45677cb44c4207250 SHA256 490ce1c38aea07d82d21b0e53395d7a52848aac32a8618e583588b5b7587f442
-MD5 35d9d81fc10bb38a8c6e29ec0c883656 ChangeLog 20188
-RMD160 e4dc132fc2d1f58672f70bbe452c73596c0dead2 ChangeLog 20188
-SHA256 490ce1c38aea07d82d21b0e53395d7a52848aac32a8618e583588b5b7587f442 ChangeLog 20188
+EBUILD blackdown-jdk-1.4.2.03-r12.ebuild 4341 RMD160 27f1bce35b717926c38450c84a867871145b502c SHA1 12631e504c45df4f5a2b2cf5bcc176b804a6f249 SHA256 80223ecfcd769fcf2f06e67313ddbbc43a113f9fe697404a3ff065434f2e06f0
+MD5 687583826ce2d854e36be627cd98c4ec blackdown-jdk-1.4.2.03-r12.ebuild 4341
+RMD160 27f1bce35b717926c38450c84a867871145b502c blackdown-jdk-1.4.2.03-r12.ebuild 4341
+SHA256 80223ecfcd769fcf2f06e67313ddbbc43a113f9fe697404a3ff065434f2e06f0 blackdown-jdk-1.4.2.03-r12.ebuild 4341
+EBUILD blackdown-jdk-1.4.2.03-r13.ebuild 3604 RMD160 b87a81b0ea73dbe7d21dcbb07593be08d7097c5f SHA1 af8bf401f0a85b748ed524cc55ab028864204350 SHA256 b9bb38577f1795a0a7279d691c5cd83e618aabd5cd36175f6cb4fda7316e95ce
+MD5 d0a97fe2dee0bf7a4540181a88fbae96 blackdown-jdk-1.4.2.03-r13.ebuild 3604
+RMD160 b87a81b0ea73dbe7d21dcbb07593be08d7097c5f blackdown-jdk-1.4.2.03-r13.ebuild 3604
+SHA256 b9bb38577f1795a0a7279d691c5cd83e618aabd5cd36175f6cb4fda7316e95ce blackdown-jdk-1.4.2.03-r13.ebuild 3604
+MISC ChangeLog 20448 RMD160 6703875aeb9010eb9476c08b3d3bbf8d38f4fa76 SHA1 b428a71fce7801e818210047b12bbcfd382d4907 SHA256 52c2ab4aeb27996b329d715968286f2a99fdd6c9ea1a9e5175dc9c6956e76360
+MD5 a2935922125d4193da0658a90a2f9770 ChangeLog 20448
+RMD160 6703875aeb9010eb9476c08b3d3bbf8d38f4fa76 ChangeLog 20448
+SHA256 52c2ab4aeb27996b329d715968286f2a99fdd6c9ea1a9e5175dc9c6956e76360 ChangeLog 20448
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -22,10 +26,13 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r12 551
 RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r12 551
 SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r12 551
+MD5 ae61c188f91254c44a84db78bec9bd92 files/digest-blackdown-jdk-1.4.2.03-r13 551
+RMD160 1445c9fe67ddfd01bbaf5f90811dc19d90cb52fd files/digest-blackdown-jdk-1.4.2.03-r13 551
+SHA256 c8d2e3d696ae765965e2ac3b6e03d7483d01075b1293e4b8a25981a1de8fd73a files/digest-blackdown-jdk-1.4.2.03-r13 551
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFfBOOZfNLSOUrp0sRAjXZAKCxAxW2No+8hEwpuCy98e8oVjgX+QCgwWC9
-Zau3LAdTG8i4KJKHQtLB9Uo=
-=n52d
+iD8DBQFFg+lrZfNLSOUrp0sRAqE7AKCgVq/F8CySjKsoCbxuZU6+bqVq6QCfbq9v
+dR9M2Jgm0mBCbRLTfRgqaQM=
+=LxHn
 -----END PGP SIGNATURE-----
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
index 281f497e459c..38afb8f79f1e 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2006 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.03-r12.ebuild,v 1.7 2006/12/10 14:01:15 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r12.ebuild,v 1.8 2006/12/16 12:39:24 kevquinn Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 versionator pax-utils
+inherit java-vm-2 versionator
 
 JREV=$(get_version_component_range 4- )
 JV=$(get_version_component_range 1-3 )
@@ -82,10 +82,6 @@ unpack_jars() {
 src_install() {
 	typeset platform
 
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
-
 	dodir /opt/${P}
 
 	cp -pPR ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
@@ -127,4 +123,29 @@ src_install() {
 pkg_postinst() {
 	# Set as default system VM if none exists
 	java-vm-2_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" "javah" "javadoc"
+		do
+			chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills
+		done
+
+		# /opt/blackdown-jdk-1.4.1/jre/bin/java_vm
+		chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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 + hardened@gentoo.org"
+	fi
 }
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r13.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r13.ebuild
new file mode 100644
index 000000000000..a9135e27007e
--- /dev/null
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.03-r13.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 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.03-r13.ebuild,v 1.1 2006/12/16 12:39:24 kevquinn Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 versionator pax-utils
+
+JREV=$(get_version_component_range 4- )
+JV=$(get_version_component_range 1-3 )
+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="-* ~amd64 ~x86"
+IUSE="doc nsplugin"
+
+DEPEND=">=dev-java/java-config-1.2.11
+	doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+JAVA_PROVIDE="jdbc-stdext"
+
+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=""
+		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"
+				"$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
+
+	# Set PaX markings on all JDK/JRE executables to allow code-generation on
+	# the heap by the JIT compiler.
+	pax-mark m $(list-paxables ${S}{,/jre}/bin/*)
+
+	dodir /opt/${P}
+
+	cp -pPR ${S}/{bin,jre,lib,man,include} ${D}/opt/${P} || die "failed to copy"
+
+	dodir /opt/${P}/share/java
+	cp -pPR ${S}/{demo,src.zip} ${D}/opt/${P}/share || die "failed to copy"
+
+	dodoc README
+	dohtml README.html
+
+	if use nsplugin; 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
+	else
+		rm -f ${D}/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
+
+	# 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-vm-2_pkg_postinst
+}
diff --git a/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r13 b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r13
new file mode 100644
index 000000000000..204505d2d344
--- /dev/null
+++ b/dev-java/blackdown-jdk/files/digest-blackdown-jdk-1.4.2.03-r13
@@ -0,0 +1,6 @@
+MD5 fa1add887128fb01d255356680a09445 j2sdk-1.4.2-03-linux-amd64.bin 33997205
+RMD160 de0e4ad5201315f99e9d1f26e5b2827ced37b9f5 j2sdk-1.4.2-03-linux-amd64.bin 33997205
+SHA256 1810ffc356d7a10d773de003d074050de3c7322ca480ec0344e2b8798498f1dd j2sdk-1.4.2-03-linux-amd64.bin 33997205
+MD5 357e1b2c22abcef2db561a338f7dbfe3 j2sdk-1.4.2-03-linux-i586.bin 34375872
+RMD160 47e06e37867237106caf8e5a2c635055a5203d90 j2sdk-1.4.2-03-linux-i586.bin 34375872
+SHA256 728f661fdf9510de3c01a79259d492a98d9b636034d14e1c930118280dba9df9 j2sdk-1.4.2-03-linux-i586.bin 34375872