From: Joshua Nichols Date: Sun, 19 Nov 2006 20:22:19 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fccd025ab1efbda4adb8724381e5945d999c70e;p=gentoo.git Version bump. Package-Manager: portage-2.1.2_rc1-r5 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 2b1831628ed7..e1e07a565c8b 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.64 2006/10/17 23:58:57 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.65 2006/11/19 20:22:19 nichoj Exp $ + +*sun-jre-bin-1.5.0.09 (19 Nov 2006) + + 19 Nov 2006; Joshua Nichols + +sun-jre-bin-1.5.0.09.ebuild: + Version bump. 17 Oct 2006; Joshua Nichols -files/sun-jre-bin-1.4.2.10, -files/sun-jre-bin-1.5.0.06, diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 67dccb86ea45..575aa7f5bdc9 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -13,6 +13,8 @@ SHA256 c8557635c09c381cf1eb3e23619c5bfd01c06f062364ac49cdbef36d567bb34e files/su DIST j2re-1_4_2_12-linux-i586.bin 14339018 RMD160 a63313d5a57f770ec6cd6c89c56b101f7a77f964 SHA1 18631914aeff51fcd89d226dbe3396ea91d21408 SHA256 b80403dc39008f53e50c47a04322a2046b257654653ef41a05aca29b3636fb2f DIST jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 RMD160 c6669cba980b9097c6921041ee3af8753587ea37 SHA1 f43776629e50834be1f25060bcbe7f8ee0483173 SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f DIST jdk-1_5_0_08-dlj-linux-i586.bin 49498712 RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 SHA1 e7bc2da45219c54f9ac0dcbe6b3b8bf7ead3cc4e SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 +DIST jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff SHA1 b3cd93b445ce68b8d4b88c4afa9a177473adf3f7 SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 +DIST jdk-1_5_0_09-dlj-linux-i586.bin 49504315 RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e SHA1 36a065b72af226804ff0b64b9c40859c7a879b6f SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 EBUILD sun-jre-bin-1.4.2.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 SHA1 a384cfc5f10c28512b3aed25256cbdb8683db5c4 SHA256 eb93119c3ccec0d85f0578441b467aeba4a68229df21c620e501a3addb23f4b2 MD5 e304bb1cc98f7f73fb6c74db329784b9 sun-jre-bin-1.4.2.12-r2.ebuild 4608 RMD160 e6891977904969bddbea013b8f46fb0ae0da1263 sun-jre-bin-1.4.2.12-r2.ebuild 4608 @@ -21,10 +23,14 @@ EBUILD sun-jre-bin-1.5.0.08-r1.ebuild 4329 RMD160 ebec6553b8c9b00884bff862c657db MD5 dc874e52a08e18f4f8796e87fdba9388 sun-jre-bin-1.5.0.08-r1.ebuild 4329 RMD160 ebec6553b8c9b00884bff862c657dbe57f0c7a12 sun-jre-bin-1.5.0.08-r1.ebuild 4329 SHA256 1eedf693f64280492818f76d829339db9c8234928b1d3823abbe06d6f6e8066f sun-jre-bin-1.5.0.08-r1.ebuild 4329 -MISC ChangeLog 12350 RMD160 83084333346d023326db40390587fe2ab8bc19e9 SHA1 38271253d23866b8ae1d5b97f8dd481f58f92e95 SHA256 0d74a45d39491285fcff74d1e1900d01182a745523d3bdc7ac24d6fc4abb8210 -MD5 f4fe4a1bea209eb1c465dac3f513b111 ChangeLog 12350 -RMD160 83084333346d023326db40390587fe2ab8bc19e9 ChangeLog 12350 -SHA256 0d74a45d39491285fcff74d1e1900d01182a745523d3bdc7ac24d6fc4abb8210 ChangeLog 12350 +EBUILD sun-jre-bin-1.5.0.09.ebuild 4291 RMD160 1b406162946f37959c078bdc02e7635487a4a6d5 SHA1 79f22008f0631d190465c042d48ef9214e29cc0b SHA256 6c32a641cf0e4356f847f082b89b86801399d67f776bde8e0b8b416171a50661 +MD5 49f71d6fabfa9443cbb20629331b1223 sun-jre-bin-1.5.0.09.ebuild 4291 +RMD160 1b406162946f37959c078bdc02e7635487a4a6d5 sun-jre-bin-1.5.0.09.ebuild 4291 +SHA256 6c32a641cf0e4356f847f082b89b86801399d67f776bde8e0b8b416171a50661 sun-jre-bin-1.5.0.09.ebuild 4291 +MISC ChangeLog 12486 RMD160 801626574933af76de8ed97856ae13d9609c8e57 SHA1 f0136c254717b0ca5ed1b2fe54a6f59208bff48c SHA256 ca24fbb482883b5b556e805a8fda011b86ebaba422ffeb3cb8e986482e57254f +MD5 82cabc0c9bde98d4255a72d56b6185a8 ChangeLog 12486 +RMD160 801626574933af76de8ed97856ae13d9609c8e57 ChangeLog 12486 +SHA256 ca24fbb482883b5b556e805a8fda011b86ebaba422ffeb3cb8e986482e57254f ChangeLog 12486 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -35,3 +41,6 @@ SHA256 3e71d56840f86073ed25b7d52c9f1afb8bd0f1c13d04f20efd53803ef670cb76 files/di MD5 20fa891f2c9e4953c1da7d1c318d3216 files/digest-sun-jre-bin-1.5.0.08-r1 563 RMD160 59f63ab1ef5f3a40c10ccd954d1cfa2ca47f4e15 files/digest-sun-jre-bin-1.5.0.08-r1 563 SHA256 36ee47fae9d203d6e249bd407da3fd700d2d4f672a258285010f1a44f38ea0b8 files/digest-sun-jre-bin-1.5.0.08-r1 563 +MD5 8409e421272b316b007ee383c1d8508b files/digest-sun-jre-bin-1.5.0.09 563 +RMD160 93a25e28b116cacea4f5295169e9bb091b46575b files/digest-sun-jre-bin-1.5.0.09 563 +SHA256 659534b6f9466273b0a3523c862d3272fe23191edcec6bb3044b536c9d9a8d4c files/digest-sun-jre-bin-1.5.0.09 563 diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 new file mode 100644 index 000000000000..fb32756cb7a5 --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.5.0.09 @@ -0,0 +1,6 @@ +MD5 a210623300238ebb230d47c774c25779 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 +RMD160 c7f4310ff6714d5dd33c10398c6615689f5523ff jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 +SHA256 3f7f21671ebcb9c849b02d668d85cf6f161870c45f5bf82f5e3fed2a026f7f35 jdk-1_5_0_09-dlj-linux-amd64.bin 43863154 +MD5 b937aef01669744686e84ac5f0cc3d97 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 +RMD160 8e4bc83d553bd0e92607bd2e03451ec879d5928e jdk-1_5_0_09-dlj-linux-i586.bin 49504315 +SHA256 3318644bdcd1a1de4ea122b03a4607de16f30603e7f6c291c33575cbbc254f85 jdk-1_5_0_09-dlj-linux-i586.bin 49504315 diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild new file mode 100644 index 000000000000..244903cdac81 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.09.ebuild,v 1.1 2006/11/19 20:22:19 nichoj Exp $ + +inherit java-vm-2 eutils + +MY_PVL=${PV%.*}_${PV##*.} +MY_PVA=${PV//./_} +#S="${WORKDIR}/jdk${MY_PVL}" + +X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" +AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" +if use x86; then + At=${X86_AT} +elif use amd64; then + At=${AMD64_AT} +fi +DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" +HOMEPAGE="http://java.sun.com/j2se/1.5.0/" +SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) + amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" +SLOT="1.5" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="nostrip" +IUSE="X alsa nsplugin" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + 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 + ) + virtual/x11 + ) + )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" + +# this is needed for proper operating under a PaX kernel without activated grsecurity acl +CHPAX_CONSERVATIVE_FLAGS="pemsv" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so" + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}. Please check the permission and try again." + fi + + mkdir bundled-jdk + cd bundled-jdk + sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash ${FILESDIR}/construct.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" +} + +src_install() { + local dirs="bin lib man" + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} javaws plugin" + dodir /opt/${P} + + for i in $dirs ; do + cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" + done + dodoc CHANGES README THIRDPARTYLICENSEREADME.txt + dohtml Welcome.html + dodir /opt/${P}/share/ + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + if use x86 ; then + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + else + eerror "No plugin available for amd64 arch" + fi + fi + + # TODO Don't think we still needs these -nichoj + # create dir for system preferences + #dodir /opt/${P}/jre/.systemPrefs + # Create files used as storage for system preferences. + #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock + #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock + #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile + #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile + + # FIXME figure out how to handle the control pannel conflict with + # sun-jdk-bin + + # 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}/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 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 java" + + for paxkills in "java" + do + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills + done + + # /opt/$VM/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/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 + + if ! use X; then + local xwarn="virtual/x11 and/or" + fi + + echo + ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." + ewarn "Be careful which Java libraries you attempt to use." +}