Revbump to add sandbox.d addpredict file, bug #388127.
authorVlastimil Babka <caster@gentoo.org>
Fri, 4 Nov 2011 09:27:24 +0000 (09:27 +0000)
committerVlastimil Babka <caster@gentoo.org>
Fri, 4 Nov 2011 09:27:24 +0000 (09:27 +0000)
Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

dev-java/oracle-jdk-bin/ChangeLog
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild [new file with mode: 0644]
dev-java/oracle-jre-bin/ChangeLog
dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild [new file with mode: 0644]

index 60c3926ddc1475875b4f66af34c76d5cebefd841..bb322903a99e70de55f325d796a239d33203919a 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jdk-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.2 2011/10/21 23:00:04 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.3 2011/11/04 09:24:55 caster Exp $
+
+*oracle-jdk-bin-1.7.0.1-r1 (04 Nov 2011)
+
+  04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jdk-bin-1.7.0.1-r1.ebuild:
+  Revbump to add sandbox.d addpredict file, bug #388127.
 
 *oracle-jdk-bin-1.7.0.1 (21 Oct 2011)
 
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..21b9b3a
--- /dev/null
@@ -0,0 +1,168 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.7.0.1-r1.ebuild,v 1.1 2011/11/04 09:24:55 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils pax-utils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+X86_AT="jdk-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jdk-${MY_PV}-linux-x64.tar.gz"
+
+# check the URIs when bumping, no idea about their stability yet
+JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk-7u1-download-513651.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Development Kit"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )
+       jce? ( ${JCE_FILE} )"
+SLOT="1.7"
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch strip"
+IUSE="X alsa derby doc examples jce nsplugin"
+
+QA_TEXTRELS_x86="
+       opt/${P}/jre/lib/i386/client/libjvm.so
+       opt/${P}/jre/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( app-arch/unzip )"
+RDEPEND="${DEPEND}
+       doc? ( dev-java/java-sdk-docs:1.7 )
+       !prefix? ( sys-libs/glibc )
+       alsa? ( media-libs/alsa-lib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXrender
+               x11-libs/libXtst
+               x11-libs/libX11
+       )"
+
+S="${WORKDIR}/jdk${S_PV}"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       fi
+
+       einfo "Please download ${AT} from:"
+       einfo "${JDK_URI}"
+       einfo "and move it to ${DISTDIR}"
+
+       if use jce; then
+               einfo "Also download ${JCE_FILE} from:"
+               einfo ${JCE_URI}
+               einfo "and move it to ${DISTDIR}"
+       fi
+}
+
+src_prepare() {
+       if use jce; then
+               mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
+       fi
+}
+
+src_compile() {
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler. This needs to be done before CDS - #215225
+       pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+       # see bug #207282
+       einfo "Creating the Class Data Sharing archives"
+       if use x86; then
+               "${S}"/bin/java -client -Xshare:dump || die
+       fi
+       "${S}"/bin/java -server -Xshare:dump || die
+
+       # Create files used as storage for system preferences.
+       mkdir jre/.systemPrefs || die
+       touch jre/.systemPrefs/.system.lock || die
+       touch jre/.systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+       # We should not need the ancient plugin for Firefox 2 anymore, plus it has
+       # 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=${ARCH};
+       use x86 && arch=i386;
+       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 src.zip "${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
+       rmdir -v $(find "${D}" -type d -empty) || 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/${P}/jre/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       /opt/${P}/jre/lib/security/
+               dosym /opt/${P}/jre/lib/security/${JCE_DIR}/local_policy.jar \
+                       /opt/${P}/jre/lib/security/
+       fi
+
+       if use nsplugin; then
+               install_mozilla_plugin /opt/${P}/jre/lib/${arch}/libnpjp2.so
+       fi
+
+       # Install desktop file for the Java Control Panel. Using VMHANDLE as file
+       # name to prevent file collision with jre and or other slots.
+       [[ -f "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop ]] || die
+       sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JDK ${SLOT}/" \
+               -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
+               -e "s#Icon=.*#Icon=/opt/${P}/jre/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+               "${ED}"/opt/${P}/jre/lib/desktop/applications/sun_java.desktop > \
+               "${T}"/${VMHANDLE}.desktop
+
+       domenu "${T}"/${VMHANDLE}.desktop
+
+       # bug #56444
+       cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+       eprefixify "${T}"/fontconfig.properties
+       insinto /opt/${P}/jre/lib/
+       doins "${T}"/fontconfig.properties
+
+       # bug #388127
+       dodir /etc/sandbox.d
+       echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+
+       set_java_env
+       java-vm_revdep-mask
+}
index c12b6905f375bb41d5a372cd0a3daf8ed8789bb7..96abef622e9ffc3e089057dce49f7622b0225477 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/oracle-jre-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.4 2011/10/21 23:05:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.5 2011/11/04 09:27:24 caster Exp $
+
+*oracle-jre-bin-1.7.0.1-r1 (04 Nov 2011)
+
+  04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jre-bin-1.7.0.1-r1.ebuild:
+  Revbump to add sandbox.d addpredict file, bug #388127.
 
 *oracle-jre-bin-1.7.0.1 (21 Oct 2011)
 
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..b03bb42
--- /dev/null
@@ -0,0 +1,158 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1-r1.ebuild,v 1.1 2011/11/04 09:27:24 caster Exp $
+
+EAPI="4"
+
+inherit java-vm-2 eutils pax-utils prefix versionator
+
+UPDATE="$(get_version_component_range 4)"
+UPDATE="${UPDATE#0}"
+MY_PV="$(get_version_component_range 2)u${UPDATE}"
+S_PV="$(get_version_component_range 1-3)_0${UPDATE}"
+
+X86_AT="jre-${MY_PV}-linux-i586.tar.gz"
+AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz"
+
+# check the URIs when bumping, no idea about their stability yet
+JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre-7u1-download-513652.html"
+JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html"
+
+JCE_DIR="UnlimitedJCEPolicy"
+JCE_FILE="${JCE_DIR}JDK7.zip"
+
+DESCRIPTION="Oracle's Java SE Runtime Environment"
+HOMEPAGE="http://www.oracle.com/technetwork/java/javase/"
+SRC_URI="x86? ( ${X86_AT} )
+       amd64? ( ${AMD64_AT} )
+       jce? ( ${JCE_FILE} )"
+SLOT="1.7"
+LICENSE="Oracle-BCLA-JavaSE"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch strip"
+IUSE="X alsa jce nsplugin"
+
+QA_TEXTRELS_x86="
+       opt/${P}/lib/i386/client/libjvm.so
+       opt/${P}/lib/i386/server/libjvm.so"
+
+DEPEND="jce? ( app-arch/unzip )"
+RDEPEND="${DEPEND}
+       !prefix? ( sys-libs/glibc )
+       alsa? ( media-libs/alsa-lib )
+       X? (
+               x11-libs/libXext
+               x11-libs/libXi
+               x11-libs/libXrender
+               x11-libs/libXtst
+               x11-libs/libX11
+       )"
+
+S="${WORKDIR}/jre${S_PV}"
+
+pkg_nofetch() {
+       if use x86; then
+               AT=${X86_AT}
+       elif use amd64; then
+               AT=${AMD64_AT}
+       fi
+
+       einfo "Please download ${AT} from:"
+       einfo "${JRE_URI}"
+       einfo "and move it to ${DISTDIR}"
+
+       if use jce; then
+               einfo "Also download ${JCE_FILE} from:"
+               einfo ${JCE_URI}
+               einfo "and move it to ${DISTDIR}"
+       fi
+}
+
+src_prepare() {
+       if use jce; then
+               mv "${WORKDIR}"/${JCE_DIR} "${S}"/lib/security/ || die
+       fi
+}
+
+src_compile() {
+       # Set PaX markings on all JDK/JRE executables to allow code-generation on
+       # the heap by the JIT compiler. This needs to be done before CDS - #215225
+       pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
+
+       # see bug #207282
+       einfo "Creating the Class Data Sharing archives"
+       if use x86; then
+               "${S}"/bin/java -client -Xshare:dump || die
+       fi
+       "${S}"/bin/java -server -Xshare:dump || die
+
+       # Create files used as storage for system preferences.
+       mkdir .systemPrefs || die
+       touch .systemPrefs/.system.lock || die
+       touch .systemPrefs/.systemRootModFile || die
+}
+
+src_install() {
+       # We should not need the ancient plugin for Firefox 2 anymore, plus it has
+       # writable executable segments
+       if use x86; then
+               rm -vf lib/i386/libjavaplugin_oji.so \
+                       lib/i386/libjavaplugin_nscp*.so
+               rm -vrf plugin/i386
+       fi
+       # Without nsplugin flag, also remove the new plugin
+       local arch=${ARCH};
+       use x86 && arch=i386;
+       if ! use nsplugin; then
+               rm -vf lib/${arch}/libnpjp2.so \
+                       lib/${arch}/libjavaplugin_jni.so
+       fi
+
+       dodir /opt/${P}
+       cp -pPR bin lib man "${ED}"/opt/${P} || die
+
+       # Remove empty dirs we might have copied
+       rmdir -v $(find "${D}" -type d -empty) || die
+
+       dodoc COPYRIGHT README
+
+       if use jce; then
+               dodir /opt/${P}/lib/security/strong-jce
+               mv "${ED}"/opt/${P}/lib/security/US_export_policy.jar \
+                       "${ED}"/opt/${P}/lib/security/strong-jce || die
+               mv "${ED}"/opt/${P}/lib/security/local_policy.jar \
+                       "${ED}"/opt/${P}/lib/security/strong-jce || die
+               dosym /opt/${P}/lib/security/${JCE_DIR}/US_export_policy.jar \
+                       /opt/${P}/lib/security/
+               dosym /opt/${P}/lib/security/${JCE_DIR}/local_policy.jar \
+                       /opt/${P}/lib/security/
+       fi
+
+       if use nsplugin; then
+               install_mozilla_plugin /opt/${P}/lib/${arch}/libnpjp2.so
+       fi
+
+       # Install desktop file for the Java Control Panel. Using VMHANDLE as file
+       # name to prevent file collision with jre and or other slots.
+       [[ -f "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop ]] || die
+       sed -e "s/\(Name=\)Java/\1 Java Control Panel for Oracle JRE ${SLOT}/" \
+               -e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \
+               -e "s#Icon=.*#Icon=/opt/${P}/lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png#" \
+               "${ED}"/opt/${P}/lib/desktop/applications/sun_java.desktop > \
+               "${T}"/${VMHANDLE}.desktop
+
+       domenu "${T}"/${VMHANDLE}.desktop
+
+       # bug #56444
+       cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die
+       eprefixify "${T}"/fontconfig.properties
+       insinto /opt/${P}/lib/
+       doins "${T}"/fontconfig.properties
+
+       # bug #388127
+       dodir /etc/sandbox.d
+       echo 'SANDBOX_PREDICT="/dev/random:/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
+
+       set_java_env
+       java-vm_revdep-mask
+}