/hg/release/icedtea7-2.6: 11 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 29 03:17:26 UTC 2016
changeset cafef061b9d4 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=cafef061b9d4
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 28 16:04:20 2016 +0100
S7175845, PR1437, RH1207129: 'jar uf' changes file permissions unexpectedly
2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
S7175845, PR1437, RH1207129: 'jar uf' changes file
permissions unexpectedly
* Makefile.am:
(icedtea): Correct permissions of sa-jdi.jar and
resources.jar if PR1437 was present in the bootstrap
JDK.
(icedtea-debug): Likewise.
(icedtea-boot): Likewise.
* acinclude.m4:
(IT_FIND_JAR): Check for PR1437 in the bootstrap
jar program and define PR1437_PRESENT if it exhibits.
changeset f5504d3e6a80 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=f5504d3e6a80
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jul 27 05:29:59 2016 +0100
PR2799: Files are missing from resources.jar
2016-07-26 Andrew John Hughes <gnu.andrew at redhat.com>
PR2799: Files are missing from resources.jar
* Makefile.am:
(MIME_TYPE_CHECK_BUILD_DIR): Add build directory
for mime type check.
(MIME_TYPE_CHECK_SRCS): Specify sources for
mime type check.
(EXTRA_DIST): Distribute mime type check sources.
(check-local): Depend on check-mimetype.
(clean-tests): Depend on clean-check-mimetype.
(clean-local): Depend on clean-mimetypecheck.
(.PHONY): Depend on clean-check-mimetype,
clean-mimetypecheck, clean-add-mime-types-file,
clean-add-mime-types-file-debug and
clean-add-mime-types-file-boot.
(add-mime-types-file): Add a symlink to the
system mime.types file if found.
(clean-add-mime-types-file): Remove symlink
to the system mime types file.
(add-mime-types-file-debug): Add a symlink to the
system mime.types file, if found, in the debug build.
(clean-add-mime-types-file-debug): Remove symlink
to the system mime types file in the debug build.
(icedtea-stage2): Depend on add-mime-types-file.
(clean-icedtea-stage2): Depend on clean-add-mime-types-file.
(icedtea-debug-stage2): Depend on add-mime-types-file-debug.
(clean-icedtea-debug-stage2): Depend on clean-add-mime-types-file-debug.
(add-mime-types-file-boot): Add a symlink to the
system mime.types file, if found, in the bootstrap build.
(clean-add-mime-types-file-boot): Remove symlink
to the system mime types file in the bootstrap build.
(icedtea-stage1): Depend on add-mime-types-file-boot.
(clean-icedtea-stage1): Depend on clean-add-mime-types-file-boot.
(check-mimetype): Check that we can recognise a HTML
file and (if system mime.types is available) a Java file.
(clean-check-mimetype): Cleanup after check-mimetype.
(mimetypecheck): Build the MIME type check.
(clean-mimetypecheck): Remove MIME type check build.
(install-data-local): Install the mime.types symlink.
* acinclude.m4:
(IT_CHECK_FOR_MIME_TYPES): Check for a system mime.types
file and define MIME_TYPES_FILE_FOUND if located.
* configure.ac:
Invoke IT_CHECK_FOR_MIME_TYPES.
* test/RH1195203.java: Testcase to get Java to print
the MIME type of a file.
changeset 101843a7ca92 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=101843a7ca92
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 29 03:52:41 2016 +0100
PR3111: Provide option to disable SystemTap tests
2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3111: Provide option to disable SystemTap tests
* INSTALL: Document --disable-systemtap-tests.
* Makefile.am:
(SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
are enabled.
(check-local): Use SYSTEMTAP_TEST_SUITE in place
of check-tapset.
(.PHONY): Add check-jdk, check-hotspot, check-langtools,
jtregcheck, check-tapset, check-tapset-probes and
check-tapset-jstack
* NEWS: Updated.
* acinclude.m4:
(IT_DISABLE_SYSTEMTAP_TESTS): Add option to
disable SystemTap tests.
* configure.ac:
Call IT_DISABLE_SYSTEMTAP_TESTS.
changeset 87a23724eac2 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=87a23724eac2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 29 03:56:15 2016 +0100
PR3115: Add check for elliptic curve cryptography implementation.
2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3115: Add check for elliptic curve
cryptography implementation.
* TestCryptoLevel.java: Moved to
test/standalone.
* rewriter/agpl-3.0.txt: Moved to
root directory.
* test/RH1195203.java: Likewise.
* Makefile.am:
(ECC_CHECK_BUILD_DIR): Added.
(CRYPTO_CHECK_SRCS): Update TestCryptoLevel.java
path.
(ECC_CHECK_SRCS): Added.
(MIME_TYPE_CHECK_SRCS): Update path.
(EXTRA_DIST): Add ECC_CHECK_SRCS.
(check-local): Add check-ecc.
(clean-tests): Add clean-check-ecc.
(clean-local): Add clean-ecccheck.
(ecccheck): Build ECC check test.
(clean-ecccheck): Cleanup ECC check test.
(check-ecc): Run ECC check test.
(clean-check-ecc): Cleanup run of ECC check test.
* NEWS: Updated.
* agpl-3.0.txt: Moved from rewriter as also
applies to tests.
* test/standalone/RH1195203.java: Moved from test.
* test/standalone/TestCryptoLevel.java: Moved from
root directory.
* test/standalone/TestEllipticCurveCryptoSupport.java:
Add check for elliptic curve cryptography support.
changeset 7f2aabb014c8 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=7f2aabb014c8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 28 03:55:52 2016 +0100
PR2900: Don't use WithSeed versions of NSS functions as they don't fully process the seed
2016-04-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2900: Don't use WithSeed versions of NSS
functions as they don't fully process the seed
* Makefile.am:
(ECC_CHECK_SRCS): Add TestECDSA.java
(ecccheck): Only compile tests if SunEC is enabled.
(clean-ecccheck): Only remove build directory if
SunEC is enabled.
(check-ecc): Only run tests if SunEC is enabled.
Add running of TestECDSA. Call set -e so rule
fails if any test fails.
* test/standalone/TestECDSA.java:
New test to make sure SunEC can produce ECDSA
signatures.
changeset 2141e7831540 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=2141e7831540
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 29 04:11:18 2016 +0100
PR3091: SystemTap is heavily confused by multiple JDKs
2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
PR3091: SystemTap is heavily confused
by multiple JDKs
* AUTHORS: Added Felix Lu.
* NEWS: Updated.
2016-07-13 Felix Lu <flu at redhat.com>
PR3091: SystemTap is heavily confused
by multiple JDKs
* tapset/hotspot.stp.in,
* tapset/jstack.stp.in:
Use the new private keyword in SystemTap
>= 3.0 to resolve global variable name
collision and function overloading
to select the correct jstack_call at runtime.
changeset 937c6c005478 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=937c6c005478
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 29 04:14:22 2016 +0100
PR3103: Handle case in clean-fonts where linux.fontconfig.Gentoo.properties.old has not been created
2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
PR3103: Handle case in clean-fonts where
linux.fontconfig.Gentoo.properties.old has
not been created
* Makefile.am:
(clean-fonts): Guard movement of old
Gentoo.properties.old file with a
check to see if it exists.
* NEWS: Updated.
changeset c05a822a6ec0 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=c05a822a6ec0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 29 04:16:05 2016 +0100
PR3114: Don't assume system mime.types supports text/x-java-source
2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3114: Don't assume system mime.types
supports text/x-java-source
* Makefile.am:
(check-mimetype): Make second test depend
on JAVA_SOURCE_SUPPORTED conditional,
not MIME_TYPES_FILE_FOUND.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_MIME_TYPES): Check if the
system mime types file supports text/x-java-source.
changeset b1af4fd3e218 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b1af4fd3e218
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 28 18:16:27 2016 +0100
PR3116: Add tests for Java debug info and source files
2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3116: Add tests for Java debug info and
source files
* Makefile.am:
(check-java-debug): Guard with
ENABLE_JAVA_DEBUGINFO.
* NEWS: Updated.
2016-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3116: Add tests for Java debug info and
source files
* Makefile.am:
(check-local): Depend on check-java-debug and
check-java-src.
(clean-tests): Depend on clean-check-java-debug
and clean-check-java-src.
(.PHONY): Add clean-check-java-src and
clean-check-java-debug.
(check-java-debug): Adapt Omair Majid's Java debug
info test from Fedora RPM to IcedTea.
(clean-check-java-debug): Cleanup target for
check-java-debug.
(check-java-src): Adapt Omair Majid's Java source
file test from Fedora RPM to IcedTea.
(clean-check-java-src): Cleanup target for
check-java-src.
changeset a1ed0cb79278 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=a1ed0cb79278
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 28 18:21:44 2016 +0100
PR3118: Path to agpl-3.0.txt not updated
2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR3118: Path to agpl-3.0.txt not updated
* Makefile.am:
(EXTRA_DIST): Fix path to agpl-3.0.txt.
* NEWS: Updated.
changeset b7395c471519 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=b7395c471519
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 28 19:58:24 2016 +0100
PR3119: Makefile handles cacerts as a symlink, but the configure check doesn't
2016-04-06 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR3119: Makefile handles cacerts as a symlink,
but the configure check doesn't
* Makefile.am:
(JDK_CACERTS_FILE): Removed as no longer needed.
(CACERTS_FILE): Just use @ALT_CACERTS_FILE@ directly
as it will have been resolved by configure.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_CACERTS_FILE): Detect if the cacerts is
a symlink and resolve it if so.
diffstat:
AUTHORS | 1 +
ChangeLog | 220 ++++++
INSTALL | 1 +
Makefile.am | 252 ++++++-
NEWS | 8 +
TestCryptoLevel.java | 78 --
acinclude.m4 | 68 ++-
agpl-3.0.txt | 661 ++++++++++++++++++++
configure.ac | 3 +
rewriter/agpl-3.0.txt | 661 --------------------
tapset/hotspot.stp.in | 3 +-
tapset/jstack.stp.in | 54 +-
test/standalone/RH1195203.java | 32 +
test/standalone/TestCryptoLevel.java | 78 ++
test/standalone/TestECDSA.java | 49 +
test/standalone/TestEllipticCurveCryptoSupport.java | 190 +++++
16 files changed, 1581 insertions(+), 778 deletions(-)
diffs (truncated from 2762 to 500 lines):
diff -r d068fb796035 -r b7395c471519 AUTHORS
--- a/AUTHORS Fri Jul 29 03:33:41 2016 +0100
+++ b/AUTHORS Thu Jul 28 19:58:24 2016 +0100
@@ -25,6 +25,7 @@
Matthias Klose <doko at ubuntu.com>
Francis Kung <fkung at redhat.com>
Trustin Lee <http://t.motd.kr>
+Felix Lu <flu at redhat.com>
DJ Lucas <dj at linuxfromscratch.org>
Omair Majid <omajid at redhat.com>
Casey Marshall <csm at gnu.org>
diff -r d068fb796035 -r b7395c471519 ChangeLog
--- a/ChangeLog Fri Jul 29 03:33:41 2016 +0100
+++ b/ChangeLog Thu Jul 28 19:58:24 2016 +0100
@@ -1,3 +1,223 @@
+2016-04-06 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3119: Makefile handles cacerts as a symlink,
+ but the configure check doesn't
+ * Makefile.am:
+ (JDK_CACERTS_FILE): Removed as no longer needed.
+ (CACERTS_FILE): Just use @ALT_CACERTS_FILE@ directly
+ as it will have been resolved by configure.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_CACERTS_FILE): Detect if the cacerts is
+ a symlink and resolve it if so.
+
+2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3118: Path to agpl-3.0.txt not updated
+ * Makefile.am:
+ (EXTRA_DIST): Fix path to agpl-3.0.txt.
+ * NEWS: Updated.
+
+2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3116: Add tests for Java debug info and
+ source files
+ * Makefile.am:
+ (check-java-debug): Guard with
+ ENABLE_JAVA_DEBUGINFO.
+ * NEWS: Updated.
+
+2016-07-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3116: Add tests for Java debug info and
+ source files
+ * Makefile.am:
+ (check-local): Depend on check-java-debug and
+ check-java-src.
+ (clean-tests): Depend on clean-check-java-debug
+ and clean-check-java-src.
+ (.PHONY): Add clean-check-java-src and
+ clean-check-java-debug.
+ (check-java-debug): Adapt Omair Majid's Java debug
+ info test from Fedora RPM to IcedTea.
+ (clean-check-java-debug): Cleanup target for
+ check-java-debug.
+ (check-java-src): Adapt Omair Majid's Java source
+ file test from Fedora RPM to IcedTea.
+ (clean-check-java-src): Cleanup target for
+ check-java-src.
+
+2016-07-27 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3114: Don't assume system mime.types
+ supports text/x-java-source
+ * Makefile.am:
+ (check-mimetype): Make second test depend
+ on JAVA_SOURCE_SUPPORTED conditional,
+ not MIME_TYPES_FILE_FOUND.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_MIME_TYPES): Check if the
+ system mime types file supports text/x-java-source.
+
+2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3103: Handle case in clean-fonts where
+ linux.fontconfig.Gentoo.properties.old has
+ not been created
+ * Makefile.am:
+ (clean-fonts): Guard movement of old
+ Gentoo.properties.old file with a
+ check to see if it exists.
+ * NEWS: Updated.
+
+2016-07-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR3091: SystemTap is heavily confused
+ by multiple JDKs
+ * AUTHORS: Added Felix Lu.
+ * NEWS: Updated.
+
+2016-07-13 Felix Lu <flu at redhat.com>
+
+ PR3091: SystemTap is heavily confused
+ by multiple JDKs
+ * tapset/hotspot.stp.in,
+ * tapset/jstack.stp.in:
+ Use the new private keyword in SystemTap
+ >= 3.0 to resolve global variable name
+ collision and function overloading
+ to select the correct jstack_call at runtime.
+
+2016-04-23 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2900: Don't use WithSeed versions of NSS
+ functions as they don't fully process the seed
+ * Makefile.am:
+ (ECC_CHECK_SRCS): Add TestECDSA.java
+ (ecccheck): Only compile tests if SunEC is enabled.
+ (clean-ecccheck): Only remove build directory if
+ SunEC is enabled.
+ (check-ecc): Only run tests if SunEC is enabled.
+ Add running of TestECDSA. Call set -e so rule
+ fails if any test fails.
+ * test/standalone/TestECDSA.java:
+ New test to make sure SunEC can produce ECDSA
+ signatures.
+
+2015-05-20 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR3115: Add check for elliptic curve
+ cryptography implementation.
+ * TestCryptoLevel.java: Moved to
+ test/standalone.
+ * rewriter/agpl-3.0.txt: Moved to
+ root directory.
+ * test/RH1195203.java: Likewise.
+ * Makefile.am:
+ (ECC_CHECK_BUILD_DIR): Added.
+ (CRYPTO_CHECK_SRCS): Update TestCryptoLevel.java
+ path.
+ (ECC_CHECK_SRCS): Added.
+ (MIME_TYPE_CHECK_SRCS): Update path.
+ (EXTRA_DIST): Add ECC_CHECK_SRCS.
+ (check-local): Add check-ecc.
+ (clean-tests): Add clean-check-ecc.
+ (clean-local): Add clean-ecccheck.
+ (ecccheck): Build ECC check test.
+ (clean-ecccheck): Cleanup ECC check test.
+ (check-ecc): Run ECC check test.
+ (clean-check-ecc): Cleanup run of ECC check test.
+ * NEWS: Updated.
+ * agpl-3.0.txt: Moved from rewriter as also
+ applies to tests.
+ * test/standalone/RH1195203.java: Moved from test.
+ * test/standalone/TestCryptoLevel.java: Moved from
+ root directory.
+ * test/standalone/TestEllipticCurveCryptoSupport.java:
+ Add check for elliptic curve cryptography support.
+
+2016-03-04 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR3111: Provide option to disable SystemTap tests
+ * INSTALL: Document --disable-systemtap-tests.
+ * Makefile.am:
+ (SYSTEMTAP_TEST_SUITE): Define if SystemTap tests
+ are enabled.
+ (check-local): Use SYSTEMTAP_TEST_SUITE in place
+ of check-tapset.
+ (.PHONY): Add check-jdk, check-hotspot, check-langtools,
+ jtregcheck, check-tapset, check-tapset-probes and
+ check-tapset-jstack
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_DISABLE_SYSTEMTAP_TESTS): Add option to
+ disable SystemTap tests.
+ * configure.ac:
+ Call IT_DISABLE_SYSTEMTAP_TESTS.
+
+2016-07-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2799: Files are missing from resources.jar
+ * Makefile.am:
+ (MIME_TYPE_CHECK_BUILD_DIR): Add build directory
+ for mime type check.
+ (MIME_TYPE_CHECK_SRCS): Specify sources for
+ mime type check.
+ (EXTRA_DIST): Distribute mime type check sources.
+ (check-local): Depend on check-mimetype.
+ (clean-tests): Depend on clean-check-mimetype.
+ (clean-local): Depend on clean-mimetypecheck.
+ (.PHONY): Depend on clean-check-mimetype,
+ clean-mimetypecheck, clean-add-mime-types-file,
+ clean-add-mime-types-file-debug and
+ clean-add-mime-types-file-boot.
+ (add-mime-types-file): Add a symlink to the
+ system mime.types file if found.
+ (clean-add-mime-types-file): Remove symlink
+ to the system mime types file.
+ (add-mime-types-file-debug): Add a symlink to the
+ system mime.types file, if found, in the debug build.
+ (clean-add-mime-types-file-debug): Remove symlink
+ to the system mime types file in the debug build.
+ (icedtea-stage2): Depend on add-mime-types-file.
+ (clean-icedtea-stage2): Depend on clean-add-mime-types-file.
+ (icedtea-debug-stage2): Depend on add-mime-types-file-debug.
+ (clean-icedtea-debug-stage2): Depend on clean-add-mime-types-file-debug.
+ (add-mime-types-file-boot): Add a symlink to the
+ system mime.types file, if found, in the bootstrap build.
+ (clean-add-mime-types-file-boot): Remove symlink
+ to the system mime types file in the bootstrap build.
+ (icedtea-stage1): Depend on add-mime-types-file-boot.
+ (clean-icedtea-stage1): Depend on clean-add-mime-types-file-boot.
+ (check-mimetype): Check that we can recognise a HTML
+ file and (if system mime.types is available) a Java file.
+ (clean-check-mimetype): Cleanup after check-mimetype.
+ (mimetypecheck): Build the MIME type check.
+ (clean-mimetypecheck): Remove MIME type check build.
+ (install-data-local): Install the mime.types symlink.
+ * acinclude.m4:
+ (IT_CHECK_FOR_MIME_TYPES): Check for a system mime.types
+ file and define MIME_TYPES_FILE_FOUND if located.
+ * configure.ac:
+ Invoke IT_CHECK_FOR_MIME_TYPES.
+ * test/RH1195203.java: Testcase to get Java to print
+ the MIME type of a file.
+
+2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ S7175845, PR1437, RH1207129: 'jar uf' changes file
+ permissions unexpectedly
+ * Makefile.am:
+ (icedtea): Correct permissions of sa-jdi.jar and
+ resources.jar if PR1437 was present in the bootstrap
+ JDK.
+ (icedtea-debug): Likewise.
+ (icedtea-boot): Likewise.
+ * acinclude.m4:
+ (IT_FIND_JAR): Check for PR1437 in the bootstrap
+ jar program and define PR1437_PRESENT if it exhibits.
+
2016-07-28 Andrew John Hughes <gnu.andrew at member.fsf.org>
Bump to icedtea-2.6.7.
diff -r d068fb796035 -r b7395c471519 INSTALL
--- a/INSTALL Fri Jul 29 03:33:41 2016 +0100
+++ b/INSTALL Thu Jul 28 19:58:24 2016 +0100
@@ -238,6 +238,7 @@
* --disable-hotspot-tests: Disable the running of the HotSpot JTReg suite.
* --disable-langtools-tests: Disable the running of the langtools JTReg suite.
* --disable-jdk-tests: Disable the running of the jdk JTreg suite.
+* --disable-systemtap-tests: Disable the running of the SystemTap test suite.
* --disable-xrender: Don't include the XRender pipeline.
* --enable-nss: Enable the NSS security provider.
* --enable-cacao: Replace HotSpot with the CACAO VM.
diff -r d068fb796035 -r b7395c471519 Makefile.am
--- a/Makefile.am Fri Jul 29 03:33:41 2016 +0100
+++ b/Makefile.am Thu Jul 28 19:58:24 2016 +0100
@@ -70,6 +70,8 @@
STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
+ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build
+MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build
STAGE1_BOOT_RUNTIME = $(STAGE1_BOOT_DIR)/jre/lib/rt.jar
STAGE2_BOOT_RUNTIME = $(STAGE2_BOOT_DIR)/jre/lib/rt.jar
FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
@@ -91,10 +93,7 @@
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
-JDK_CACERTS_FILE = @ALT_CACERTS_FILE@
-
-CACERTS_FILE = \
- `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
+CACERTS_FILE = @ALT_CACERTS_FILE@
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_CLASSES =
@@ -366,7 +365,10 @@
# Sources list
REWRITER_SRCS = $(top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
-CRYPTO_CHECK_SRCS = $(top_srcdir)/TestCryptoLevel.java
+CRYPTO_CHECK_SRCS = $(top_srcdir)/test/standalone/TestCryptoLevel.java
+ECC_CHECK_SRCS = $(top_srcdir)/test/standalone/TestEllipticCurveCryptoSupport.java \
+ $(top_srcdir)/test/standalone/TestECDSA.java
+MIME_TYPE_CHECK_SRCS = $(top_srcdir)/test/standalone/RH1195203.java
# Patch list
@@ -710,6 +712,10 @@
PAX_COMMAND="${PAX_COMMAND}"
endif
+if !DISABLE_SYSTEMTAP_TESTS
+SYSTEMTAP_TEST_SUITE = check-tapset
+endif
+
if ENABLE_SUNEC
ICEDTEA_ENV += \
SYSTEM_NSS="true" \
@@ -914,19 +920,24 @@
tapset/hotspot_gc.stp.in \
scripts/jni_create_stap.c \
scripts/jni_desc \
- rewriter/agpl-3.0.txt \
+ agpl-3.0.txt \
$(REWRITER_SRCS) \
test/tapset \
- $(CRYPTO_CHECK_SRCS)
+ $(CRYPTO_CHECK_SRCS) \
+ $(ECC_CHECK_SRCS) \
+ $(MIME_TYPE_CHECK_SRCS)
# Top-Level Targets
# =================
all-local: icedtea-stage2 $(DESKTOP_FILES)
-check-local: jtregcheck check-tapset
-
-clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports
+check-local: jtregcheck $(SYSTEMTAP_TEST_SUITE) check-ecc check-mimetype \
+ check-java-debug check-java-src
+
+clean-tests: clean-jtreg clean-tapset-report clean-jtreg-reports \
+ clean-check-ecc clean-check-mimetype clean-check-java-debug \
+ clean-check-java-src
if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
if [ -e test ] ; then \
rmdir test ; \
@@ -942,7 +953,7 @@
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \
clean-add-tzdata-support-debug clean-cryptocheck clean-policytool- at JAVA_VER@.desktop \
- clean-jconsole- at JAVA_VER@.desktop
+ clean-jconsole- at JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -967,13 +978,13 @@
clean-bootstrap-directory-symlink-stage1 icedtea icedtea-debug \
clean-icedtea icedtea-stage2 clean-icedtea-boot \
clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
- jtregcheck clean-remove-intree-libraries \
+ jtregcheck clean-remove-intree-libraries clean-check-java-src \
clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \
clean-extract-hotspot clean-sanitise-openjdk \
clean-tests clean-tapset-report clean-add-systemtap \
clean-add-systemtap-debug clean-add-systemtap-boot \
clean-add-nss clean-add-tzdata-support clean-add-tzdata-support-debug \
- clean-add-tzdata-support-boot \
+ clean-add-tzdata-support-boot clean-check-mimetype clean-mimetypecheck \
clean-check-crypto clean-check-crypto-debug clean-check-crypto-boot \
clean-add-archive clean-add-archive-debug clean-add-archive-boot clean-cryptocheck \
clean-download-hotspot clean-download-corba clean-download-jaxp \
@@ -981,7 +992,10 @@
clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
clean-extract-langtools clean-split-debuginfo clean-split-debuginfo-debug \
clean-split-debuginfo-boot clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop \
- clean-fonts
+ clean-fonts clean-add-mime-types-file clean-add-mime-types-file-debug clean-add-mime-types-file-boot \
+ clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
+ check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
+ check-tapset-jstack clean-check-java-debug
env:
@echo 'unset JAVA_HOME'
@@ -1643,7 +1657,9 @@
clean-fonts:
rm -f $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties
- mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,}
+ if [ -e $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties.old ] ; then \
+ mv $(FONTCONFIG_PATH)/linux.fontconfig.Gentoo.properties{.old,} ; \
+ fi
rm -f stamps/fonts.stamp
stamps/patch-fsg.stamp: stamps/extract.stamp stamps/fonts.stamp
@@ -2034,6 +2050,14 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
endif
+# Fix permissions on JARs updated during build if PR1437 bug is present
+if PR1437_PRESENT
+ if [ -e $(BUILD_SDK_DIR)/lib/sa-jdi.jar ] ; then \
+ chmod g+r,o+r $(BUILD_SDK_DIR)/lib/sa-jdi.jar ; \
+ fi
+ chmod g+r,o+r $(BUILD_JRE_DIR)/lib/resources.jar
+ chmod g+r,o+r $(BUILD_SDK_DIR)/jre/lib/resources.jar
+endif
@echo "IcedTea is served:" $(BUILD_SDK_DIR)
mkdir -p stamps
touch $@
@@ -2140,6 +2164,20 @@
rm -rvf $(BUILD_DEBUGINFO_DIR)
rm -f stamps/split-debuginfo.stamp
+stamps/add-mime-types-file.stamp: stamps/icedtea.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file:
+ if [ -e $(BUILD_SDK_DIR)/jre/lib/mime.types ] ; then \
+ rm -vf $(BUILD_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+ rm -f stamps/add-mime-types-file.stamp
+
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \
stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \
stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp
@@ -2164,6 +2202,14 @@
if ENABLE_JAMVM
printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
endif
+# Fix permissions on JARs updated during build if PR1437 bug is present
+if PR1437_PRESENT
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/lib/sa-jdi.jar ] ; then \
+ chmod g+r,o+r $(BUILD_DEBUG_SDK_DIR)/lib/sa-jdi.jar ; \
+ fi
+ chmod g+r,o+r $(BUILD_DEBUG_JRE_DIR)/lib/resources.jar
+ chmod g+r,o+r $(BUILD_DEBUG_SDK_DIR)/jre/lib/resources.jar
+endif
@echo "IcedTea (debug build) is served:" $(BUILD_DEBUG_SDK_DIR)
mkdir -p stamps
touch $@
@@ -2266,25 +2312,41 @@
rm -rvf $(BUILD_DEBUG_DEBUGINFO_DIR)
rm -f stamps/split-debuginfo-debug.stamp
+stamps/add-mime-types-file-debug.stamp: stamps/icedtea-debug.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file-debug:
+ if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ] ; then \
+ rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+ rm -f stamps/add-mime-types-file-debug.stamp
+
stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \
stamps/add-tzdata-support.stamp stamps/check-crypto.stamp stamps/add-archive.stamp \
- stamps/split-debuginfo.stamp
+ stamps/split-debuginfo.stamp stamps/add-mime-types-file.stamp
mkdir -p stamps
touch $@
-clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo
+clean-icedtea-stage2: clean-add-jamvm clean-check-crypto clean-add-archive clean-split-debuginfo \
+ clean-add-mime-types-file
rm -f stamps/icedtea-stage2.stamp
stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
stamps/add-systemtap-debug.stamp stamps/add/tzdata-support-debug.stamp \
- stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp
+ stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \
+ stamps/add-mime-types-file-debug.stamp
mkdir -p stamps
touch $@
clean-icedtea-debug-stage2: clean-add-jamvm-debug clean-check-crypto-debug \
- clean-add-archive-debug clean-split-debuginfo-debug
+ clean-add-archive-debug clean-split-debuginfo-debug clean-add-mime-types-file-debug
rm -f stamps/icedtea-debug-stage2.stamp
# OpenJDK boot Targets
@@ -2298,6 +2360,14 @@
-C openjdk-boot \
$(ICEDTEA_BUILD_TARGET)
$(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR)
+# Fix permissions on JARs updated during build if PR1437 bug is present
+if PR1437_PRESENT
+ if [ -e $(BUILD_BOOT_SDK_DIR)/lib/sa-jdi.jar ] ; then \
+ chmod g+r,o+r $(BUILD_BOOT_SDK_DIR)/lib/sa-jdi.jar ; \
+ fi
+ chmod g+r,o+r $(BUILD_BOOT_JRE_DIR)/lib/resources.jar
+ chmod g+r,o+r $(BUILD_BOOT_SDK_DIR)/jre/lib/resources.jar
+endif
@echo "Bootstrapped IcedTea is served:" $(BUILD_BOOT_SDK_DIR)
mkdir -p stamps
touch $@
@@ -2400,15 +2470,30 @@
rm -rvf $(BUILD_BOOT_DEBUGINFO_DIR)
rm -f stamps/split-debuginfo-boot.stamp
+stamps/add-mime-types-file-boot.stamp: stamps/icedtea-boot.stamp
+if MIME_TYPES_FILE_FOUND
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib ] ; then \
+ ln -sf $(MIME_TYPES_FILE) $(BUILD_BOOT_SDK_DIR)/jre/lib/mime.types ; \
+ fi
+endif
+ touch $@
+
+clean-add-mime-types-file-boot:
+ if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib/mime.types ] ; then \
More information about the distro-pkg-dev
mailing list