1 |
betelgeuse 07/10/04 14:25:37 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: sun-jdk-1.4.2.16.ebuild |
5 |
Log: |
6 |
Version bump for security bug #194711. |
7 |
(Portage version: 2.1.3.9) |
8 |
|
9 |
Revision Changes Path |
10 |
1.214 dev-java/sun-jdk/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.214&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.214&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.213&r2=1.214 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
19 |
retrieving revision 1.213 |
20 |
retrieving revision 1.214 |
21 |
diff -u -r1.213 -r1.214 |
22 |
--- ChangeLog 27 Sep 2007 16:57:21 -0000 1.213 |
23 |
+++ ChangeLog 4 Oct 2007 14:25:37 -0000 1.214 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for dev-java/sun-jdk |
26 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.213 2007/09/27 16:57:21 betelgeuse Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.214 2007/10/04 14:25:37 betelgeuse Exp $ |
29 |
+ |
30 |
+*sun-jdk-1.4.2.16 (04 Oct 2007) |
31 |
+ |
32 |
+ 04 Oct 2007; Petteri Räty <betelgeuse@g.o> |
33 |
+ +sun-jdk-1.4.2.16.ebuild: |
34 |
+ Version bump for security bug #194711. |
35 |
|
36 |
*sun-jdk-1.6.0.03 (27 Sep 2007) |
37 |
*sun-jdk-1.5.0.13 (27 Sep 2007) |
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: sun-jdk-1.4.2.16.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2007 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild,v 1.1 2007/10/04 14:25:37 betelgeuse Exp $ |
51 |
|
52 |
JAVA_SUPPORTS_GENERATION_1="true" |
53 |
inherit pax-utils java-vm-2 eutils |
54 |
|
55 |
MY_PV=${PV%.*}_${PV##*.} |
56 |
MY_P=j2sdk${MY_PV} |
57 |
MY_PVB=${PV%.*} |
58 |
|
59 |
At="j2sdk-${PV//./_}-linux-i586.bin" |
60 |
jce_policy="jce_policy-${MY_PVB//./_}.zip" |
61 |
|
62 |
S="${WORKDIR}/${MY_P}" |
63 |
DESCRIPTION="Sun's J2SE Development Kit" |
64 |
HOMEPAGE="http://java.sun.com/j2se/1.4.2/" |
65 |
SRC_URI="x86? ( ${At} ) |
66 |
jce? ( ${jce_policy} )" |
67 |
SLOT="1.4" |
68 |
LICENSE="sun-bcla-java-vm" |
69 |
KEYWORDS="~x86" |
70 |
# files are prestripped |
71 |
RESTRICT="fetch strip" |
72 |
IUSE="X alsa doc examples nsplugin jce" |
73 |
|
74 |
DEPEND="sys-apps/sed |
75 |
app-arch/unzip" |
76 |
|
77 |
RDEPEND="alsa? ( media-libs/alsa-lib ) |
78 |
doc? ( =dev-java/java-sdk-docs-1.4.2* ) |
79 |
X? ( |
80 |
x11-libs/libX11 |
81 |
x11-libs/libXext |
82 |
x11-libs/libXi |
83 |
x11-libs/libXp |
84 |
x11-libs/libXt |
85 |
x11-libs/libXtst |
86 |
)" |
87 |
|
88 |
JAVA_PROVIDE="jdbc-stdext" |
89 |
|
90 |
DOWNLOAD_URL="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=j2sdk-${MY_PV}-oth-JPR&SiteId=JSC&TransactionId=noreg" |
91 |
DOWNLOAD_URL_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7503-jce-${MY_PVB}-oth-JPR&SiteId=JSC&TransactionId=noreg" |
92 |
|
93 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libawt.so |
94 |
opt/${P}/jre/plugin/i386/ns4/libjavaplugin.so |
95 |
opt/${P}/jre/plugin/i386/ns610/libjavaplugin_oji.so |
96 |
opt/${P}/jre/plugin/i386/ns610-gcc32/libjavaplugin_oji.so" |
97 |
|
98 |
pkg_nofetch() { |
99 |
einfo "Please download ${At} from:" |
100 |
einfo ${DOWNLOAD_URL} |
101 |
einfo "(first select 'Accept License', then click on 'self-extracting file'" |
102 |
einfo "under 'Linux Platform - Java(TM) 2 SDK, Standard Edition')" |
103 |
einfo "and move it to ${DISTDIR}" |
104 |
if use jce; then |
105 |
echo |
106 |
einfo "Also download ${jce_policy} from:" |
107 |
einfo ${DOWNLOAD_URL_JCE} |
108 |
einfo "Java(TM) Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files" |
109 |
einfo "and move it to ${DISTDIR}" |
110 |
fi |
111 |
} |
112 |
|
113 |
src_unpack() { |
114 |
if [ ! -r ${DISTDIR}/${At} ]; then |
115 |
die "cannot read ${At}.bin. Please check the permission and try again." |
116 |
fi |
117 |
if use jce; then |
118 |
if [ ! -r ${DISTDIR}/${jce_policy} ]; then |
119 |
die "cannot read ${jce_policy}. Please check the permission and try again." |
120 |
fi |
121 |
fi |
122 |
#Search for the ELF Header |
123 |
testExp=$(echo -e '\0177\0105\0114\0106\0001\0001\0001') |
124 |
startAt=`grep -aonm 1 ${testExp} ${DISTDIR}/${At} | cut -d: -f1` |
125 |
tail -n +${startAt} ${DISTDIR}/${At} > install.sfx |
126 |
chmod +x install.sfx |
127 |
./install.sfx || die |
128 |
rm install.sfx |
129 |
|
130 |
if [ -f ${S}/lib/unpack ]; then |
131 |
UNPACK_CMD=${S}/lib/unpack |
132 |
chmod +x $UNPACK_CMD |
133 |
sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD |
134 |
local PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar \ |
135 |
jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar \ |
136 |
jre/javaws/javaws.jar" |
137 |
for i in $PACKED_JARS; do |
138 |
PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack |
139 |
if [ -f ${PACK_FILE} ]; then |
140 |
echo " unpacking: $i" |
141 |
$UNPACK_CMD ${PACK_FILE} ${S}/$i |
142 |
rm -f ${PACK_FILE} |
143 |
fi |
144 |
done |
145 |
fi |
146 |
} |
147 |
|
148 |
src_install() { |
149 |
local dirs="bin include jre lib man" |
150 |
dodir /opt/${P} |
151 |
|
152 |
cp -dPR ${dirs} "${D}/opt/${P}/" |
153 |
|
154 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
155 |
# the heap by the JIT compiler. |
156 |
pax-mark srpm $(list-paxables "${D}"/opt/${P}/{,/jre}/bin/*) |
157 |
|
158 |
dodoc COPYRIGHT README LICENSE THIRDPARTYLICENSEREADME.txt || die |
159 |
dohtml README.html || die |
160 |
if use examples; then |
161 |
cp -pPR demo ${D}/opt/${P}/ || die |
162 |
fi |
163 |
|
164 |
cp -pPR src.zip "${D}/opt/${P}/" || die |
165 |
|
166 |
if use jce ; then |
167 |
# Using unlimited jce while still retaining the strong jce |
168 |
# May have repercussions when you find you cannot symlink libraries |
169 |
# in classpaths. |
170 |
cd ${D}/opt/${P}/jre/lib/security |
171 |
unzip ${DISTDIR}/${jce_policy} |
172 |
mv jce unlimited-jce |
173 |
dodir /opt/${P}/jre/lib/security/strong-jce |
174 |
mv ${D}/opt/${P}/jre/lib/security/US_export_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce |
175 |
mv ${D}/opt/${P}/jre/lib/security/local_policy.jar ${D}/opt/${P}/jre/lib/security/strong-jce |
176 |
dosym /opt/${P}/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
177 |
dosym /opt/${P}/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
178 |
fi |
179 |
|
180 |
if use nsplugin; then |
181 |
local plugin_dir="ns610" |
182 |
if has_version '>=sys-devel/gcc-3.2' ; then |
183 |
plugin_dir="ns610-gcc32" |
184 |
fi |
185 |
|
186 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/${plugin_dir}/libjavaplugin_oji.so |
187 |
fi |
188 |
|
189 |
# bug #147259 |
190 |
dosym ../jre/javaws/javaws /opt/${P}/bin/javaws |
191 |
dosym ../javaws/javaws /opt/${P}/jre/bin/javaws |
192 |
|
193 |
# create dir for system preferences |
194 |
dodir /opt/${P}/.systemPrefs |
195 |
# Create files used as storage for system preferences. |
196 |
touch ${D}/opt/${P}/.systemPrefs/.system.lock |
197 |
chmod 644 ${D}/opt/${P}/.systemPrefs/.system.lock |
198 |
touch ${D}/opt/${P}/.systemPrefs/.systemRootModFile |
199 |
chmod 644 ${D}/opt/${P}/.systemPrefs/.systemRootModFile |
200 |
|
201 |
# install control panel for Gnome/KDE |
202 |
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ |
203 |
-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ |
204 |
${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
205 |
${T}/sun_java-${SLOT}.desktop |
206 |
|
207 |
domenu ${T}/sun_java-${SLOT}.desktop |
208 |
|
209 |
set_java_env |
210 |
} |
211 |
|
212 |
pkg_postinst() { |
213 |
# Set as default VM if none exists |
214 |
java-vm-2_pkg_postinst |
215 |
|
216 |
if ! use X; then |
217 |
ewarn "Some parts of Sun's JDK require X11 libraries to be installed." |
218 |
ewarn "Be careful which Java libraries you attempt to use." |
219 |
fi |
220 |
elog "Starting with 1.4.2.14 the src.zip is installed to the standard" |
221 |
elog "location only (/opt/${P}/) and not /opt/${P}/share/" |
222 |
elog "as we used to. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" |
223 |
elog "http://java.sun.com/j2se/1.4.2/docs/tooldocs/linux/jdkfiles.html" |
224 |
elog "for more details." |
225 |
} |
226 |
|
227 |
|
228 |
|
229 |
-- |
230 |
gentoo-commits@g.o mailing list |