| 1 |
caster 08/03/27 20:18:29 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: sun-jdk-1.6.0.05-r1.ebuild |
| 5 |
sun-jdk-1.5.0.15-r1.ebuild |
| 6 |
Removed: sun-jdk-1.5.0.13.ebuild sun-jdk-1.6.0.04.ebuild |
| 7 |
sun-jdk-1.4.2.16.ebuild sun-jdk-1.6.0.03.ebuild |
| 8 |
sun-jdk-1.5.0.14.ebuild |
| 9 |
Log: |
| 10 |
Remove vulnerable versions. Revbump to create Class Data Sharing archive(s), bug #207282. |
| 11 |
(Portage version: 2.1.4.4) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.231 dev-java/sun-jdk/ChangeLog |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.231&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?rev=1.231&content-type=text/plain |
| 18 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/ChangeLog?r1=1.230&r2=1.231 |
| 19 |
|
| 20 |
Index: ChangeLog |
| 21 |
=================================================================== |
| 22 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v |
| 23 |
retrieving revision 1.230 |
| 24 |
retrieving revision 1.231 |
| 25 |
diff -u -r1.230 -r1.231 |
| 26 |
--- ChangeLog 27 Mar 2008 19:28:21 -0000 1.230 |
| 27 |
+++ ChangeLog 27 Mar 2008 20:18:28 -0000 1.231 |
| 28 |
@@ -1,6 +1,16 @@ |
| 29 |
# ChangeLog for dev-java/sun-jdk |
| 30 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 31 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.230 2008/03/27 19:28:21 maekke Exp $ |
| 32 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.231 2008/03/27 20:18:28 caster Exp $ |
| 33 |
+ |
| 34 |
+*sun-jdk-1.6.0.05-r1 (27 Mar 2008) |
| 35 |
+*sun-jdk-1.5.0.15-r1 (27 Mar 2008) |
| 36 |
+ |
| 37 |
+ 27 Mar 2008; Vlastimil Babka <caster@g.o> -sun-jdk-1.4.2.16.ebuild, |
| 38 |
+ -sun-jdk-1.5.0.13.ebuild, -sun-jdk-1.5.0.14.ebuild, |
| 39 |
+ +sun-jdk-1.5.0.15-r1.ebuild, -sun-jdk-1.6.0.03.ebuild, |
| 40 |
+ -sun-jdk-1.6.0.04.ebuild, +sun-jdk-1.6.0.05-r1.ebuild: |
| 41 |
+ Remove vulnerable versions. Revbump to create Class Data Sharing |
| 42 |
+ archive(s), bug #207282. |
| 43 |
|
| 44 |
27 Mar 2008; Markus Meier <maekke@g.o> sun-jdk-1.5.0.15.ebuild, |
| 45 |
sun-jdk-1.6.0.05.ebuild: |
| 46 |
|
| 47 |
|
| 48 |
|
| 49 |
1.1 dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild |
| 50 |
|
| 51 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild?rev=1.1&view=markup |
| 52 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild?rev=1.1&content-type=text/plain |
| 53 |
|
| 54 |
Index: sun-jdk-1.6.0.05-r1.ebuild |
| 55 |
=================================================================== |
| 56 |
# Copyright 1999-2008 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.05-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $ |
| 59 |
|
| 60 |
inherit versionator java-vm-2 eutils pax-utils |
| 61 |
|
| 62 |
UPDATE="$(get_version_component_range 4)" |
| 63 |
UPDATE="${UPDATE#0}" |
| 64 |
MY_PV="$(get_version_component_range 2)u${UPDATE}" |
| 65 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
| 66 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
| 67 |
|
| 68 |
DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" |
| 69 |
HOMEPAGE="http://java.sun.com/javase/6/" |
| 70 |
URL_BASE="http://download.java.net/dlj/binaries" |
| 71 |
SRC_URI="x86? ( ${URL_BASE}/${X86_AT} ) |
| 72 |
amd64? ( ${URL_BASE}/${AMD64_AT} )" |
| 73 |
SLOT="1.6" |
| 74 |
LICENSE="dlj-1.1" |
| 75 |
KEYWORDS="~amd64 ~x86" |
| 76 |
RESTRICT="strip" |
| 77 |
IUSE="X alsa doc examples jce nsplugin odbc" |
| 78 |
|
| 79 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so |
| 80 |
opt/${P}/jre/lib/i386/libdeploy.so |
| 81 |
opt/${P}/jre/lib/i386/client/libjvm.so |
| 82 |
opt/${P}/jre/lib/i386/server/libjvm.so" |
| 83 |
|
| 84 |
DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )" |
| 85 |
RDEPEND="doc? ( =dev-java/java-sdk-docs-1.6.0* ) |
| 86 |
x86? ( =virtual/libstdc++-3.3 ) |
| 87 |
sys-libs/glibc |
| 88 |
alsa? ( media-libs/alsa-lib ) |
| 89 |
X? ( |
| 90 |
x11-libs/libXext |
| 91 |
x11-libs/libXi |
| 92 |
x11-libs/libXp |
| 93 |
x11-libs/libXtst |
| 94 |
amd64? ( x11-libs/libXt ) |
| 95 |
x11-libs/libX11 |
| 96 |
) |
| 97 |
odbc? ( dev-db/unixODBC )" |
| 98 |
|
| 99 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
| 100 |
|
| 101 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
| 102 |
|
| 103 |
src_unpack() { |
| 104 |
sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack" |
| 105 |
|
| 106 |
# see bug #207282 |
| 107 |
if use x86; then |
| 108 |
einfo "Creating the Class Data Sharing archives" |
| 109 |
"${S}"/bin/java -client -Xshare:dump || die |
| 110 |
"${S}"/bin/java -server -Xshare:dump || die |
| 111 |
fi |
| 112 |
} |
| 113 |
|
| 114 |
src_install() { |
| 115 |
local dirs="bin include jre lib man" |
| 116 |
|
| 117 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
| 118 |
# the heap by the JIT compiler. |
| 119 |
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) |
| 120 |
|
| 121 |
dodir /opt/${P} |
| 122 |
|
| 123 |
cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy" |
| 124 |
dodoc COPYRIGHT || die |
| 125 |
dohtml README.html || die |
| 126 |
|
| 127 |
cp -pP src.zip "${D}/opt/${P}/" || die |
| 128 |
|
| 129 |
if use examples; then |
| 130 |
cp -pPR demo sample "${D}/opt/${P}/" || die |
| 131 |
fi |
| 132 |
|
| 133 |
if use jce; then |
| 134 |
cd "${D}/opt/${P}/jre/lib/security" |
| 135 |
dodir /opt/${P}/jre/lib/security/strong-jce |
| 136 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
| 137 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 138 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
| 139 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 140 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/ |
| 141 |
dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/ |
| 142 |
fi |
| 143 |
|
| 144 |
if use nsplugin; then |
| 145 |
local plugin_dir="ns7-gcc29" |
| 146 |
if has_version '>=sys-devel/gcc-3' ; then |
| 147 |
plugin_dir="ns7" |
| 148 |
fi |
| 149 |
|
| 150 |
if use x86 ; then |
| 151 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
| 152 |
else |
| 153 |
eerror "No plugin available for amd64 arch" |
| 154 |
fi |
| 155 |
fi |
| 156 |
|
| 157 |
# create dir for system preferences |
| 158 |
dodir /opt/${P}/jre/.systemPrefs |
| 159 |
# Create files used as storage for system preferences. |
| 160 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 161 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 162 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 163 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 164 |
|
| 165 |
if [[ -f "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
| 166 |
# install control panel for Gnome/KDE |
| 167 |
# The jre also installs these so make sure that they do not have the same |
| 168 |
# Name |
| 169 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \ |
| 170 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \ |
| 171 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
| 172 |
"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
| 173 |
"${T}"/sun_jdk-${SLOT}.desktop |
| 174 |
|
| 175 |
domenu "${T}"/sun_jdk-${SLOT}.desktop |
| 176 |
fi |
| 177 |
|
| 178 |
# bug #56444 |
| 179 |
insinto /opt/${P}/jre/lib/ |
| 180 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
| 181 |
|
| 182 |
set_java_env |
| 183 |
java-vm_revdep-mask |
| 184 |
} |
| 185 |
|
| 186 |
pkg_postinst() { |
| 187 |
# Set as default VM if none exists |
| 188 |
java-vm-2_pkg_postinst |
| 189 |
|
| 190 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
| 191 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
| 192 |
elog "default." |
| 193 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
| 194 |
elog "" |
| 195 |
elog "Starting with 1.6.0-r2 the src.zip is installed to the standard" |
| 196 |
elog "location. See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" |
| 197 |
elog "http://java.sun.com/javase/6/docs/technotes/tools/linux/jdkfiles.html" |
| 198 |
elog "for more details." |
| 199 |
elog "" |
| 200 |
elog "Starting with 1.6.0.01 demo and sample directories have been moved" |
| 201 |
elog "to top level from the share sub directory." |
| 202 |
} |
| 203 |
|
| 204 |
|
| 205 |
|
| 206 |
1.1 dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild |
| 207 |
|
| 208 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild?rev=1.1&view=markup |
| 209 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild?rev=1.1&content-type=text/plain |
| 210 |
|
| 211 |
Index: sun-jdk-1.5.0.15-r1.ebuild |
| 212 |
=================================================================== |
| 213 |
# Copyright 1999-2008 Gentoo Foundation |
| 214 |
# Distributed under the terms of the GNU General Public License v2 |
| 215 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.15-r1.ebuild,v 1.1 2008/03/27 20:18:28 caster Exp $ |
| 216 |
|
| 217 |
inherit versionator java-vm-2 eutils pax-utils |
| 218 |
|
| 219 |
UPDATE="$(get_version_component_range 4)" |
| 220 |
UPDATE="${UPDATE#0}" |
| 221 |
MY_PV="$(get_version_component_range 2-3)u${UPDATE}" |
| 222 |
|
| 223 |
X86_AT="jdk-${MY_PV}-dlj-linux-i586.bin" |
| 224 |
AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64.bin" |
| 225 |
|
| 226 |
DESCRIPTION="Sun's J2SE Development Kit, version 1.5" |
| 227 |
HOMEPAGE="http://java.sun.com/j2se/1.5.0/" |
| 228 |
SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) |
| 229 |
amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" |
| 230 |
SLOT="1.5" |
| 231 |
LICENSE="dlj-1.1" |
| 232 |
KEYWORDS="~amd64 ~x86" |
| 233 |
RESTRICT="strip" |
| 234 |
IUSE="X alsa doc examples jce nsplugin odbc" |
| 235 |
|
| 236 |
QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/libdeploy.so" |
| 237 |
|
| 238 |
DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )" |
| 239 |
RDEPEND="sys-libs/glibc |
| 240 |
alsa? ( media-libs/alsa-lib ) |
| 241 |
doc? ( =dev-java/java-sdk-docs-1.5.0* ) |
| 242 |
X? ( |
| 243 |
x11-libs/libXext |
| 244 |
x11-libs/libXi |
| 245 |
x11-libs/libXp |
| 246 |
x11-libs/libXtst |
| 247 |
x11-libs/libXt |
| 248 |
x11-libs/libX11 |
| 249 |
) |
| 250 |
odbc? ( dev-db/unixODBC )" |
| 251 |
|
| 252 |
S="${WORKDIR}/jdk$(replace_version_separator 3 _)" |
| 253 |
|
| 254 |
JAVA_PROVIDE="jdbc-stdext jdbc-rowset" |
| 255 |
|
| 256 |
src_unpack() { |
| 257 |
sh "${DISTDIR}/${A}" --accept-license --unpack || die "Failed to unpack" |
| 258 |
|
| 259 |
# see bug #207282 |
| 260 |
if use x86; then |
| 261 |
einfo "Creating the Class Data Sharing archives" |
| 262 |
"${S}"/bin/java -client -Xshare:dump || die |
| 263 |
fi |
| 264 |
} |
| 265 |
|
| 266 |
src_install() { |
| 267 |
local dirs="bin include jre lib man" |
| 268 |
|
| 269 |
# Set PaX markings on all JDK/JRE executables to allow code-generation on |
| 270 |
# the heap by the JIT compiler. |
| 271 |
pax-mark m $(list-paxables "${S}"{,/jre}/bin/*) |
| 272 |
|
| 273 |
dodir /opt/${P} |
| 274 |
|
| 275 |
cp -pPR ${dirs} "${D}/opt/${P}/" || die "failed to copy" |
| 276 |
dodoc COPYRIGHT README.html || die |
| 277 |
dohtml README.html || die |
| 278 |
|
| 279 |
cp -pP src.zip "${D}/opt/${P}/" || die |
| 280 |
|
| 281 |
if use examples; then |
| 282 |
cp -pPR demo "${D}/opt/${P}/" || die |
| 283 |
cp -pPR sample "${D}/opt/${P}/" || die |
| 284 |
fi |
| 285 |
|
| 286 |
if use jce; then |
| 287 |
cd "${D}"/opt/${P}/jre/lib/security || die |
| 288 |
dodir /opt/${P}/jre/lib/security/strong-jce |
| 289 |
mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar \ |
| 290 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 291 |
mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar \ |
| 292 |
"${D}"/opt/${P}/jre/lib/security/strong-jce || die |
| 293 |
local jcedir="/opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/" |
| 294 |
dosym ${jcedir}/US_export_policy.jar \ |
| 295 |
/opt/${P}/jre/lib/security/ || die |
| 296 |
dosym ${jcedir}/local_policy.jar \ |
| 297 |
/opt/${P}/jre/lib/security/ || die |
| 298 |
fi |
| 299 |
|
| 300 |
if use nsplugin; then |
| 301 |
local plugin_dir="ns7-gcc29" |
| 302 |
if has_version '>=sys-devel/gcc-3' ; then |
| 303 |
plugin_dir="ns7" |
| 304 |
fi |
| 305 |
|
| 306 |
if use x86 ; then |
| 307 |
install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so |
| 308 |
else |
| 309 |
eerror "No plugin available for amd64 arch" |
| 310 |
fi |
| 311 |
fi |
| 312 |
|
| 313 |
# create dir for system preferences |
| 314 |
dodir /opt/${P}/jre/.systemPrefs |
| 315 |
# Create files used as storage for system preferences. |
| 316 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 317 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock |
| 318 |
touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 319 |
chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile |
| 320 |
|
| 321 |
# install control panel for Gnome/KDE |
| 322 |
if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then |
| 323 |
sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \ |
| 324 |
-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \ |
| 325 |
"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \ |
| 326 |
"${T}"/sun_java-${SLOT}.desktop \ |
| 327 |
|| die "Failed to sed .desktop file" |
| 328 |
|
| 329 |
domenu "${T}"/sun_java-${SLOT}.desktop |
| 330 |
fi |
| 331 |
|
| 332 |
# bug #56444 |
| 333 |
insinto /opt/${P}/jre/lib/ |
| 334 |
newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties |
| 335 |
|
| 336 |
set_java_env |
| 337 |
java-vm_revdep-mask |
| 338 |
} |
| 339 |
|
| 340 |
pkg_postinst() { |
| 341 |
# Set as default VM if none exists |
| 342 |
java-vm-2_pkg_postinst |
| 343 |
|
| 344 |
elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" |
| 345 |
elog "The epoll-based implementation of SelectorProvider is not selected by" |
| 346 |
elog "default." |
| 347 |
elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" |
| 348 |
elog "" |
| 349 |
elog "Starting with 1.5.0.12 the src.zip and demos are installed to the standard" |
| 350 |
elog "locations." |
| 351 |
elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and" |
| 352 |
elog "http://java.sun.com/j2se/1.5.0/docs/tooldocs/linux/jdkfiles.html" |
| 353 |
elog "for more details." |
| 354 |
} |
| 355 |
|
| 356 |
|
| 357 |
|
| 358 |
-- |
| 359 |
gentoo-commits@l.g.o mailing list |
Archives