1 |
caster 12/08/31 10:31:04 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: oracle-jre-bin-1.7.0.7.ebuild |
5 |
Log: |
6 |
Version bump, security bug #433094. |
7 |
|
8 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.21 dev-java/oracle-jre-bin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.21&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?rev=1.21&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog?r1=1.20&r2=1.21 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v |
20 |
retrieving revision 1.20 |
21 |
retrieving revision 1.21 |
22 |
diff -u -r1.20 -r1.21 |
23 |
--- ChangeLog 19 Aug 2012 10:03:35 -0000 1.20 |
24 |
+++ ChangeLog 31 Aug 2012 10:31:04 -0000 1.21 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for dev-java/oracle-jre-bin |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.20 2012/08/19 10:03:35 patrick Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/ChangeLog,v 1.21 2012/08/31 10:31:04 caster Exp $ |
30 |
+ |
31 |
+*oracle-jre-bin-1.7.0.7 (31 Aug 2012) |
32 |
+ |
33 |
+ 31 Aug 2012; Vlastimil Babka <caster@g.o> |
34 |
+ +oracle-jre-bin-1.7.0.7.ebuild: |
35 |
+ Version bump, security bug #433094. |
36 |
|
37 |
*oracle-jre-bin-1.7.0.6 (19 Aug 2012) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: oracle-jre-bin-1.7.0.7.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2012 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jre-bin/oracle-jre-bin-1.7.0.7.ebuild,v 1.1 2012/08/31 10:31:04 caster Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
|
55 |
inherit java-vm-2 eutils prefix versionator |
56 |
|
57 |
UPDATE="$(get_version_component_range 4)" |
58 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
59 |
S_PV="$(get_version_component_range 1-3)_0${UPDATE}" |
60 |
|
61 |
X86_AT="jre-${MY_PV}-linux-i586.tar.gz" |
62 |
AMD64_AT="jre-${MY_PV}-linux-x64.tar.gz" |
63 |
|
64 |
# This URIs need updating when bumping! |
65 |
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre7-downloads-1637588.html" |
66 |
JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html" |
67 |
|
68 |
JCE_DIR="UnlimitedJCEPolicy" |
69 |
JCE_FILE="${JCE_DIR}JDK7.zip" |
70 |
|
71 |
DESCRIPTION="Oracle's Java SE Runtime Environment" |
72 |
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
73 |
SRC_URI=" |
74 |
x86? ( ${X86_AT} ) |
75 |
amd64? ( ${AMD64_AT} ) |
76 |
jce? ( ${JCE_FILE} )" |
77 |
|
78 |
LICENSE="Oracle-BCLA-JavaSE" |
79 |
SLOT="1.7" |
80 |
KEYWORDS="~amd64 ~x86" |
81 |
|
82 |
IUSE="X alsa fontconfig jce nsplugin pax_kernel" |
83 |
RESTRICT="fetch strip" |
84 |
|
85 |
RDEPEND=" |
86 |
X? ( |
87 |
x11-libs/libXext |
88 |
x11-libs/libXi |
89 |
x11-libs/libXrender |
90 |
x11-libs/libXtst |
91 |
x11-libs/libX11 |
92 |
) |
93 |
alsa? ( media-libs/alsa-lib ) |
94 |
fontconfig? ( media-libs/fontconfig ) |
95 |
!prefix? ( sys-libs/glibc )" |
96 |
# scanelf won't create a PaX header, so depend on paxctl to avoid fallback |
97 |
# marking. #427642 |
98 |
DEPEND=" |
99 |
jce? ( app-arch/unzip ) |
100 |
pax_kernel? ( sys-apps/paxctl )" |
101 |
|
102 |
S="${WORKDIR}/jre${S_PV}" |
103 |
|
104 |
pkg_nofetch() { |
105 |
if use x86; then |
106 |
AT=${X86_AT} |
107 |
elif use amd64; then |
108 |
AT=${AMD64_AT} |
109 |
fi |
110 |
|
111 |
einfo "Please download ${AT} from:" |
112 |
einfo "${JRE_URI}" |
113 |
einfo "and move it to ${DISTDIR}" |
114 |
|
115 |
if use jce; then |
116 |
einfo "Also download ${JCE_FILE} from:" |
117 |
einfo "${JCE_URI}" |
118 |
einfo "and move it to ${DISTDIR}" |
119 |
fi |
120 |
} |
121 |
|
122 |
src_prepare() { |
123 |
if use jce; then |
124 |
mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
125 |
fi |
126 |
} |
127 |
|
128 |
src_compile() { |
129 |
# This needs to be done before CDS - #215225 |
130 |
java-vm_set-pax-markings "${S}" |
131 |
|
132 |
# see bug #207282 |
133 |
einfo "Creating the Class Data Sharing archives" |
134 |
if use x86; then |
135 |
bin/java -client -Xshare:dump || die |
136 |
fi |
137 |
bin/java -server -Xshare:dump || die |
138 |
|
139 |
# Create files used as storage for system preferences. |
140 |
mkdir .systemPrefs || die |
141 |
touch .systemPrefs/.system.lock || die |
142 |
touch .systemPrefs/.systemRootModFile || die |
143 |
} |
144 |
|
145 |
src_install() { |
146 |
local dest="/opt/${P}" |
147 |
local ddest="${ED}${dest}" |
148 |
|
149 |
# We should not need the ancient plugin for Firefox 2 anymore, plus it has |
150 |
# writable executable segments |
151 |
if use x86; then |
152 |
rm -vf lib/i386/libjavaplugin_oji.so \ |
153 |
lib/i386/libjavaplugin_nscp*.so |
154 |
rm -vrf plugin/i386 |
155 |
fi |
156 |
# Without nsplugin flag, also remove the new plugin |
157 |
local arch=${ARCH}; |
158 |
use x86 && arch=i386; |
159 |
if ! use nsplugin; then |
160 |
rm -vf lib/${arch}/libnpjp2.so \ |
161 |
lib/${arch}/libjavaplugin_jni.so |
162 |
fi |
163 |
|
164 |
dodir "${dest}" |
165 |
cp -pPR bin lib man "${ddest}" || die |
166 |
|
167 |
# Remove empty dirs we might have copied |
168 |
find "${D}" -type d -empty -exec rmdir -v {} + || die |
169 |
|
170 |
dodoc COPYRIGHT README |
171 |
|
172 |
if use jce; then |
173 |
dodir ${dest}/lib/security/strong-jce |
174 |
mv "${ddest}"/lib/security/US_export_policy.jar \ |
175 |
"${ddest}"/lib/security/strong-jce || die |
176 |
mv "${ddest}"/lib/security/local_policy.jar \ |
177 |
"${ddest}"/lib/security/strong-jce || die |
178 |
dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ |
179 |
"${dest}"/lib/security/US_export_policy.jar |
180 |
dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ |
181 |
"${dest}"/lib/security/local_policy.jar |
182 |
fi |
183 |
|
184 |
if use nsplugin; then |
185 |
install_mozilla_plugin "${dest}"/lib/${arch}/libnpjp2.so |
186 |
fi |
187 |
|
188 |
# Install desktop file for the Java Control Panel. |
189 |
# Using ${PN}-${SLOT} to prevent file collision with jre and or other slots. |
190 |
# make_desktop_entry can't be used as ${P} would end up in filename. |
191 |
newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ |
192 |
sun-jcontrol-${PN}-${SLOT}.png || die |
193 |
sed -e "s#Name=.*#Name=Java Control Panel for Oracle JRE ${SLOT}#" \ |
194 |
-e "s#Exec=.*#Exec=/opt/${P}/bin/jcontrol#" \ |
195 |
-e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}.png#" \ |
196 |
lib/desktop/applications/sun_java.desktop > \ |
197 |
"${T}"/jcontrol-${PN}-${SLOT}.desktop || die |
198 |
domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop |
199 |
|
200 |
# Prune all fontconfig files so libfontconfig will be used and only install |
201 |
# a Gentoo specific one if fontconfig is disabled. |
202 |
# http://docs.oracle.com/javase/7/docs/technotes/guides/intl/fontconfig.html |
203 |
rm "${ddest}"/lib/fontconfig.* || die |
204 |
if ! use fontconfig; then |
205 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die |
206 |
eprefixify "${T}"/fontconfig.properties |
207 |
insinto "${dest}"/lib/ |
208 |
doins "${T}"/fontconfig.properties |
209 |
fi |
210 |
|
211 |
set_java_env |
212 |
java-vm_revdep-mask |
213 |
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter |
214 |
} |
215 |
|
216 |
QA_PREBUILT=" |
217 |
opt/${P}/lib/i386/client/libjvm.so |
218 |
opt/${P}/lib/i386/server/libjvm.so |
219 |
/opt/${P}/bin/java |
220 |
/opt/${P}/bin/java_vm |
221 |
/opt/${P}/bin/javaws |
222 |
/opt/${P}/bin/keytool |
223 |
/opt/${P}/bin/orbd |
224 |
/opt/${P}/bin/pack200 |
225 |
/opt/${P}/bin/policytool |
226 |
/opt/${P}/bin/rmid |
227 |
/opt/${P}/bin/rmiregistry |
228 |
/opt/${P}/bin/servertool |
229 |
/opt/${P}/bin/tnameserv |
230 |
/opt/${P}/bin/unpack200 |
231 |
/opt/${P}/lib/jexec" |
232 |
for java_system_arch in amd64 i386; do |
233 |
QA_PREBUILT+=" |
234 |
/opt/${P}/lib/${java_system_arch}/headless/libmawt.so |
235 |
/opt/${P}/lib/${java_system_arch}/jli/libjli.so |
236 |
/opt/${P}/lib/${java_system_arch}/libawt.so |
237 |
/opt/${P}/lib/${java_system_arch}/libdcpr.so |
238 |
/opt/${P}/lib/${java_system_arch}/libdeploy.so |
239 |
/opt/${P}/lib/${java_system_arch}/libdt_socket.so |
240 |
/opt/${P}/lib/${java_system_arch}/libfontmanager.so |
241 |
/opt/${P}/lib/${java_system_arch}/libhprof.so |
242 |
/opt/${P}/lib/${java_system_arch}/libinstrument.so |
243 |
/opt/${P}/lib/${java_system_arch}/libj2gss.so |
244 |
/opt/${P}/lib/${java_system_arch}/libj2pcsc.so |
245 |
/opt/${P}/lib/${java_system_arch}/libj2pkcs11.so |
246 |
/opt/${P}/lib/${java_system_arch}/libjaas_unix.so |
247 |
/opt/${P}/lib/${java_system_arch}/libjava_crw_demo.so |
248 |
/opt/${P}/lib/${java_system_arch}/libjavaplugin_jni.so |
249 |
/opt/${P}/lib/${java_system_arch}/libjava.so |
250 |
/opt/${P}/lib/${java_system_arch}/libjawt.so |
251 |
/opt/${P}/lib/${java_system_arch}/libJdbcOdbc.so |
252 |
/opt/${P}/lib/${java_system_arch}/libjdwp.so |
253 |
/opt/${P}/lib/${java_system_arch}/libjfr.so |
254 |
/opt/${P}/lib/${java_system_arch}/libjpeg.so |
255 |
/opt/${P}/lib/${java_system_arch}/libjsdt.so |
256 |
/opt/${P}/lib/${java_system_arch}/libjsig.so |
257 |
/opt/${P}/lib/${java_system_arch}/libjsoundalsa.so |
258 |
/opt/${P}/lib/${java_system_arch}/libjsound.so |
259 |
/opt/${P}/lib/${java_system_arch}/libkcms.so |
260 |
/opt/${P}/lib/${java_system_arch}/libmanagement.so |
261 |
/opt/${P}/lib/${java_system_arch}/libmlib_image.so |
262 |
/opt/${P}/lib/${java_system_arch}/libnet.so |
263 |
/opt/${P}/lib/${java_system_arch}/libnio.so |
264 |
/opt/${P}/lib/${java_system_arch}/libnpjp2.so |
265 |
/opt/${P}/lib/${java_system_arch}/libnpt.so |
266 |
/opt/${P}/lib/${java_system_arch}/librmi.so |
267 |
/opt/${P}/lib/${java_system_arch}/libsctp.so |
268 |
/opt/${P}/lib/${java_system_arch}/libsplashscreen.so |
269 |
/opt/${P}/lib/${java_system_arch}/libsunec.so |
270 |
/opt/${P}/lib/${java_system_arch}/libt2k.so |
271 |
/opt/${P}/lib/${java_system_arch}/libunpack.so |
272 |
/opt/${P}/lib/${java_system_arch}/libverify.so |
273 |
/opt/${P}/lib/${java_system_arch}/libzip.so |
274 |
/opt/${P}/lib/${java_system_arch}/server/libjvm.so |
275 |
/opt/${P}/lib/${java_system_arch}/xawt/libmawt.so" |
276 |
done |