From 691573e754b5ac7e1f90039ecdb24353154d0496 Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Wed, 6 Mar 2013 09:33:18 +0000 Subject: Security bump. #460360 Package-Manager: portage-2.1.11.52/cvs/Linux x86_64 Manifest-Sign-Key: 0x3C5CF75A --- app-emulation/emul-linux-x86-java/ChangeLog | 8 +- app-emulation/emul-linux-x86-java/Manifest | 20 ++-- .../emul-linux-x86-java-1.6.0.39.ebuild | 112 --------------------- .../emul-linux-x86-java-1.6.0.43.ebuild | 112 +++++++++++++++++++++ 4 files changed, 129 insertions(+), 123 deletions(-) delete mode 100644 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.39.ebuild create mode 100644 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild (limited to 'app-emulation') diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index f7a7816f7fb5..6f0b51a71bfa 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.126 2013/02/24 08:23:51 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.127 2013/03/06 09:33:09 sera Exp $ + +*emul-linux-x86-java-1.6.0.43 (06 Mar 2013) + + 06 Mar 2013; Ralph Sennhauser + -emul-linux-x86-java-1.6.0.39.ebuild, +emul-linux-x86-java-1.6.0.43.ebuild: + Security bump. #460360 24 Feb 2013; Ralph Sennhauser emul-linux-x86-java-1.6.0.41.ebuild: diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index 721db4cdf6f0..35f1185c1cb0 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -4,20 +4,20 @@ Hash: SHA256 AUX construct-1.6.sh 6799 SHA256 4369309ba29da4dcdbda4ea614e2db00ff7e3a801fa58b897de818fe33d78e80 SHA512 a625b1b414f63370ce802669d569ee254f7f256a927a267629267a60bf66c5d887e1557b83d21a602008b39222499d56e20cad17b0ab5dbfc13d44e8f7b0ba69 WHIRLPOOL 69459effacb42f56d339ec8010b22e5c0ede7c7a35657f42e08ead5928039c4394031c1e210914131c86d563f8c1e7b5b23ef9b2e11233c69038b6641dfb9b48 AUX emul-linux-x86-java-1.6.env-r1 969 SHA256 841a8e27157b8bcc6a526bf69716ba0d0fe259255f20ec861a9fbcc2794b9df4 SHA512 c6f257971d1ad52b1af6041f84978d7029598b7abef7bd25e3d4f7e83cf170325fc80a53eaad70085bc1f45f14af6f0dc322ac729535fd6e0c80704dedb32811 WHIRLPOOL 33d29b11ef6ebe62672cb4a483867e2e38cd73827f902ed3b4d1784a466c266446b8306447e9c7ed175d7b4e416165159aef51a73b31a14df611efdeca185fed AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6 -DIST jre-6u39-linux-i586.bin 21712508 SHA256 7d1f855e33cc756875ce2f0595254ac7ff694d99540102a6f4426824657f191b SHA512 ea7c6e3e10be63ef6afd6e138ca3bc7d3a27102ee929636b7eceb3d542e0b58e9cf1ea776a627ef12aec02940a4e2201d13b7c410715a651b1032d8175c41301 WHIRLPOOL b5dba1fb60dc0862939e8b993f89411eeb36d026941d8c1674b982489590684de2220e0996ecb8aebd3f737cd2718cc3ea9f3089d8677ee9b45448725991f98f DIST jre-6u41-linux-i586.bin 21726301 SHA256 e89181b56652face6db2704cfbeded2774c27e413f080875a2cea90a45519ad0 SHA512 ddb05f6ecc2cb25122125a16575249002919866a1ab31fdc200bfd4cffeb4b31466987dd434b8efe3b87be1740bcc97162091eaeb2058ee0a34cc684518d2623 WHIRLPOOL f6dea559c0d97b9a465c7d68601fe96603e51c0814e34e93f49c851aa06254389a30e84130549c8ffdcbb3fb360dc261825ef0c01dac5f7d1700571a00bcc2b8 -EBUILD emul-linux-x86-java-1.6.0.39.ebuild 3461 SHA256 a5fb82f2151eaf70c53df1b2ee576501d66291cbf0217aa59edce8daf7cc92d2 SHA512 f87c1750591c95b98d86068418a97dfcd92de88a4b39d17ab22952b384c8adfd86fef5696e2830e44cd34c5012523221680f7d537371a00f05be164f6a545f9c WHIRLPOOL 9f979ebfe06c7c1e2776f264c25fa744c3013b4a8581ad015931bc82321b1cf4682534a8d852bde849a426632ec98cc4277c808b2987a92fea0a916dcfaf5e86 +DIST jre-6u43-linux-i586.bin 21727684 SHA256 e6bb81281f661580ea0351726611e064ba95d929f83a7a9f9b71e5ac50d315a3 SHA512 25ca97b5d0811b430fc546c4efa5b8fbdb4cd7bb677370600f8333d8e4e70bb511a5db2b0a4fafc84b5abad099d678f64727d6dcde0fb609795db4ef2f5981b0 WHIRLPOOL 10d0549661a69c61144be9a477c77edf844ee7b1c2f8941f30230157261db6cb8297e5c4217980409b3416cc979e0289fedc330142e97a0a364ae60c9577291e EBUILD emul-linux-x86-java-1.6.0.41.ebuild 3462 SHA256 6b265c77f3310dedf7e18c7177c8ae2bf12b2926a921df79a899e9b776babd3c SHA512 a338fd04539769baa2a32266e254bc9014cd8e202a4bf08f528d52c5c0bf6eb0b18cba5c9242a4e5b7eeb0cf0b340547db27485c198710ffc427fe1ad6609f05 WHIRLPOOL b3eb4de88ddb8ca03a440be43e05486cecbfa2dbebf34f429d4b3dac7e2e2f4c9e3f2140e5ee6da07ee5dd0713a815a7f33627a1057c742cc91856ad3694f667 -MISC ChangeLog 25344 SHA256 7569fb5d3016e7f961ea7d5cf79aac77a24a05941122189caa2204920757be83 SHA512 909e8d9172982f5248cf895e992e0c51fd90c3e593fce6705d43f150a9971c720b5f77bab0d78723af29b3ec7ceb965aa3a96dd8858e5031d717c7ed20788d3b WHIRLPOOL d55e95b10072e320d847128b80b9f0f5486f55a515baa40dc409ea3927172f0785fc72934c291c2a913be42dea176c93541d7c694b099567ab953b836ea6752e +EBUILD emul-linux-x86-java-1.6.0.43.ebuild 3463 SHA256 4f05e0cf92984b368164b441b963ba29a8c63de374e9b2e00b385bf2adf53bd0 SHA512 76dcac5130aa2a9a6cabe3b479a2378f7728f69ccb4ba143227a195f1aa50e3cf22f0006a45ca9bd6eeb58ded359b9dd807796a382894528262b28a7596fc566 WHIRLPOOL b01f8489598bb973b7af80f44446fe16b745fbad08fde33fc12e6a1f81b6e4a4a56e449f04929266cb3964681a554117eded01085841a7c1ad13598fad8bece6 +MISC ChangeLog 25543 SHA256 5eb8ed9122153331bebad00a32099974ae1c7f872837be961fc46e3396d7d337 SHA512 b5d923fc29c0bb5752863e24103f4e3ff46f324790b24685c38d99c79b8fcc13144d6bdf70dcb290f6d5831bc053e6375a066c177c33d4a6ec74dd297733505b WHIRLPOOL 7052c01452348255484a6fb0d9a4eab8e8452549f7406d7162b762c6d4e36f115f4047e892886a677b1f865f2e326007710ba84df9d44e900b7223640299a865 MISC metadata.xml 270 SHA256 68c40f50bd74b9038081e459c015f5786407bce5a45e2e1614566739d70cb21c SHA512 58bf7182934eb5030bae7032efde8e8b277fb4820a256d271a501904ded69b19937b1d17058ef770e3ecb7a526739bd1fae7d2163b5332fdd7e5c782cfbc647d WHIRLPOOL bf2557c8836c581b51c65a2f2488c77192072524696f36615a309d2bdb74ea7ed069f73438fe7ee0b5b83aaa7cf20162ffcdd5cbc6469411116e75805b67aeb4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRKc4iAAoJELjwI6Q8XPdatsYH/06yGcyqlqAXUG3V0BnzIa6g -/qxXZO0dcTAR8R+8juJqfJojxZQFLCc/M8HNcswAAicbWzL7Kt/YY6RYQCtKonLK -kek68ljVM9PIrDbVok0YRV7CehTHxHOfXWRpgtXyir1RVDBmOEUj4ZVTvVsY6siD -XP0ZlCrQuM41v3gXuPZdvxQ9FPlNvJ7NZVxxXL8wUXO8VlblAmzclwlBtgDb0pGE -fYXWUs30E5o9RmxTyIIRdwyUsb2aKs41kRBmUuz7zuzljT5KZY8sgHRt3YwXuR2K -cezzzIsUz+qEuty4iRGjr3q0erC79slzfRQMiWweD+28uIvByWYhYriq7S9tOLM= -=DDfX +iQEcBAEBCAAGBQJRNw1dAAoJELjwI6Q8XPda1wwH/jqdKPIuKeWv/LLqmLgRtp01 +DkQrxuwYkcwaNZgn5aqctlpM4PXIzsr6lGT/rzrYyRkZtliWgKshfgGH2ixkozlT +13xLqlmPiyX+uvv0f4KY8i66BXnEMSAJS1OMdFhMYPzvsl+1TjK2IVUdFoS+qND8 +Lz2jP4AiJZNMiJFW5zYMz8O/LboFS2GL6aPk0NBILlVmPWEXapN5u9Vipk5qiEX7 +8C27MDNdbgrBrvjHuqqv9ImGSvpm1o5cdHgOpzZL2s3ga+7rO0l3A1YoqX1xI3/s +w/XW+Hxrz8iTJxOKwuz159M2oug1SPPZd+3AfH/4pGY8zm9kQrGgRDl6/LT4EPg= +=hxCd -----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.39.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.39.ebuild deleted file mode 100644 index 243490120634..000000000000 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.39.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.39.ebuild,v 1.2 2013/02/03 17:02:23 ago Exp $ - -EAPI="5" - -inherit java-vm-2 eutils prefix versionator - -# This URIs need to be updated when bumping! -JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html" - -MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" -S_PV="$(replace_version_separator 3 '_')" - -X86_AT="jre-${MY_PV}-linux-i586.bin" - -DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -SRC_URI="${X86_AT}" - -LICENSE="Oracle-BCLA-JavaSE" -SLOT="1.6" -KEYWORDS="-* amd64" -IUSE="+X alsa nsplugin pax_kernel" - -RESTRICT="fetch strip" -QA_PREBUILT="*" - -RDEPEND=" - X? ( app-emulation/emul-linux-x86-xlibs ) - alsa? ( app-emulation/emul-linux-x86-soundlibs )" -# scanelf won't create a PaX header, so depend on paxctl to avoid fallback -# marking. #427642 -DEPEND=" - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jre${S_PV}" - -pkg_nofetch() { - einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." - einfo "" - einfo "Please download '${X86_AT}' from:" - einfo "'${JRE_URI}'" - einfo "and move it to '${DISTDIR}'" -} - -src_unpack() { - sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" -} - -src_compile() { - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${S}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - bin/java -client -Xshare:dump || die - bin/java -server -Xshare:dump || die -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest}" - - # We should not need the ancient plugin for Firefox 2 anymore, plus it has - # writable executable segments - rm -vf lib/i386/libjavaplugin_oji.so \ - lib/i386/libjavaplugin_nscp*.so - rm -vrf plugin/i386 - # Without nsplugin flag, also remove the new plugin - arch=i386; - if ! use nsplugin; then - rm -vf lib/${arch}/libnpjp2.so \ - lib/${arch}/libjavaplugin_jni.so - fi - - dodir "${dest}" - cp -pPR bin lib man "${ddest}" || die - - # Remove empty dirs we might have copied - find "${D}" -type d -empty -exec rmdir {} + || die - - dodoc COPYRIGHT README - - if use nsplugin; then - install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so - fi - - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. - # make_desktop_entry can't be used as ${P} would end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ - -e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop > \ - "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - - # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/lib/fontconfig.* || die - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - - set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" - java-vm_revdep-mask -} diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild new file mode 100644 index 000000000000..8800f300dbcd --- /dev/null +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.43.ebuild,v 1.1 2013/03/06 09:33:09 sera Exp $ + +EAPI="5" + +inherit java-vm-2 eutils prefix versionator + +# This URIs need to be updated when bumping! +JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre6downloads-1902815.html" + +MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" +S_PV="$(replace_version_separator 3 '_')" + +X86_AT="jre-${MY_PV}-linux-i586.bin" + +DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)" +HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" +SRC_URI="${X86_AT}" + +LICENSE="Oracle-BCLA-JavaSE" +SLOT="1.6" +KEYWORDS="-* ~amd64" +IUSE="+X alsa nsplugin pax_kernel" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +RDEPEND=" + X? ( app-emulation/emul-linux-x86-xlibs ) + alsa? ( app-emulation/emul-linux-x86-soundlibs )" +# scanelf won't create a PaX header, so depend on paxctl to avoid fallback +# marking. #427642 +DEPEND=" + pax_kernel? ( sys-apps/paxctl )" + +S="${WORKDIR}/jre${S_PV}" + +pkg_nofetch() { + einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." + einfo "" + einfo "Please download '${X86_AT}' from:" + einfo "'${JRE_URI}'" + einfo "and move it to '${DISTDIR}'" +} + +src_unpack() { + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" +} + +src_compile() { + # This needs to be done before CDS - #215225 + java-vm_set-pax-markings "${S}" + + # see bug #207282 + einfo "Creating the Class Data Sharing archives" + bin/java -client -Xshare:dump || die + bin/java -server -Xshare:dump || die +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + rm -vf lib/i386/libjavaplugin_oji.so \ + lib/i386/libjavaplugin_nscp*.so + rm -vrf plugin/i386 + # Without nsplugin flag, also remove the new plugin + arch=i386; + if ! use nsplugin; then + rm -vf lib/${arch}/libnpjp2.so \ + lib/${arch}/libjavaplugin_jni.so + fi + + dodir "${dest}" + cp -pPR bin lib man "${ddest}" || die + + # Remove empty dirs we might have copied + find "${D}" -type d -empty -exec rmdir {} + || die + + dodoc COPYRIGHT README + + if use nsplugin; then + install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so + fi + + # Install desktop file for the Java Control Panel. + # Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. + # make_desktop_entry can't be used as ${P} would end up in filename. + newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ + sun-jcontrol-${PN}-${SLOT}.png || die + sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ + -e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + lib/desktop/applications/sun_java.desktop > \ + "${T}"/jcontrol-${PN}-${SLOT}.desktop || die + domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop + + # http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html + rm "${ddest}"/lib/fontconfig.* || die + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/lib/ + doins "${T}"/fontconfig.properties + + set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" + java-vm_revdep-mask +} -- cgit v1.2.3-65-gdbad