| 1 |
tomwij 14/01/23 23:03:54 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: emul-linux-x86-java-1.7.0.51.ebuild |
| 5 |
Log: |
| 6 |
Version bump to 1.7.0.51 for security bug #473980. |
| 7 |
|
| 8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.134 app-emulation/emul-linux-x86-java/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.134&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?rev=1.134&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog?r1=1.133&r2=1.134 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v |
| 20 |
retrieving revision 1.133 |
| 21 |
retrieving revision 1.134 |
| 22 |
diff -u -r1.133 -r1.134 |
| 23 |
--- ChangeLog 31 Dec 2013 16:55:46 -0000 1.133 |
| 24 |
+++ ChangeLog 23 Jan 2014 23:03:54 -0000 1.134 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for app-emulation/emul-linux-x86-java |
| 27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.133 2013/12/31 16:55:46 tomwij Exp $ |
| 29 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.134 2014/01/23 23:03:54 tomwij Exp $ |
| 31 |
+ |
| 32 |
+*emul-linux-x86-java-1.7.0.51 (23 Jan 2014) |
| 33 |
+ |
| 34 |
+ 23 Jan 2014; Tom Wijsman <TomWij@g.o> |
| 35 |
+ +emul-linux-x86-java-1.7.0.51.ebuild, +files/emul-linux-x86-java-1.7.env-r1: |
| 36 |
+ Version bump to 1.7.0.51 for security bug #473980. |
| 37 |
|
| 38 |
31 Dec 2013; Tom Wijsman <TomWij@g.o> -files/construct-1.6.sh: |
| 39 |
[QA] Remove unused files. |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: emul-linux-x86-java-1.7.0.51.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2014 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.7.0.51.ebuild,v 1.1 2014/01/23 23:03:54 tomwij Exp $ |
| 53 |
|
| 54 |
EAPI="5" |
| 55 |
|
| 56 |
inherit java-vm-2 eutils prefix versionator |
| 57 |
|
| 58 |
# This URIs need to be updated when bumping! |
| 59 |
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1880261.html" |
| 60 |
|
| 61 |
MY_PV="$(get_version_component_range 2)u$(get_version_component_range 4)" |
| 62 |
S_PV="$(replace_version_separator 3 '_')" |
| 63 |
|
| 64 |
X86_AT="jre-${MY_PV}-linux-i586.tar.gz" |
| 65 |
|
| 66 |
DESCRIPTION="Oracle's Java SE Runtime Environment (32bit)" |
| 67 |
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
| 68 |
SRC_URI="${X86_AT}" |
| 69 |
|
| 70 |
LICENSE="Oracle-BCLA-JavaSE" |
| 71 |
SLOT="1.7" |
| 72 |
KEYWORDS="-* ~amd64" |
| 73 |
IUSE="+X alsa nsplugin pax_kernel" |
| 74 |
|
| 75 |
RESTRICT="fetch strip" |
| 76 |
QA_PREBUILT="*" |
| 77 |
|
| 78 |
RDEPEND=" |
| 79 |
X? ( app-emulation/emul-linux-x86-xlibs ) |
| 80 |
alsa? ( app-emulation/emul-linux-x86-soundlibs )" |
| 81 |
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback |
| 82 |
# marking. #427642 |
| 83 |
DEPEND=" |
| 84 |
pax_kernel? ( sys-apps/paxctl )" |
| 85 |
|
| 86 |
S="${WORKDIR}/jre${S_PV}" |
| 87 |
|
| 88 |
pkg_nofetch() { |
| 89 |
einfo "Due to Oracle no longer providing the distro-friendly DLJ bundles, the package has become fetch restricted again." |
| 90 |
einfo "" |
| 91 |
einfo "Please download '${X86_AT}' from:" |
| 92 |
einfo "'${JRE_URI}'" |
| 93 |
einfo "and move it to '${DISTDIR}'" |
| 94 |
} |
| 95 |
|
| 96 |
src_compile() { |
| 97 |
# This needs to be done before CDS - #215225 |
| 98 |
java-vm_set-pax-markings "${S}" |
| 99 |
|
| 100 |
# see bug #207282 |
| 101 |
einfo "Creating the Class Data Sharing archives" |
| 102 |
bin/java -client -Xshare:dump || die |
| 103 |
bin/java -server -Xshare:dump || die |
| 104 |
} |
| 105 |
|
| 106 |
src_install() { |
| 107 |
local dest="/opt/${P}" |
| 108 |
local ddest="${ED}${dest}" |
| 109 |
|
| 110 |
# We should not need the ancient plugin for Firefox 2 anymore, plus it has |
| 111 |
# writable executable segments |
| 112 |
rm -vf lib/i386/libjavaplugin_oji.so \ |
| 113 |
lib/i386/libjavaplugin_nscp*.so |
| 114 |
rm -vrf plugin/i386 |
| 115 |
# Without nsplugin flag, also remove the new plugin |
| 116 |
arch=i386; |
| 117 |
if ! use nsplugin; then |
| 118 |
rm -vf lib/${arch}/libnpjp2.so \ |
| 119 |
lib/${arch}/libjavaplugin_jni.so |
| 120 |
fi |
| 121 |
|
| 122 |
dodir "${dest}" |
| 123 |
cp -pPR bin lib man "${ddest}" || die |
| 124 |
|
| 125 |
# Remove empty dirs we might have copied |
| 126 |
find "${D}" -type d -empty -exec rmdir {} + || die |
| 127 |
|
| 128 |
dodoc COPYRIGHT README |
| 129 |
|
| 130 |
if use nsplugin; then |
| 131 |
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so |
| 132 |
fi |
| 133 |
|
| 134 |
# Install desktop file for the Java Control Panel. |
| 135 |
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. |
| 136 |
# make_desktop_entry can't be used as ${P} would end up in filename. |
| 137 |
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ |
| 138 |
sun-jcontrol-${PN}-${SLOT}.png || die |
| 139 |
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT} (${PN})#" \ |
| 140 |
-e "s#Exec=.*#Exec=${dest}/bin/jcontrol#" \ |
| 141 |
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ |
| 142 |
-e "s#Application;##" \ |
| 143 |
-e "/Encoding/d" \ |
| 144 |
lib/desktop/applications/sun_java.desktop > \ |
| 145 |
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die |
| 146 |
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop |
| 147 |
|
| 148 |
# http://docs.oracle.com/javase/6/docs/technotes/guides/intl/fontconfig.html |
| 149 |
rm "${ddest}"/lib/fontconfig.* || die |
| 150 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die |
| 151 |
eprefixify "${T}"/fontconfig.properties |
| 152 |
insinto "${dest}"/lib/ |
| 153 |
doins "${T}"/fontconfig.properties |
| 154 |
|
| 155 |
set_java_env "${FILESDIR}/${VMHANDLE}.env-r1" |
| 156 |
java-vm_revdep-mask |
| 157 |
} |
Archives