From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Sf63E-000342-6E for garchives@archives.gentoo.org; Thu, 14 Jun 2012 09:09:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE3D4E050C; Thu, 14 Jun 2012 09:09:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6BC7EE050C for ; Thu, 14 Jun 2012 09:09:02 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A32FE1B400F for ; Thu, 14 Jun 2012 09:09:01 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2309) id 62D032004B; Thu, 14 Jun 2012 09:09:00 +0000 (UTC) From: "Ralph Sennhauser (sera)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, sera@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-java/sun-jdk: ChangeLog sun-jdk-1.6.0.33.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog sun-jdk-1.6.0.33.ebuild X-VCS-Directories: dev-java/sun-jdk X-VCS-Committer: sera X-VCS-Committer-Name: Ralph Sennhauser Content-Type: text/plain; charset=utf8 Message-Id: <20120614090900.62D032004B@flycatcher.gentoo.org> Date: Thu, 14 Jun 2012 09:09:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e96d4e39-bfa1-4afe-b1aa-574ce3243d4a X-Archives-Hash: 68fd469bbfde7cfb2362d0e285de67d0 sera 12/06/14 09:09:00 Modified: ChangeLog Added: sun-jdk-1.6.0.33.ebuild Log: Security bump. #421073 Add ia64 support. =20 (Portage version: 2.1.10.62/cvs/Linux x86_64) Revision Changes Path 1.324 dev-java/sun-jdk/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/C= hangeLog?rev=3D1.324&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/C= hangeLog?rev=3D1.324&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/C= hangeLog?r1=3D1.323&r2=3D1.324 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v retrieving revision 1.323 retrieving revision 1.324 diff -u -r1.323 -r1.324 --- ChangeLog 8 May 2012 18:38:54 -0000 1.323 +++ ChangeLog 14 Jun 2012 09:09:00 -0000 1.324 @@ -1,6 +1,12 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.323 20= 12/05/08 18:38:54 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.324 20= 12/06/14 09:09:00 sera Exp $ + +*sun-jdk-1.6.0.33 (14 Jun 2012) + + 14 Jun 2012; Ralph Sennhauser +sun-jdk-1.6.0.33.ebui= ld: + Security bump. #421073 + Add ia64 support. =20 08 May 2012; Fabian Groffen sun-jdk-1.6.0.32.ebui= ld: Fix unpack on Solaris, rekeyword, bug #414795 1.1 dev-java/sun-jdk/sun-jdk-1.6.0.33.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/s= un-jdk-1.6.0.33.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/sun-jdk/s= un-jdk-1.6.0.33.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: sun-jdk-1.6.0.33.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2012 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.6.0.33.ebui= ld,v 1.1 2012/06/14 09:09:00 sera Exp $ EAPI=3D"4" inherit java-vm-2 eutils prefix versionator # This URIs need to be updated when bumping! JDK_URI=3D"http://www.oracle.com/technetwork/java/javase/downloads/jdk6-d= ownloads-1637591.html" MY_PV=3D"$(get_version_component_range 2)u$(get_version_component_range 4= )" S_PV=3D"$(replace_version_separator 3 '_')" X86_AT=3D"jdk-${MY_PV}-linux-i586.bin" AMD64_AT=3D"jdk-${MY_PV}-linux-x64.bin" IA64_AT=3D"jdk-${MY_PV}-linux-ia64.bin" SOL_X86_AT=3D"jdk-${MY_PV}-solaris-i586.sh" SOL_AMD64_AT=3D"jdk-${MY_PV}-solaris-x64.sh" SOL_SPARC_AT=3D"jdk-${MY_PV}-solaris-sparc.sh" SOL_SPARCv9_AT=3D"jdk-${MY_PV}-solaris-sparcv9.sh" X86_DEMOS=3D"jdk-${MY_PV}-linux-i586-demos.tar.gz" AMD64_DEMOS=3D"jdk-${MY_PV}-linux-x64-demos.tar.gz" IA64_DEMOS=3D"jdk-${MY_PV}-linux-ia64-demos.tar.gz" SOL_X86_DEMOS=3D"jdk-${MY_PV}-solaris-i586-demos.tar.Z" SOL_AMD64_DEMOS=3D"jdk-${MY_PV}-solaris-x64-demos.tar.Z" SOL_SPARC_DEMOS=3D"jdk-${MY_PV}-solaris-sparc-demos.tar.Z" SOL_SPARCv9_DEMOS=3D"jdk-${MY_PV}-solaris-sparcv9-demos.tar.Z" DESCRIPTION=3D"Oracle's Java SE Development Kit" HOMEPAGE=3D"http://www.oracle.com/technetwork/java/javase/" SRC_URI=3D" x86? ( ${X86_AT} examples? ( ${X86_DEMOS} ) ) amd64? ( ${AMD64_AT} examples? ( ${AMD64_DEMOS} ) ) ia64? ( ${IA64_AT} examples? ( ${IA64_DEMOS} ) ) x86-solaris? ( ${SOL_X86_AT} examples? ( ${SOL_X86_DEMOS} ) ) x64-solaris? ( ${SOL_X86_AT} ${SOL_AMD64_AT} examples? ( ${SOL_X86_DEMOS} ${SOL_AMD64_DEMOS} ) ) sparc-solaris? ( ${SOL_SPARC_AT} examples? ( ${SOL_SPARC_DEMOS} ) ) sparc64-solaris? ( ${SOL_SPARC_AT} ${SOL_SPARCv9_AT} examples? ( ${SOL_SPARC_DEMOS} ${SOL_SPARCv9_DEMOS} ) )" LICENSE=3D"Oracle-BCLA-JavaSE" SLOT=3D"1.6" KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-s= olaris ~x64-solaris ~x86-solaris" IUSE=3D"X alsa derby doc examples jce kernel_SunOS nsplugin +source" RESTRICT=3D"fetch strip" RDEPEND=3D" X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXtst ) alsa? ( media-libs/alsa-lib ) doc? ( dev-java/java-sdk-docs:1.6.0 ) jce? ( dev-java/sun-jce-bin:1.6 ) kernel_SunOS? ( app-arch/unzip ) !prefix? ( sys-libs/glibc )" S=3D"${WORKDIR}/jdk${S_PV}" _set_at() { if use x86; then AT=3D${X86_AT} elif use amd64; then AT=3D${AMD64_AT} elif use ia64; then AT=3D${IA64_AT} elif use x86-solaris; then AT=3D${SOL_X86_AT} elif use x64-solaris; then AT=3D"${SOL_X86_AT} and ${SOL_AMD64_AT}" elif use sparc-solaris; then AT=3D${SOL_SPARC_AT} elif use sparc64-solaris; then AT=3D"${SOL_SPARC_AT} and ${SOL_SPARCv9_AT}" fi } _set_demos() { if use x86; then DEMOS=3D${X86_DEMOS} elif use amd64; then DEMOS=3D${AMD64_DEMOS} elif use ia64; then DEMOS=3D${IA64_DEMOS} elif use x86-solaris; then DEMOS=3D${SOL_X86_DEMOS} elif use x64-solaris; then DEMOS=3D"${SOL_X86_DEMOS} and ${SOL_AMD64_DEMOS}" elif use sparc-solaris; then DEMOS=3D${SOL_SPARC_AT} elif use sparc64-solaris; then DEMOS=3D"${SOL_SPARC_AT_DEMOS} and ${SOL_SPARCv9_DEMOS}" fi } pkg_nofetch() { _set_at _set_demos einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles= , the package" einfo "has become fetch restricted again. Alternatives are switching to" einfo "dev-java/icedtea-bin:6 or the source-based dev-java/icedtea:6" einfo "" einfo "Please download ${AT} from:" einfo "${JDK_URI}" einfo "and move it to ${DISTDIR}" if use examples; then einfo "" einfo "Also download ${DEMOS} from:" einfo "${JDK_URI}" einfo "and move it to ${DISTDIR}" fi } _sol_src_unpack() { for i in ${AT}; do [[ ${i} =3D=3D "and" ]] && continue rm -f "${S}"/jre/{LICENSE,README} "${S}"/LICENSE # don't die on unzip, it always "fails" unzip "${DISTDIR}"/${i} done for f in $(find "${S}" -name "*.pack") ; do "${S}"/bin/unpack200 ${f} ${f%.pack}.jar rm ${f} done if use examples ; then for i in ${DEMOS}; do [[ ${i} =3D=3D "and" ]] && continue use examples && unpack ${i} done mv "${WORKDIR}"/SUNWj6dmo/reloc/jdk/instances/jdk1.6.0/{demo,sample} \ "${S}"/ || die fi } src_unpack() { _set_at _set_demos if use kernel_SunOS; then _sol_src_unpack else sh "${DISTDIR}"/${AT} -noregister || die "Failed to unpack" use examples && unpack ${DEMOS} fi } 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" if use x86; then bin/java -client -Xshare:dump || die fi # limit heap size for large memory on x86 #405239 # this is a workaround and shouldn't be needed. bin/java -server -Xmx64m -Xshare:dump || die } src_install() { # We should not need the ancient plugin for Firefox 2 anymore, plus it h= as # writable executable segments if use x86; then rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ {,jre/}lib/i386/libjavaplugin_nscp*.so rm -vrf jre/plugin/i386 fi # Without nsplugin flag, also remove the new plugin local arch=3D${ARCH}; use x86 && arch=3Di386; if ! use nsplugin; then rm -vf {,jre/}lib/${arch}/libnpjp2.so \ {,jre/}lib/${arch}/libjavaplugin_jni.so fi dodir /opt/${P} cp -pPR bin include jre lib man "${ED}"/opt/${P} || die if use derby; then cp -pPR db "${ED}"/opt/${P} || die fi if use examples; then cp -pPR demo sample "${ED}"/opt/${P} || die fi # Remove empty dirs we might have copied find "${D}" -type d -empty -exec rmdir -v {} + || die dodoc COPYRIGHT dohtml README.html if use jce; then dodir /opt/${P}/jre/lib/security/strong-jce mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar \ "${ED}"/opt/${P}/jre/lib/security/strong-jce || die mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar \ "${ED}"/opt/${P}/jre/lib/security/strong-jce || die dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_p= olicy.jar \ /opt/${P}/jre/lib/security/US_export_policy.jar dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_polic= y.jar \ /opt/${P}/jre/lib/security/local_policy.jar fi if use nsplugin; then install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so fi if use source; then cp src.zip "${ED}"/opt/${P} || die fi # Install desktop file for the Java Control Panel. # Using ${PN}-${SLOT} to prevent file collision with jre and or other sl= ots. # make_desktop_entry can't be used as ${P} would end up in filename. newicon jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ sun-jcontrol-${PN}-${SLOT}.png || die sed -e "s#Name=3D.*#Name=3DJava Control Panel for Oracle JDK ${SLOT} (su= n-jdk)#" \ -e "s#Exec=3D.*#Exec=3D/opt/${P}/jre/bin/jcontrol#" \ -e "s#Icon=3D.*#Icon=3Dsun-jcontrol-${PN}-${SLOT}.png#" \ jre/lib/desktop/applications/sun_java.desktop > \ "${T}"/jcontrol-${PN}-${SLOT}.desktop || die domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop # bug #56444 cp "${FILESDIR}"/fontconfig.Gentoo.properties-r1 "${T}"/fontconfig.prope= rties || die eprefixify "${T}"/fontconfig.properties insinto /opt/${P}/jre/lib/ doins "${T}"/fontconfig.properties set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" java-vm_revdep-mask } QA_TEXTRELS_x86=3D" opt/${P}/jre/lib/i386/client/libjvm.so opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so" QA_FLAGS_IGNORED=3D" /opt/${P}/bin/appletviewer /opt/${P}/bin/apt /opt/${P}/bin/extcheck /opt/${P}/bin/idlj /opt/${P}/bin/jar /opt/${P}/bin/jarsigner /opt/${P}/bin/java /opt/${P}/bin/javac /opt/${P}/bin/javadoc /opt/${P}/bin/javah /opt/${P}/bin/javap /opt/${P}/bin/javaws /opt/${P}/bin/jconsole /opt/${P}/bin/jdb /opt/${P}/bin/jhat /opt/${P}/bin/jinfo /opt/${P}/bin/jmap /opt/${P}/bin/jps /opt/${P}/bin/jrunscript /opt/${P}/bin/jsadebugd /opt/${P}/bin/jstack /opt/${P}/bin/jstat /opt/${P}/bin/jstatd /opt/${P}/bin/keytool /opt/${P}/bin/native2ascii /opt/${P}/bin/orbd /opt/${P}/bin/pack200 /opt/${P}/bin/policytool /opt/${P}/bin/rmic /opt/${P}/bin/rmid /opt/${P}/bin/rmiregistry /opt/${P}/bin/schemagen /opt/${P}/bin/serialver /opt/${P}/bin/servertool /opt/${P}/bin/tnameserv /opt/${P}/bin/unpack200 /opt/${P}/bin/wsgen /opt/${P}/bin/wsimport /opt/${P}/bin/xjc /opt/${P}/demo/jvmti/gctest/lib/libgctest.so /opt/${P}/demo/jvmti/heapTracker/lib/libheapTracker.so /opt/${P}/demo/jvmti/heapViewer/lib/libheapViewer.so /opt/${P}/demo/jvmti/minst/lib/libminst.so /opt/${P}/demo/jvmti/mtrace/lib/libmtrace.so /opt/${P}/demo/jvmti/versionCheck/lib/libversionCheck.so /opt/${P}/demo/jvmti/waiters/lib/libwaiters.so /opt/${P}/jre/bin/java /opt/${P}/jre/bin/java_vm /opt/${P}/jre/bin/javaws /opt/${P}/jre/bin/keytool /opt/${P}/jre/bin/orbd /opt/${P}/jre/bin/pack200 /opt/${P}/jre/bin/policytool /opt/${P}/jre/bin/rmid /opt/${P}/jre/bin/rmiregistry /opt/${P}/jre/bin/servertool /opt/${P}/jre/bin/tnameserv /opt/${P}/jre/bin/unpack200 /opt/${P}/jre/lib/jexec /opt/${P}/lib/jexec /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofil= erinterface.so /opt/${P}/lib/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofil= erinterface.so" for java_system_arch in amd64 i386; do QA_FLAGS_IGNORED+=3D" /opt/${P}/jre/lib/${java_system_arch}/headless/libmawt.so /opt/${P}/jre/lib/${java_system_arch}/jli/libjli.so /opt/${P}/jre/lib/${java_system_arch}/libattach.so /opt/${P}/jre/lib/${java_system_arch}/libawt.so /opt/${P}/jre/lib/${java_system_arch}/libcmm.so /opt/${P}/jre/lib/${java_system_arch}/libdcpr.so /opt/${P}/jre/lib/${java_system_arch}/libdeploy.so /opt/${P}/jre/lib/${java_system_arch}/libdt_socket.so /opt/${P}/jre/lib/${java_system_arch}/libfontmanager.so /opt/${P}/jre/lib/${java_system_arch}/libhprof.so /opt/${P}/jre/lib/${java_system_arch}/libinstrument.so /opt/${P}/jre/lib/${java_system_arch}/libioser12.so /opt/${P}/jre/lib/${java_system_arch}/libj2gss.so /opt/${P}/jre/lib/${java_system_arch}/libj2pcsc.so /opt/${P}/jre/lib/${java_system_arch}/libj2pkcs11.so /opt/${P}/jre/lib/${java_system_arch}/libjaas_unix.so /opt/${P}/jre/lib/${java_system_arch}/libjava_crw_demo.so /opt/${P}/jre/lib/${java_system_arch}/libjavaplugin_jni.so /opt/${P}/jre/lib/${java_system_arch}/libjava.so /opt/${P}/jre/lib/${java_system_arch}/libjawt.so /opt/${P}/jre/lib/${java_system_arch}/libJdbcOdbc.so /opt/${P}/jre/lib/${java_system_arch}/libjdwp.so /opt/${P}/jre/lib/${java_system_arch}/libjpeg.so /opt/${P}/jre/lib/${java_system_arch}/libjsig.so /opt/${P}/jre/lib/${java_system_arch}/libjsoundalsa.so /opt/${P}/jre/lib/${java_system_arch}/libjsound.so /opt/${P}/jre/lib/${java_system_arch}/libmanagement.so /opt/${P}/jre/lib/${java_system_arch}/libmlib_image.so /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod_g.so /opt/${P}/jre/lib/${java_system_arch}/libnative_chmod.so /opt/${P}/jre/lib/${java_system_arch}/libnet.so /opt/${P}/jre/lib/${java_system_arch}/libnio.so /opt/${P}/jre/lib/${java_system_arch}/libnpjp2.so /opt/${P}/jre/lib/${java_system_arch}/libnpt.so /opt/${P}/jre/lib/${java_system_arch}/librmi.so /opt/${P}/jre/lib/${java_system_arch}/libsaproc.so /opt/${P}/jre/lib/${java_system_arch}/libsplashscreen.so /opt/${P}/jre/lib/${java_system_arch}/libunpack.so /opt/${P}/jre/lib/${java_system_arch}/libverify.so /opt/${P}/jre/lib/${java_system_arch}/libzip.so /opt/${P}/jre/lib/${java_system_arch}/motif21/libmawt.so /opt/${P}/jre/lib/${java_system_arch}/native_threads/libhpi.so /opt/${P}/jre/lib/${java_system_arch}/server/libjvm.so /opt/${P}/jre/lib/${java_system_arch}/xawt/libmawt.so" done