/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 29 22:47:51 UTC 2016
changeset 77d56f3ec0cf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=77d56f3ec0cf
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jan 29 14:18:11 2016 +0000
Bump to icedtea-3.0.0pre08.
Upstream changes:
- PR1368: Ensure debug data is available for all libraries and binaries without redundant files
- PR1983: Support using the system installation of NSS with the SunEC provider
- PR2127: SunEC provider crashes when built using system NSS
- PR2321: Checksum of policy JAR files changes on every build
- PR2459: Policy JAR files should be timestamped with the date of the policy file they hold
- PR2767: Remove remaining rogue binaries from OpenJDK tree
- PR2777: Fix MAX/MIN template usage on s390
- PR2815: Race condition in SunEC provider with system NSS
- S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
ChangeLog:
2016-01-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-3.0.0pre08.
* patches/pr2777.patch: Removed; upstream.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(NASHORN_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(NASHORN_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove pr2777 patch.
* NEWS: Updated.
* configure.ac: Bump to 3.0.0pre08.
* fsg.sh.in: Remove deletions of files which have
now been deleted upstream (PR2767)
* hotspot.map.in: Update to icedtea-3.0.0pre08 tag.
changeset 241cf3509015 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=241cf3509015
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jan 29 14:24:16 2016 +0000
PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2768: Move SystemTap GCC 4.5 patch to OpenJDK
tree or discard if no longer needed
* patches/systemtap-gcc-4.5.patch:
Removed; seems to be no longer needed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patch.
* NEWS: Updated.
changeset a84cfe9142fd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=a84cfe9142fd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jan 29 17:41:08 2016 +0000
PR1983: Support using the system installation of NSS with the SunEC provider
2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1983: Support using the system installation
of NSS with the SunEC provider
* INSTALL: Fix header from 'IcedTea7' to 'IcedTea'.
* Makefile.am:
(ICEDTEA_PATCHES): Make disable-intree-ec patch
conditional on whether or not the SunEC provider
is enabled. Add new variants of the NSS/PKCS11
configuration patch for cases where it is not applied.
(ICEDTEA_CONFIGURE): Pass --enable-system-nss or
--disable-system-nss, depending on whether or
not the SunEC provider is enabled.
(ICEDTEA_ENV): Remove DISABLE_INTREE_EC which
is not applicable in OpenJDK 8.
* README: Fix header from 'IcedTea7' to 'IcedTea'.
* patches/nss-config-with-sunec.patch,
* patches/nss-not-enabled-config-with-sunec.patch:
New variants of nss-config.patch and nss-not-enabled-config.patch
which apply when the SunEC provider is also enabled.
2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Document the SunEC provider.
2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1762: Undefined references when building with NSS 3.16.1
* acinclude.m4:
(IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl
to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as
the base, not NSS_SOFTOKN_LIBS.
2014-04-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1742: Allow SunEC provider to be built with changes
in NSS >= 3.16.1
* Makefile.am:
(ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
instead of NSS_LIBS and NSS_CFLAGS respectively.
* acinclude.m4:
(IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS
for clarity as NSS_CFLAGS and NSS_LIBS are also set
by the NSS detection.
2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1699: Support building the SunEC provider
with system NSS
* Makefile.am:
(ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS
when ENABLE_SUNEC is set.
* acinclude.m4:
(IT_LOCATE_NSS): Fix wording to make it clear that
this is the PKCS11 provider, using NSS as the
implementation.
(IT_ENABLE_SUNEC): Allow the Sun elliptic curve
crypto provider to be enabled.
* configure.ac:
Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which
depends on the former).
* fsg.sh.in:
Only delete the SunEC implementation code at this
level. This is the part that is legally dubious,
due to the use of many more elliptic curves than
those provided by the NSS version.
* remove-intree-libraries.sh.in:
Include the remaining SunEC deletion from fsg.sh
here and make it optional.
changeset 969d84a2df36 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=969d84a2df36
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jan 29 22:46:53 2016 +0000
PR2804: test/tapset/jstaptest.pl should be executable
2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2804: test/tapset/jstaptest.pl should be executable
* Makefile.am:
(check-tapset-probes): Check that Perl is available
and, if, so use it to invoke the script. Replace
BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent,
BUILD_IMAGE_DIR.
(check-tapset-jstack): Likewise.
* NEWS: Updated.
* configure.ac:
Check for Perl if SystemTap is found, so the
tests can be run if required.
changeset 0883b7a8311a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=0883b7a8311a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jan 29 22:47:27 2016 +0000
Added tag icedtea-3.0.0pre08 for changeset 969d84a2df36
diffstat:
.hgtags | 1 +
ChangeLog | 120 +++++++++
INSTALL | 17 +-
Makefile.am | 76 ++++--
NEWS | 10 +
README | 4 +-
acinclude.m4 | 41 +++-
configure.ac | 12 +-
fsg.sh.in | 24 +-
hotspot.map.in | 2 +-
patches/nss-config-with-sunec.patch | 11 +
patches/nss-not-enabled-config-with-sunec.patch | 13 +
patches/pr2777.patch | 290 ------------------------
patches/systemtap-gcc-4.5.patch | 12 -
remove-intree-libraries.sh.in | 8 +
15 files changed, 280 insertions(+), 361 deletions(-)
diffs (truncated from 898 to 500 lines):
diff -r 7442a0ce54ca -r 0883b7a8311a .hgtags
--- a/.hgtags Thu Dec 24 17:46:14 2015 +0000
+++ b/.hgtags Fri Jan 29 22:47:27 2016 +0000
@@ -35,3 +35,4 @@
f731589b0b250e4d63437c0ac7e9592e3386529a icedtea-3.0.0pre05
a9817b9f8a21ed88b203bc3983c2ffbec81fe65d icedtea-3.0.0pre06
7836b5436b70b9a9b1a48f663f55643eb1e28570 icedtea-3.0.0pre07
+969d84a2df36cffb274951ecb25c3a44e0ee2081 icedtea-3.0.0pre08
diff -r 7442a0ce54ca -r 0883b7a8311a ChangeLog
--- a/ChangeLog Thu Dec 24 17:46:14 2015 +0000
+++ b/ChangeLog Fri Jan 29 22:47:27 2016 +0000
@@ -1,3 +1,123 @@
+2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2804: test/tapset/jstaptest.pl should be executable
+ * Makefile.am:
+ (check-tapset-probes): Check that Perl is available
+ and, if, so use it to invoke the script. Replace
+ BUILD_OUTPUT_DIR with the OpenJDK 8 equivalent,
+ BUILD_IMAGE_DIR.
+ (check-tapset-jstack): Likewise.
+ * NEWS: Updated.
+ * configure.ac:
+ Check for Perl if SystemTap is found, so the
+ tests can be run if required.
+
+2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1983: Support using the system installation
+ of NSS with the SunEC provider
+ * INSTALL: Fix header from 'IcedTea7' to 'IcedTea'.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Make disable-intree-ec patch
+ conditional on whether or not the SunEC provider
+ is enabled. Add new variants of the NSS/PKCS11
+ configuration patch for cases where it is not applied.
+ (ICEDTEA_CONFIGURE): Pass --enable-system-nss or
+ --disable-system-nss, depending on whether or
+ not the SunEC provider is enabled.
+ (ICEDTEA_ENV): Remove DISABLE_INTREE_EC which
+ is not applicable in OpenJDK 8.
+ * README: Fix header from 'IcedTea7' to 'IcedTea'.
+ * patches/nss-config-with-sunec.patch,
+ * patches/nss-not-enabled-config-with-sunec.patch:
+ New variants of nss-config.patch and nss-not-enabled-config.patch
+ which apply when the SunEC provider is also enabled.
+
+2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * INSTALL: Document the SunEC provider.
+
+2014-05-09 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1762: Undefined references when building with NSS 3.16.1
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): For NSS >= 3.16.1, add -lfreebl
+ to SUNEC_LIBS, not SUNEC_CFLAGS, and use NSS_LIBS as
+ the base, not NSS_SOFTOKN_LIBS.
+
+2014-04-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1742: Allow SunEC provider to be built with changes
+ in NSS >= 3.16.1
+ * Makefile.am:
+ (ICEDTEA_ENV): Use SUNEC_LIBS and SUNEC_CFLAGS
+ instead of NSS_LIBS and NSS_CFLAGS respectively.
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): Use SUNEC_CFLAGS and SUNEC_LIBS
+ for clarity as NSS_CFLAGS and NSS_LIBS are also set
+ by the NSS detection.
+
+2014-04-18 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1699: Support building the SunEC provider
+ with system NSS
+ * Makefile.am:
+ (ICEDTEA_ENV): Set NSS_LIBS and NSS_CFLAGS
+ when ENABLE_SUNEC is set.
+ * acinclude.m4:
+ (IT_LOCATE_NSS): Fix wording to make it clear that
+ this is the PKCS11 provider, using NSS as the
+ implementation.
+ (IT_ENABLE_SUNEC): Allow the Sun elliptic curve
+ crypto provider to be enabled.
+ * configure.ac:
+ Replace IT_LOCATE_NSS with IT_ENABLE_SUNEC (which
+ depends on the former).
+ * fsg.sh.in:
+ Only delete the SunEC implementation code at this
+ level. This is the part that is legally dubious,
+ due to the use of many more elliptic curves than
+ those provided by the NSS version.
+ * remove-intree-libraries.sh.in:
+ Include the remaining SunEC deletion from fsg.sh
+ here and make it optional.
+
+2016-01-29 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2768: Move SystemTap GCC 4.5 patch to OpenJDK
+ tree or discard if no longer needed
+ * patches/systemtap-gcc-4.5.patch:
+ Removed; seems to be no longer needed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patch.
+ * NEWS: Updated.
+
+2016-01-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ Bump to icedtea-3.0.0pre08.
+ * patches/pr2777.patch: Removed; upstream.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-3.0.0pre08 tag.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (NASHORN_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ (NASHORN_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove pr2777 patch.
+ * NEWS: Updated.
+ * configure.ac: Bump to 3.0.0pre08.
+ * fsg.sh.in: Remove deletions of files which have
+ now been deleted upstream (PR2767)
+ * hotspot.map.in: Update to icedtea-3.0.0pre08 tag.
+
2015-12-23 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 7442a0ce54ca -r 0883b7a8311a INSTALL
--- a/INSTALL Thu Dec 24 17:46:14 2015 +0000
+++ b/INSTALL Fri Jan 29 22:47:27 2016 +0000
@@ -1,5 +1,5 @@
-Building IcedTea7
-=================
+Building IcedTea
+================
For convenience we've provided make targets that automatically
download, extract and patch the source code from the IcedTea forest
@@ -159,6 +159,7 @@
* --with-hotspot-build: The HotSpot to use, defaulting to 'original' i.e. hs14 as bundled with OpenJDK.
* --with-additional-vms=vm-list: Additional VMs to build using the system described
below.
+* --enable-sunec: Build the SunEC crypto provider against system NSS.
Testing
=======
@@ -205,8 +206,8 @@
/usr/lib/jvm/java-1.6.0-openjdk, then you should specify
--with-abs-install-dir=/usr/lib/jvm/java-1.6.0-openjdk.
-NSS Security Provider
-=====================
+The NSS PKCS11 Security Provider and Elliptic Curve Cryptography
+================================================================
OpenJDK includes an NSS-based security provider in the form of
sun.security.pkcs11.SunPKCS11. However, as this needs to know the
@@ -217,6 +218,14 @@
this configuration will be turned on in lib/security/java.security.
This can also be done manually at a later date.
+The PKCS11 option was originally added as it was the only way that
+elliptic curve cryptography support could be provided. From OpenJDK 7
+onwards, there is another provider, SunEC. This also utilises NSS, but
+directly via its ECC functions rather than the PKCS11 interface.
+Specifying --enable-sunec will build this provider, linked against
+NSS. Version 3.16.1 or later of NSS is required so that the
+appropriate softokn ABI is available to the provider.
+
CACAO
=====
diff -r 7442a0ce54ca -r 0883b7a8311a Makefile.am
--- a/Makefile.am Thu Dec 24 17:46:14 2015 +0000
+++ b/Makefile.am Fri Jan 29 22:47:27 2016 +0000
@@ -4,21 +4,21 @@
BUILD_VERSION = b24
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 7418bb690047
-JAXP_CHANGESET = c08ba71fef66
-JAXWS_CHANGESET = 2012603e0e90
-JDK_CHANGESET = c4b25140f059
-LANGTOOLS_CHANGESET = 3c76eafe1b70
-OPENJDK_CHANGESET = 4b05cb9c5a4c
-NASHORN_CHANGESET = fd478ce27023
+CORBA_CHANGESET = ebc2780ebeb3
+JAXP_CHANGESET = ac52a8eed353
+JAXWS_CHANGESET = 26a1fdce80b7
+JDK_CHANGESET = 809d98eeda49
+LANGTOOLS_CHANGESET = 0d3479e0bac6
+OPENJDK_CHANGESET = f0635543beb3
+NASHORN_CHANGESET = 7babac6e7ecf
-CORBA_SHA256SUM = e47d271bd2d0490d07d194480ae3943bc2617dc260b6cc2ef080697f588bbc62
-JAXP_SHA256SUM = ce0e1a6c850420735233e06667b32d32f91051ae4abb57f76c86343fbe3aa7d3
-JAXWS_SHA256SUM = 3b30942316cc58b2f461587f5032841d072cc31c1c4f4c62c60b9cc49713065e
-JDK_SHA256SUM = 8136f803b78577a35be6e481733b327831069723f1828f0c964c6d8689f459cc
-LANGTOOLS_SHA256SUM = d48f5de5ede27c075def8c79d2e3668223def1da671cc5b8a69b80fc7aeb2207
-OPENJDK_SHA256SUM = 12d6348124c133ed43cc1ac0dad0ce3eafb2e42947c36cc87df2f5163674a805
-NASHORN_SHA256SUM = e3a6e093e574a6a9d2cefc25184510c023ad4bd65fbb060085e969e23050a515
+CORBA_SHA256SUM = 330c609920179ee0c73fd40140c915bf1497ee00742d223d721babeb48d4ec66
+JAXP_SHA256SUM = e6771d28027925157e0f3573c7f2b58607d7ae4bb0fd77a6d38f154e7008c09b
+JAXWS_SHA256SUM = be44c6810e3b8dc8de0ca62dce7111016bb035e9b334af40cffdd9c27cca1ec2
+JDK_SHA256SUM = 55d51096e311e743533b0ccf7974e20588c1df08ac790edf226f06d49a699e25
+LANGTOOLS_SHA256SUM = 536db72b9440ef1ce11d1f87b15a2052a3f362fab04d5bedcd185839e742db86
+OPENJDK_SHA256SUM = fa45e6d4b7b2f114cb1d7388ab57f419b6f733e7be744cac4def586959da64b8
+NASHORN_SHA256SUM = b2509a50adfa4b29c0ae6e8c5b601fc2a76e9cc63da1d34443c6e0bf11a7c150
HS_TYPE = "`$(AWK) 'version==$$1 {print $$2}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
HS_URL = "`$(AWK) 'version==$$1 {print $$3}' version=$(HSBUILD) $(abs_top_builddir)/hotspot.map`"
@@ -229,9 +229,7 @@
ICEDTEA_PATCHES = \
patches/memory-limits.patch \
patches/override-redirect-metacity.patch \
- patches/rh1022017.patch \
- patches/disable-intree-ec.patch \
- patches/pr2777.patch
+ patches/rh1022017.patch
# Conditional patches
@@ -256,20 +254,29 @@
patches/pulse-soundproperties.patch
endif
-if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/systemtap-gcc-4.5.patch
-endif
-
if BUILD_JAMVM
ICEDTEA_PATCHES += \
patches/jamvm/find_class_from_caller.patch
endif
+if !ENABLE_SUNEC
+ICEDTEA_PATCHES += \
+ patches/disable-intree-ec.patch
+endif
+
if ENABLE_NSS
+if ENABLE_SUNEC
+ICEDTEA_PATCHES += patches/nss-config-with-sunec.patch
+else
ICEDTEA_PATCHES += patches/nss-config.patch
+endif
+else
+if ENABLE_SUNEC
+ICEDTEA_PATCHES += patches/nss-not-enabled-config-with-sunec.patch
else
ICEDTEA_PATCHES += patches/nss-not-enabled-config.patch
endif
+endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -350,6 +357,14 @@
--with-giflib=bundled
endif
+if ENABLE_SUNEC
+ICEDTEA_CONFIGURE += \
+ --enable-system-nss
+else
+ICEDTEA_CONFIGURE += \
+ --disable-system-nss
+endif
+
if ZERO_BUILD
ICEDTEA_CONFIGURE += \
--with-jvm-variants=zero
@@ -395,7 +410,6 @@
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
DEBUG_CLASSFILES="true" \
DEBUG_BINARIES="true" \
- DISABLE_INTREE_EC="true" \
LOG="debug" SCTP_WERROR= \
POST_STRIP_CMD= STRIP_POLICY="no_strip" \
JOBS="$(PARALLEL_JOBS)"
@@ -464,6 +478,12 @@
GIF_CFLAGS="${GIF_CFLAGS}"
endif
+if ENABLE_SUNEC
+ICEDTEA_ENV += \
+ NSS_LIBS="${SUNEC_LIBS}" \
+ NSS_CFLAGS="${SUNEC_CFLAGS}"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_CONFIGURE_BOOT = $(ICEDTEA_CONFIGURE)
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
@@ -2292,15 +2312,21 @@
check-tapset-probes:
if ENABLE_SYSTEMTAP
- $(abs_top_srcdir)/test/tapset/jstaptest.pl \
- -B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
+ if test "x${PERL}" = "x"; then \
+ echo "ERROR: Perl not found"; exit -1; \
+ fi
+ ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
-S $(abs_top_srcdir)/test/tapset \
-a test/check-stap.log -p
endif
check-tapset-jstack:
if ENABLE_SYSTEMTAP
- $(abs_top_srcdir)/test/tapset/jstaptest.pl \
+ if test "x${PERL}" = "x"; then \
+ echo "ERROR: Perl not found"; exit -1; \
+ fi
+ ${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
-B $(BUILD_OUTPUT_DIR) -A $(BUILD_ARCH_DIR) \
-S $(abs_top_srcdir)/test/tapset \
-a test/check-stap.log -j
diff -r 7442a0ce54ca -r 0883b7a8311a NEWS
--- a/NEWS Thu Dec 24 17:46:14 2015 +0000
+++ b/NEWS Fri Jan 29 22:47:27 2016 +0000
@@ -27,6 +27,7 @@
- S8087218, PR2740: Constant fold loads from final instance fields in VM anonymous classes
- S8139932, PR2739: Typo in makefile changes for 8043805 [Allow using a system-installed libjpeg]
- S8140483, PR2740: Atomic*FieldUpdaters final fields should be trusted
+ - S8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
* Bug fixes
- S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
- PR94: empty install target in Makefile.am
@@ -44,6 +45,7 @@
- PR1359: Check for /usr/lib64 JVMs and generic JPackage alternative
- PR1364: Replace hgforest support
- PR1367: Support using the system installation of LCMS
+ - PR1368: Ensure debug data is available for all libraries and binaries without redundant files
- PR1369: Remove outdated bootstrap configure tests or make them fail on error
- PR1377: Forwardport javac detection / usability test from IcedTea 2.x
- PR1379: Add build support for Zero AArch64
@@ -71,11 +73,13 @@
- PR1979: Support using the system installation of libjpeg
- PR1980: Support using the system installation of giflib
- PR1981: Support using the system installation of libpng
+ - PR1983: Support using the system installation of NSS with the SunEC provider
- PR1994: make dist broken
- PR2001: Synchronise HEAD tarball paths with release branch paths
- PR2066: Unset OS before running OpenJDK build
- PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
- PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
+ - PR2127: SunEC provider crashes when built using system NSS
- PR2199: Support giflib 5.1.0
- PR2212: DGifCloseFile call should check the return value, not the error code, for failure
- PR2227: giflib 5.1 conditional excludes 6.0, 7.0, etc.
@@ -83,6 +87,7 @@
- PR2248: HotSpot tarball fails verification after download
- PR2256: Add SystemTap tests
- PR2257: clean-extract-nashorn rule is never run
+ - PR2321: Checksum of policy JAR files changes on every build
- PR2329: jamvm parallel unpack failures
- PR2339: Fail early if there is no native HotSpot JIT & all other options are disabled
- PR2348: Avoid following symlinks for CACAO and JamVM patches
@@ -112,6 +117,7 @@
- PR2448: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
- PR2454: install-data-local needs to check that classes.jsa actually exists
- PR2456: Installation path for hotspot_gc.stp is wrong, due to changed j2sdk-image location
+ - PR2459: Policy JAR files should be timestamped with the date of the policy file they hold
- PR2511: Reset success following calls in LayoutManager.cpp
- PR2631: jvm.cfg missing for ppc64le
- PR2633: s390 builds still fail as BUILD_NUM_BITS is never set
@@ -121,7 +127,11 @@
- PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path
- PR2743: Remove bad AArch64 merge fragment
- PR2759: LCMS library should be named javalcms, not lcms, to avoid potential conflicts with the system library
+ - PR2767: Remove remaining rogue binaries from OpenJDK tree
+ - PR2768: Move SystemTap GCC 4.5 patch to OpenJDK tree or discard if no longer needed
- PR2777: Fix MAX/MIN template usage on s390
+ - PR2804: test/tapset/jstaptest.pl should be executable
+ - PR2815: Race condition in SunEC provider with system NSS
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
diff -r 7442a0ce54ca -r 0883b7a8311a README
--- a/README Thu Dec 24 17:46:14 2015 +0000
+++ b/README Fri Jan 29 22:47:27 2016 +0000
@@ -1,5 +1,5 @@
-IcedTea7
-========
+IcedTea
+=======
The IcedTea project provides a harness to build the source code from
openjdk.java.net using Free Software tools and dependencies.
diff -r 7442a0ce54ca -r 0883b7a8311a acinclude.m4
--- a/acinclude.m4 Thu Dec 24 17:46:14 2015 +0000
+++ b/acinclude.m4 Fri Jan 29 22:47:27 2016 +0000
@@ -1396,10 +1396,10 @@
AC_DEFUN_ONCE([IT_LOCATE_NSS],
[
AC_REQUIRE([IT_OBTAIN_DEFAULT_LIBDIR])
-AC_MSG_CHECKING([whether to enable the NSS-based security provider])
+AC_MSG_CHECKING([whether to enable the PKCS11 crypto provider using NSS])
AC_ARG_ENABLE([nss],
[AS_HELP_STRING([--enable-nss],
- [Enable inclusion of NSS security provider])],
+ [Enable inclusion of PKCS11 crypto provider using NSS])],
[ENABLE_NSS="${enableval}"], [ENABLE_NSS='no'])
AM_CONDITIONAL([ENABLE_NSS], [test x$ENABLE_NSS = xyes])
if test "x${ENABLE_NSS}" = "xyes"
@@ -1943,3 +1943,40 @@
AC_MSG_RESULT([$has_native_hotspot_port])
])
+AC_DEFUN_ONCE([IT_ENABLE_SUNEC],
+[
+ AC_REQUIRE([IT_LOCATE_NSS])
+ AC_MSG_CHECKING([whether to enable the Sun elliptic curve crypto provider])
+ AC_ARG_ENABLE([sunec],
+ [AS_HELP_STRING(--enable-sunec,build the Sun elliptic curve crypto provider [[default=no]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_sunec=yes
+ ;;
+ *)
+ enable_sunec=no
+ ;;
+ esac
+ ],
+ [
+ enable_sunec=no
+ ])
+ AC_MSG_RESULT([$enable_sunec])
+ AM_CONDITIONAL([ENABLE_SUNEC], test x"${enable_sunec}" = "xyes")
+ if test x"${enable_sunec}" = "xyes"; then
+ PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
+ PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
+ if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS=$NSS_SOFTOKN_CFLAGS;
+ SUNEC_LIBS="$NSS_LIBS -lfreebl";
+ elif test "x${NSS_JAVA_FOUND}" = "xyes"; then
+ SUNEC_CFLAGS="$NSS_JAVA_CFLAGS -DLEGACY_NSS";
+ SUNEC_LIBS=$NSS_JAVA_LIBS;
+ else
+ AC_MSG_ERROR([Could not find a suitable NSS installation to use for the SunEC provider.])
+ fi
+ AC_SUBST(SUNEC_CFLAGS)
+ AC_SUBST(SUNEC_LIBS)
+ fi
+])
diff -r 7442a0ce54ca -r 0883b7a8311a configure.ac
--- a/configure.ac Thu Dec 24 17:46:14 2015 +0000
+++ b/configure.ac Fri Jan 29 22:47:27 2016 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [3.0.0pre07], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [3.0.0pre08], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -58,6 +58,7 @@
IT_DISABLE_HOTSPOT_TESTS
IT_DISABLE_LANGTOOLS_TESTS
IT_DISABLE_JDK_TESTS
+IT_ENABLE_SUNEC
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
@@ -79,7 +80,6 @@
AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
AC_MSG_RESULT(${ENABLE_DOCS})
-IT_LOCATE_NSS
IT_GET_PKGVERSION
IT_GET_LSB_DATA
@@ -252,6 +252,14 @@
inst.method(24);
]])], [AC_MSG_RESULT([yes])], [SDT_H_FOUND='no'; AC_MSG_WARN([systemtap sdt.h or g++ too old])])
AC_LANG_POP([C++])
+if test "x${SDT_H_FOUND}" = "xyes"; then
+ AC_PATH_TOOL([PERL],[perl])
+ if test x"${PERL}" = x ; then
+ AC_MSG_WARN([Perl not found in PATH; SystemTap tests will not be able to run])
+ fi
+ AC_SUBST(PERL)
+fi
+
AM_CONDITIONAL([ENABLE_SYSTEMTAP], [test x$SDT_H_FOUND = xyes])
AC_MSG_CHECKING([for absolute java home install dir])
diff -r 7442a0ce54ca -r 0883b7a8311a fsg.sh.in
--- a/fsg.sh.in Thu Dec 24 17:46:14 2015 +0000
+++ b/fsg.sh.in Fri Jan 29 22:47:27 2016 +0000
@@ -5,35 +5,13 @@
# PRx denotes bug x in the IcedTea bug database (http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=x)
# Sx denotes bug x in the Sun/Oracle bug database (https://bugs.openjdk.java.net/browse/JDK-X)
More information about the distro-pkg-dev
mailing list