Version bump, security bug #388055.

Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64

3 files changed, 165 insertions, 12 deletions

diff --git a/dev-java/oracle-jre-bin/ChangeLog b/dev-java/oracle-jre-bin/ChangeLog
index c74a93eda434..c12b6905f375 100644
--- a/dev-java/oracle-jre-bin/ChangeLog
+++ b/dev-java/oracle-jre-bin/ChangeLog
@@ -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.3 2011/09/15 04:23:32 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.4 2011/10/21 23:05:19 caster Exp $
+
+*oracle-jre-bin-1.7.0.1 (21 Oct 2011)
+
+  21 Oct 2011; Vlastimil Babka <caster@gentoo.org>
+  +oracle-jre-bin-1.7.0.1.ebuild:
+  Version bump, security bug #388055.
 
 *oracle-jre-bin-1.7.0-r1 (15 Sep 2011)
 
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest
index 87c6a3570a1c..f8e7fa3030ba 100644
--- a/dev-java/oracle-jre-bin/Manifest
+++ b/dev-java/oracle-jre-bin/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX fontconfig.Gentoo.properties 11196 RMD160 e11989b6be27297af68bdd7040439f4d3bd09916 SHA1 58a53f90a8d0409769d371f2e07b5bec27b02469 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c
 AUX oracle-jre-bin-1.7.env 1035 RMD160 e405b988e9779f846e925f397ddd40a6b3f762cb SHA1 698cc08d27e48ad0118933a6e7e4167136192c4a SHA256 fc49633539a944a9d684b2d33b8c4a25f2d6d68e82fe644adbf2a499c178617b
 DIST UnlimitedJCEPolicyJDK7.zip 7426 RMD160 a4a6a284579f43d2df3532d279e143d2f03c2c3f SHA1 7d3c9ee89536b82cd21c680088b1bced16017253 SHA256 7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d
 DIST jre-7-linux-i586.tar.gz 33749702 RMD160 a4f71c1ade289c62be0ae343df1efe7933809d6f SHA1 0da2bbc6982054332f71196fc1938be8926413ac SHA256 d0b7f2c48759462c07a96e0b28f2e937b3ccef7baf1c3c53dc3f28a840b7f1b6
 DIST jre-7-linux-x64.tar.gz 32344881 RMD160 cd543988ca038d74e103a7e2998d717800c3d4c9 SHA1 9eeaf1a1c6a98106ae50b1d3798e88588ad9ef9c SHA256 d829890d46295ab0cbfcbeb5c68ac7c90a5021689f7503c00b8bcf4bf9ea2f8d
+DIST jre-7u1-linux-i586.tar.gz 33753969 RMD160 653313221a0dc0c7b69e158b003c8658eee8f529 SHA1 04f58ab69b479d475933d2270876fd6c9e97a3b6 SHA256 76bfa6d7b80e077a399bf69fbc8e031ee8f4094be0b6d1e30e247e7341ae2d40
+DIST jre-7u1-linux-x64.tar.gz 32352700 RMD160 5e032865ffd75961decf959fe4f166833a4f7593 SHA1 fcbd35065ac6040b4160ca93ecd5cf6521885303 SHA256 41d9e1c3f51f7c5041ae9f1c3f200a716903d8d010d5a771e6672766ae95ee92
 EBUILD oracle-jre-bin-1.7.0-r1.ebuild 4389 RMD160 58c9b1654f0935dbbb87d27eaf79b65b84af3d26 SHA1 a83a6972874951a22f1f98fdd268271541314c18 SHA256 d4833229175e06cdd0738e2458a18ee5a478902566e13daed8e73b866bd2765e
-MISC ChangeLog 819 RMD160 17651ea39afbc0f08d38ee114a58287b8e77a30b SHA1 2bee5ff50c6967d49ea72bf5c807e2c0ba2e4620 SHA256 5d2fa6f672ac5f70ea9826263bf2c6f1929f2e907760a4186b55017423036b5c
+EBUILD oracle-jre-bin-1.7.0.1.ebuild 4436 RMD160 58c1e59a9a5f2fb4621360441cbdcc259778fa0b SHA1 c272d88e0c835162bbee95f7389165686245de54 SHA256 e955c2767c7d5c09e8fd28e6324cb8c2890064529413d7a309091cc7ae35cea8
+MISC ChangeLog 982 RMD160 faed8549765b3e13e0b933a953c18991d1e38ddb SHA1 87d410fb037aeb8d942ea86c09c618873ef10618 SHA256 e24156e04f9edeaa36a8ec609cee7f5fb54030d9d765dfe125a1978abf636a5d
 MISC metadata.xml 374 RMD160 4e6b6826d9ee188e0fa0b5a9a5e5d23b722e10f8 SHA1 0c90ab71e19ea1e34710e7944f268bd46943f57d SHA256 32decb0503e4843bf9157625a4c494955b4c93ccd079bec72da1c374c03b7fa8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5xfcsACgkQRh6X64ivZaLZoQCfbUWLx7gOLE3mXuLo4APvAkht
-AkAAnjNW8DN1AiTMTZ+98oayd2Ks2PQ6
-=6dlE
------END PGP SIGNATURE-----
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild
new file mode 100644
index 000000000000..8444711f7ecd
--- /dev/null
+++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.1.ebuild
@@ -0,0 +1,154 @@
+# 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.ebuild,v 1.1 2011/10/21 23:05:19 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
+
+	set_java_env
+	java-vm_revdep-mask
+}