/hg/icedtea7: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Oct 29 17:27:24 UTC 2014
changeset 77f54e84bf17 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=77f54e84bf17
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 29 15:47:08 2014 +0000
PR2014: Use version from hotspot.map to create tarball filename
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
(TAR_SUFFIX): New variable to store filename
suffix of OpenJDK drop tarballs.
(OPENJDK_SRC_ZIP): Use TAR_SUFFIX.
(CORBA_SRC_ZIP): Likewise.
(JAXP_SRC_ZIP): Likewise.
(JAXWS_SRC_ZIP): Likewise.
(JDK_SRC_ZIP): Likewise.
(LANGTOOLS_SRC_ZIP): Likewise.
(HOTSPOT_SRC_ZIP): Likewise.
(download-hotspot): Look for $(HSBUILD).$(TAR_SUFFIX)
as the drop tarball filename in the URL if using
a non-default HotSpot, rather than always looking
for hotspot.$(TAR_SUFFIX).
(ADD_ZERO_CONFIGURE_ARGS): Make use of $(TAR_SUFFIX).
changeset 592025610742 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=592025610742
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 29 15:50:04 2014 +0000
PR2015: Update hotspot.map documentation in INSTALL
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Update section on hotspot.map
to reflect recent changes.
* Makefile.am:
(download-hotspot): Use $(TAR_SUFFIX) in hg drops
as well.
changeset 9fdaffa0c3fa in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=9fdaffa0c3fa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 29 15:59:39 2014 +0000
CA172, PR2030, G453612: Add ARM hardfloat support to CACAO on Gentoo.
2013-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
CA172, PR2030, G453612: Add ARM hardfloat support
to CACAO on Gentoo.
* Makefile.am:
(ICEDTEA_PATCHES): Add armhf patch when building
CACAO.
* patches/cacao/armhf.patch:
Patch to enable hardfloat on triplet used by Gentoo.
changeset 810d698ffdfb in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=810d698ffdfb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Oct 29 17:18:10 2014 +0000
PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
2014-10-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch for CACAO
builds.
* NEWS: Updated.
* patches/cacao/pr2032.patch:
Implement JVM_FindClassFromCaller as same
as JVM_FindClassFromClassLoader for now.
diffstat:
ChangeLog | 46 ++++++++++++++++++++++++++++
INSTALL | 62 ++++++++++++++++++++++++++-----------
Makefile.am | 29 +++++++++++------
NEWS | 2 +
patches/cacao/armhf.patch | 12 +++++++
patches/cacao/pr2032.patch | 75 ++++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 197 insertions(+), 29 deletions(-)
diffs (311 lines):
diff -r 2b88a80cab70 -r 810d698ffdfb ChangeLog
--- a/ChangeLog Thu Oct 16 21:36:25 2014 +0100
+++ b/ChangeLog Wed Oct 29 17:18:10 2014 +0000
@@ -1,3 +1,49 @@
+2014-10-29 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch for CACAO
+ builds.
+ * NEWS: Updated.
+ * patches/cacao/pr2032.patch:
+ Implement JVM_FindClassFromCaller as same
+ as JVM_FindClassFromClassLoader for now.
+
+2013-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ CA172, PR2030, G453612: Add ARM hardfloat support
+ to CACAO on Gentoo.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add armhf patch when building
+ CACAO.
+ * patches/cacao/armhf.patch:
+ Patch to enable hardfloat on triplet used by Gentoo.
+
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL: Update section on hotspot.map
+ to reflect recent changes.
+ * Makefile.am:
+ (download-hotspot): Use $(TAR_SUFFIX) in hg drops
+ as well.
+
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * Makefile.am:
+ (TAR_SUFFIX): New variable to store filename
+ suffix of OpenJDK drop tarballs.
+ (OPENJDK_SRC_ZIP): Use TAR_SUFFIX.
+ (CORBA_SRC_ZIP): Likewise.
+ (JAXP_SRC_ZIP): Likewise.
+ (JAXWS_SRC_ZIP): Likewise.
+ (JDK_SRC_ZIP): Likewise.
+ (LANGTOOLS_SRC_ZIP): Likewise.
+ (HOTSPOT_SRC_ZIP): Likewise.
+ (download-hotspot): Look for $(HSBUILD).$(TAR_SUFFIX)
+ as the drop tarball filename in the URL if using
+ a non-default HotSpot, rather than always looking
+ for hotspot.$(TAR_SUFFIX).
+ (ADD_ZERO_CONFIGURE_ARGS): Make use of $(TAR_SUFFIX).
+
2014-10-16 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am,
diff -r 2b88a80cab70 -r 810d698ffdfb INSTALL
--- a/INSTALL Thu Oct 16 21:36:25 2014 +0100
+++ b/INSTALL Wed Oct 29 17:18:10 2014 +0000
@@ -306,35 +306,61 @@
IcedTea allows the version of HotSpot provided with the upstream build
drop to be replaced with another. Support for this is provided by the
---with-hotspot-build option which causes IcedTea to probe the
-hotspot.map file for an entry with the given build name. The
-hotspot.map file maps the name to a changeset from a given repository
-URL. During the build, it downloads HotSpot from
-${URL}/archive/${CHANGESET}.tar.gz and the resulting file is verified
-using the MD5 sum stored in hotspot.map.
+--with-hotspot-build=${name} option which causes IcedTea to probe the
+hotspot.map file for an entry with the given build name. The map file
+always contains an entry named 'default' which corresponds to the
+upstream build drop. Specifying --without-hotspot-build will ensure
+that 'default' is used.
+
+At build time, the hotspot.map file is used as follows:
+
+1. The type of tarball (Mercurial changeset or drop), URL, changeset
+ID and SHA256 checksum corresponding to the HotSpot build being used
+are obtained from the hotspot.map file.
+2. When the download-hotspot target is invoked, the URL used is
+constructed using the contents of hotspot.map. If the type is 'hg',
+then the tarball is downloaded from
+${URL}/archive/${CHANGESET}.${TAR_SUFFIX}, where ${URL} and ${CHANGESET}
+are taken from hotspot.map and ${TAR_SUFFIX} is the suffix used in the
+filename to specify the type of compression being used (e.g. tar.gz or
+tar.bz2). If the type is 'drop', then the tarball is downloaded from
+${URL}/${HSNAME}.${TAR_SUFFIX}, where ${HSNAME} is the name of the
+HotSpot build being used. In the case of 'default', ${HSNAME} is set
+to 'hotspot'. Once the file is downloaded, it is verified using
+the SHA256 checksum from the hotspot.map file.
+3. When the extract-hotspot target is invoked, the name of the
+top-level directory from the tarball is constructed using the
+${CHANGESET} field from hotspot.map i.e. the tarball should contain
+a top-level directory called hotspot-${CHANGESET}.
New build selections may be provided by providing further mappings in
-the hotspot.map file. The name can be anything
+the hotspot.map.in file. The name can be anything
e.g. 'shiny_new_hotspot'. This is simply used to map the argument to
--with-hotspot-build to the values in the file and to apply
appropriate patches (see patches/hotspot, $HSBUILD is available in
-Makefile.am for obtaining the build name). The special value
-'original' is used for patches/hotspot/original to denote those for
-the upstream HotSpot; this value does not appear in hotspot.map.
+Makefile.am for obtaining the build name).
-The changeset and URL should refer to a valid HotSpot tree when used
-as above. The required values can be obtained from a local checkout
-or by using the web interface. The simplest way to calculate the MD5
-sum is to download the tarball and then run the 'md5sum' application
-on it. The resulting value should be added to hotspot.map.
+The required values for the changeset field can be obtained from a
+local checkout or by using the web interface. The simplest way to
+calculate the SHA256 sum is to download the tarball and then run the
+'sha256sum' application on it. The resulting value should be added to
+hotspot.map.in.
+
+Note that the source tree contains hotspot.map.in, but hotspot.map is
+used at build-time. The latter is generated by configure and this
+generation process may be used to include information determined
+by configure. In the case of the existing hotspot.map.in entries,
+this is used to include the IcedTea release version in the URL.
As with the OpenJDK build tarballs, the location of an alternate zip
can be specified using --with-hotspot-src-zip. This skips the
-download stage and just verifies that the zip's MD5 sum matches that
+download stage and just verifies that the zip's SHA256 sum matches that
of the requested build.
-Currently, IcedTea7 only supports the 'original' HotSpot provided as
-part of the upstream IcedTea forest.
+Currently, IcedTea 2.x supports the 'default' HotSpot tree, which is
+part of the IcedTea forest for the particular minor release series
+being used, and 'aarch64', which uses snapshots of the AArch64 HotSpot
+port available at http://hg.openjdk.java.net/aarch64-port/jdk7u
JavaScript Support
==================
diff -r 2b88a80cab70 -r 810d698ffdfb Makefile.am
--- a/Makefile.am Thu Oct 16 21:36:25 2014 +0100
+++ b/Makefile.am Wed Oct 29 17:18:10 2014 +0000
@@ -136,6 +136,7 @@
# Conditional defintions
+TAR_SUFFIX = tar.bz2
if USE_HG
OPENJDK_SRC_ZIP =
CORBA_SRC_ZIP =
@@ -145,13 +146,13 @@
LANGTOOLS_SRC_ZIP =
HOTSPOT_SRC_ZIP =
else
- OPENJDK_SRC_ZIP = openjdk.tar.bz2
- CORBA_SRC_ZIP = corba.tar.bz2
- JAXP_SRC_ZIP = jaxp.tar.bz2
- JAXWS_SRC_ZIP = jaxws.tar.bz2
- JDK_SRC_ZIP = jdk.tar.bz2
- LANGTOOLS_SRC_ZIP = langtools.tar.bz2
- HOTSPOT_SRC_ZIP = hotspot.tar.bz2
+ OPENJDK_SRC_ZIP = openjdk.$(TAR_SUFFIX)
+ CORBA_SRC_ZIP = corba.$(TAR_SUFFIX)
+ JAXP_SRC_ZIP = jaxp.$(TAR_SUFFIX)
+ JAXWS_SRC_ZIP = jaxws.$(TAR_SUFFIX)
+ JDK_SRC_ZIP = jdk.$(TAR_SUFFIX)
+ LANGTOOLS_SRC_ZIP = langtools.$(TAR_SUFFIX)
+ HOTSPOT_SRC_ZIP = hotspot.$(TAR_SUFFIX)
endif
if WITH_HGREV
@@ -252,7 +253,9 @@
if BUILD_CACAO
ICEDTEA_PATCHES += \
patches/cacao/launcher.patch \
- patches/cacao/memory.patch
+ patches/cacao/memory.patch \
+ patches/cacao/armhf.patch \
+ patches/cacao/pr2032.patch
else
if USING_CACAO
ICEDTEA_PATCHES += \
@@ -1081,9 +1084,13 @@
mv $(HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP).old ; \
fi ; \
if test "x$(HS_TYPE)" = "xhg"; then \
- $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).tar.gz -O $(HOTSPOT_SRC_ZIP) ; \
+ $(WGET) $(HS_URL)/archive/$(HS_CHANGESET).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
else \
- $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+ if test "x$(HSBUILD)" = "xdefault"; then \
+ $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
+ else \
+ $(WGET) $(HS_URL)/$(HSBUILD).$(TAR_SUFFIX) -O $(HOTSPOT_SRC_ZIP) ; \
+ fi ; \
fi ; \
if ! echo "$(HS_SHA256SUM) $(HOTSPOT_SRC_ZIP)" \
| $(SHA256SUM) --check ; then \
@@ -2247,7 +2254,7 @@
'--disable-bootstrap% '--enable-bootstrap% , \
$(CONFIGURE_ARGS)) \
$(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \
- $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.bz2))
+ $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).$(TAR_SUFFIX)))
ADD_ZERO_EXTRA_BUILD_ENV = \
BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(BUILD_OUTPUT_DIR)/langtools/dist \
diff -r 2b88a80cab70 -r 810d698ffdfb NEWS
--- a/NEWS Thu Oct 16 21:36:25 2014 +0100
+++ b/NEWS Wed Oct 29 17:18:10 2014 +0000
@@ -261,6 +261,8 @@
- PR1786: Allow x86 build to occur on x86_64 using a previously built x86_64 build
- PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
- PR1847: Synchronise javac.in with IcedTea6
+* CACAO
+ - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3
New in release 2.5.3 (2014-10-14):
diff -r 2b88a80cab70 -r 810d698ffdfb patches/cacao/armhf.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/armhf.patch Wed Oct 29 17:18:10 2014 +0000
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+--- cacao/cacao/configure.ac
++++ cacao/cacao/configure.ac
+@@ -50,7 +50,7 @@
+ JAVA_ARCH="arm"
+
+ case "$host" in
+- *-gnueabihf)
++ *-hardfloat-*-gnueabi | *-gnueabihf)
+ ARCH_FLAGS="$ARCH_FLAGS -D__ARMHF__"
+ ;;
+ esac
diff -r 2b88a80cab70 -r 810d698ffdfb patches/cacao/pr2032.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/pr2032.patch Wed Oct 29 17:18:10 2014 +0000
@@ -0,0 +1,75 @@
+# HG changeset patch
+# User Xerxes RÃ¥nby <xerxes at gudinna.com>
+# Date 1414362363 -3600
+# Node ID ec6bd33b3e927738d1353e6e639e76f74d55635f
+# Parent ea3c9a40d975430d1e9dcb598bf25b4bd7aec4ca
+OpenJDK: Implement JVM_FindClassFromCaller
+
+8015256: Better class accessibility
+Summary: Improve protection domain check in forName()
+
+* contrib/mapfile-vers-product: Export said function.
+* src/native/vm/openjdk/jvm.cpp (JVM_FindClassFromCaller): Implement it.
+
+diff --git a/contrib/mapfile-vers-product b/contrib/mapfile-vers-product
+--- cacao/cacao/contrib/mapfile-vers-product
++++ cacao/cacao/contrib/mapfile-vers-product
+@@ -87,6 +87,7 @@
+ JVM_Exit;
+ JVM_FillInStackTrace;
+ JVM_FindClassFromBootLoader;
++ JVM_FindClassFromCaller;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindLibraryEntry;
+--- cacao/cacao/src/native/vm/openjdk/jvm.cpp.orig 2014-10-29 16:40:30.732305204 +0000
++++ cacao/cacao/src/native/vm/openjdk/jvm.cpp 2014-10-29 16:44:06.643292016 +0000
+@@ -684,6 +684,48 @@
+ }
+
+
++/* JVM_FindClassFromCaller
++ * Find a class from a given class loader. Throws ClassNotFoundException.
++ * name: name of class
++ * init: whether initialization is done
++ * loader: class loader to look up the class.
++ * This may not be the same as the caller's class loader.
++ * caller: initiating class. The initiating class may be null when a security
++ * manager is not installed.
++ *
++ * Find a class with this name in this loader,
++ * using the caller's "protection domain".
++ */
++
++jclass JVM_FindClassFromCaller(JNIEnv* env, const char* name, jboolean init, jobject loader, jclass caller)
++{
++ classinfo *c;
++ utf *u;
++ classloader_t *cl;
++
++ TRACEJVMCALLS(("JVM_FindClassFromCaller(name=%s, init=%d, loader=%p, caller=%p)", name, init, loader, caller));
++
++ u = utf_new_char(name);
++ cl = loader_hashtable_classloader_add((java_handle_t *) loader);
++
++ /* XXX The caller's protection domain should be used during
++ the load_class_from_classloader but there is no specification or
++ unit-test in OpenJDK documenting the desired effect */
++
++ c = load_class_from_classloader(u, cl);
++
++ if (c == NULL)
++ return NULL;
++
++ if (init)
++ if (!(c->state & CLASS_INITIALIZED))
++ if (!initialize_class(c))
++ return NULL;
++
++ return (jclass) LLNI_classinfo_wrap(c);
++}
++
++
+ /* JVM_FindClassFromClassLoader */
+
+ jclass JVM_FindClassFromClassLoader(JNIEnv* env, const char* name, jboolean init, jobject loader, jboolean throwError)
More information about the distro-pkg-dev
mailing list