From: Petteri Räty Date: Thu, 19 Apr 2007 18:54:25 +0000 (+0000) Subject: Fix pax markings, 1.4 needs -srpm for bug #174951. And change the location of the... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0f172330f7f10802203caba3dbdaa8ddd5b22eb4;p=gentoo.git Fix pax markings, 1.4 needs -srpm for bug #174951. And change the location of the installed src.zip file to match sun jdk file layout. Package-Manager: portage-2.1.2.3 --- diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 733ea5b41d1e..7a76d097e72e 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.192 2007/04/11 18:41:03 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.193 2007/04/19 18:54:25 betelgeuse Exp $ + +*sun-jdk-1.4.2.13-r2 (19 Apr 2007) + + 19 Apr 2007; Petteri Räty + +sun-jdk-1.4.2.13-r2.ebuild: + Fix pax markings, 1.4 needs -srpm for bug #174951. And change the location + of the installed src.zip file to match sun jdk file layout. 11 Apr 2007; Peter Weller sun-jdk-1.5.0.11.ebuild: Stable on amd64 wrt bug 173197 diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest index b1358685c1e8..637f89649424 100644 --- a/dev-java/sun-jdk/Manifest +++ b/dev-java/sun-jdk/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 SHA1 59f68c06f4f727bc72449a76bd4941cbee626373 SHA256 893b469c87ba547122fe158941c00512bf3f15046251f4b8639d967203d32bc1 MD5 494118498b85e238421b123a4ba16347 files/fontconfig.Gentoo.properties 10932 RMD160 ce1fb555f3f5f281f328c8016e12407ac0893819 files/fontconfig.Gentoo.properties 10932 @@ -26,6 +29,10 @@ EBUILD sun-jdk-1.4.2.13-r1.ebuild 5638 RMD160 787a1891c0f1b8c18f5ac2e04d6bca47fa MD5 872cdb73fe845df4f99414aeca2ba87d sun-jdk-1.4.2.13-r1.ebuild 5638 RMD160 787a1891c0f1b8c18f5ac2e04d6bca47fa1270a8 sun-jdk-1.4.2.13-r1.ebuild 5638 SHA256 f223cd6ba62fba984cbc20714b38e3bc5cb07d2a6c3cab0c31d4b92807a98951 sun-jdk-1.4.2.13-r1.ebuild 5638 +EBUILD sun-jdk-1.4.2.13-r2.ebuild 6069 RMD160 858a2f1f98b855e26c95fbbe3494404e58a66a11 SHA1 59721d08ce06e76eafcaefa8bf4afc918f4316b1 SHA256 024406681ed3f64c2ab8dee890fe54f55717bdcaad7be92af7ea2f116257a5dc +MD5 c19cc474d0e9d3f321d55393f7355563 sun-jdk-1.4.2.13-r2.ebuild 6069 +RMD160 858a2f1f98b855e26c95fbbe3494404e58a66a11 sun-jdk-1.4.2.13-r2.ebuild 6069 +SHA256 024406681ed3f64c2ab8dee890fe54f55717bdcaad7be92af7ea2f116257a5dc sun-jdk-1.4.2.13-r2.ebuild 6069 EBUILD sun-jdk-1.4.2.13.ebuild 6311 RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608cc0d SHA1 ae82b8d97a6ff5f57daef7ca7cc2661994110e82 SHA256 ffed680930da4f61290b79ecadae909dd83ffbde0bf525d35a49aee6dc95a6f7 MD5 32f196a83b862af4d06b9c1310f8d244 sun-jdk-1.4.2.13.ebuild 6311 RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608cc0d sun-jdk-1.4.2.13.ebuild 6311 @@ -42,10 +49,10 @@ EBUILD sun-jdk-1.6.0-r1.ebuild 4802 RMD160 51b3b35fdb07034968f5859c27cf672b937d4 MD5 82a5b3f47a0051ce2a06f287c437befd sun-jdk-1.6.0-r1.ebuild 4802 RMD160 51b3b35fdb07034968f5859c27cf672b937d4913 sun-jdk-1.6.0-r1.ebuild 4802 SHA256 422b0f6b1b7b6e36bfaf59998e9bede433b17b7f0dfa19c25486d431b28ee753 sun-jdk-1.6.0-r1.ebuild 4802 -MISC ChangeLog 37505 RMD160 869a2ea9caff52e5a8a3de12303ba8de48125f68 SHA1 379042aaf3d67e3da063f03cf1ab1840f85cdf64 SHA256 d06d2bb591ec0c9cdaad40cf4e9d71caf6bc8c0795ef39106fca0f7bd830734a -MD5 55d3555d8b5293867786f793d719fb7b ChangeLog 37505 -RMD160 869a2ea9caff52e5a8a3de12303ba8de48125f68 ChangeLog 37505 -SHA256 d06d2bb591ec0c9cdaad40cf4e9d71caf6bc8c0795ef39106fca0f7bd830734a ChangeLog 37505 +MISC ChangeLog 37771 RMD160 ea5473a14d398fb972986e30353933a1384a5620 SHA1 14e4ea5ae7c3762cdcec03c54eed488154147cc2 SHA256 84aa2f1f97dcb5f5039d686a21768d7ea2fc14b2658f1b26cec8e60088c08cb7 +MD5 3423ea3a8664d0965d29add93169da15 ChangeLog 37771 +RMD160 ea5473a14d398fb972986e30353933a1384a5620 ChangeLog 37771 +SHA256 84aa2f1f97dcb5f5039d686a21768d7ea2fc14b2658f1b26cec8e60088c08cb7 ChangeLog 37771 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237 @@ -56,6 +63,9 @@ SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/di MD5 4551e92262ffc2bc93ba3941a5f49f30 files/digest-sun-jdk-1.4.2.13-r1 512 RMD160 6c0a27d829f9b9b868feedd086b0929f015e48a2 files/digest-sun-jdk-1.4.2.13-r1 512 SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/digest-sun-jdk-1.4.2.13-r1 512 +MD5 4551e92262ffc2bc93ba3941a5f49f30 files/digest-sun-jdk-1.4.2.13-r2 512 +RMD160 6c0a27d829f9b9b868feedd086b0929f015e48a2 files/digest-sun-jdk-1.4.2.13-r2 512 +SHA256 c4db2c43fa08b705c1e9ba316c8cecbcd2d3a7be5d3014cf4bf02e53b214b155 files/digest-sun-jdk-1.4.2.13-r2 512 MD5 bfc73dd88d30c26b64d0590cb52d7547 files/digest-sun-jdk-1.5.0.10 563 RMD160 ce0632d08fdd27b76bd6e2de244a0516555aeef0 files/digest-sun-jdk-1.5.0.10 563 SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/digest-sun-jdk-1.5.0.10 563 @@ -65,3 +75,10 @@ SHA256 d05c274f69904c60645c3639147b1741b3edeba807959724e8310ec9b1ea8b4b files/di MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jdk-1.6.0-r1 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jdk-1.6.0-r1 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jdk-1.6.0-r1 521 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGJ7rqcxLzpIGCsLQRAsCpAJ0S4tt972P4wifBvdQF5e44XiCN7gCglxUR +X/svvLACTXS9KiLtqSXbFh8= +=OgjO +-----END PGP SIGNATURE----- diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13-r2 b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13-r2 new file mode 100644 index 000000000000..d4bcdcafe110 --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.4.2.13-r2 @@ -0,0 +1,6 @@ +MD5 e2e610267fd9ff8fc5f8a807a5606751 j2sdk-1_4_2_13-linux-i586.bin 36361814 +RMD160 cefb731ae6740f36a17242aa79b36d79dda2e102 j2sdk-1_4_2_13-linux-i586.bin 36361814 +SHA256 f5dd8045fe791bd5c52bddf33a1cf65968ee03981e0663f75cd97a942daa24e2 j2sdk-1_4_2_13-linux-i586.bin 36361814 +MD5 ff961c5f5326191c5ac2e4624d756f7e jce_policy-1_4_2.zip 12195 +RMD160 323340fa8a96f315a35b0ebc918731e6fe56c370 jce_policy-1_4_2.zip 12195 +SHA256 7bf6d683602686321affc0071ad2fc3890c19cf5bb5cc16a963052e17588c097 jce_policy-1_4_2.zip 12195 diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.13-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.13-r2.ebuild new file mode 100644 index 000000000000..00907e336737 --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.4.2.13-r2.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.13-r2.ebuild,v 1.1 2007/04/19 18:54:25 betelgeuse Exp $ + +JAVA_SUPPORTS_GENERATION_1="true" +inherit pax-utils java-vm-2 eutils + +MY_PV=${PV%.*}_${PV##*.} +MY_P=j2sdk${MY_PV} +MY_PVB=${PV%.*} + +At="j2sdk-${PV//./_}-linux-i586.bin" +jce_policy="jce_policy-${MY_PVB//./_}.zip" + +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Sun's J2SE Development Kit" +HOMEPAGE="http://java.sun.com/j2se/1.4.2/" +SRC_URI="${At} + jce? ( ${jce_policy} )" +SLOT="1.4" +LICENSE="sun-bcla-java-vm" +KEYWORDS="~x86" +RESTRICT="fetch" +IUSE="X alsa doc examples nsplugin jce" + +DEPEND="sys-apps/sed + app-arch/unzip" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + doc? ( =dev-java/java-sdk-docs-1.4.2* ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst + )" + +JAVA_PROVIDE="jdbc-stdext" + +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" + +# this is needed for proper operating under a PaX kernel without activated grsecurity acl +CHPAX_CONSERVATIVE_FLAGS="pemrsv" + +DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg" +DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg" + +QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so + opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so + opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so + opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so" + +pkg_nofetch() { + einfo "Please download ${At} from:" + einfo ${DOWNLOAD_URL} + einfo "(first select 'Accept License', then click on 'self-extracting file'" + einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')" + einfo "and move it to ${DISTDIR}" + if use jce; then + echo + einfo "Also download ${jce_policy} from:" + einfo ${DOWNLOAD_URL_JCE} + einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files" + einfo "and move it to ${DISTDIR}" + fi +} + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}.bin. Please check the permission and try again." + fi + if use jce; then + if [ ! -r ${DISTDIR}/${jce_policy} ]; then + die "cannot read ${jce_policy}. Please check the permission and try again." + fi + fi + #Search for the ELF Header + testExp=$'\177\105\114\106\001\001\001' + startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` + tail -n +${startAt} ${DISTDIR}/${At} > install.sfx + chmod +x install.sfx + ./install.sfx || die + rm install.sfx + + if [ -f ${S}/lib/unpack ]; then + UNPACK_CMD=${S}/lib/unpack + chmod +x $UNPACK_CMD + sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD + for i in $PACKED_JARS; do + PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack + if [ -f ${PACK_FILE} ]; then + echo " unpacking: $i" + $UNPACK_CMD ${PACK_FILE} ${S}/$i + rm -f ${PACK_FILE} + fi + done + fi +} + +src_install() { + local dirs="bin include jre lib man" + dodir /opt/${P} + + for i in $dirs ; do + cp -dPR $i ${D}/opt/${P}/ + done + + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. + pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*) + + dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die + dohtml README.html || die + dodir /opt/${P}/share/ + if use examples; then + cp -pPR demo ${D}/opt/${P}/share/ + fi + + cp -pPR src.zip "${D}/opt/${P}/" + dosym "/opt/${P}/src.zip" /opt/${P}/share + + if use jce ; then + # Using unlimited jce while still retaining the strong jce + # May have repercussions when you find you cannot symlink libraries + # in classpaths. + cd ${D}/opt/${P}/jre/lib/security + unzip ${DISTDIR}/${jce_policy} + mv jce unlimited-jce + dodir /opt/${P}/jre/lib/security/strong-jce + mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce + mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce + dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ + dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ + fi + + if use nsplugin; then + local plugin_dir="ns610" + if has_version '>=sys-devel/gcc-3.2' ; then + plugin_dir="ns610-gcc32" + fi + + install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so + fi + + # bug #147259 + dosym ../jre/javaws/javaws /opt/${P}/bin/javaws + dosym ../javaws/javaws /opt/${P}/jre/bin/javaws + + # create dir for system preferences + dodir /opt/${P}/.systemPrefs + # Create files used as storage for system preferences. + touch ${D}/opt/${P}/.systemPrefs/.system.lock + chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock + touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile + chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile + + # install control panel for Gnome/KDE + sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ + -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ + ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ + ${T}/sun_java-${SLOT}.desktop + + domenu ${T}/sun_java-${SLOT}.desktop + + set_java_env +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if ! use X; then + echo + ewarn "Some parts of Sun's JDK require virtual/x11 to be installed." + ewarn "Be careful which Java libraries you attempt to use." + fi + elog "" + elog "Starting with 1.4.2-r2 the src.zip is installed to the standard" + elog "location. It is still symlinked to the old location (/opt/${P}/share)" + elog "but it will be removed if there will ever be a version bump." + elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" + elog "http://java.sun.com/j2se/1.4.2/docs/tooldocs/linux/jdkfiles.html" + elog "for more details." +}