/hg/icedtea6: 5 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Thu Jul 30 18:39:27 UTC 2015


changeset 5b460919eeee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5b460919eeee
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jul 20 17:11:26 2015 +0100

	Bump to next release, b36.

	2015-07-20  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(OPENJDK_VERSION): Bump to next release, b36.


changeset 15b5d31d43a3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=15b5d31d43a3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jul 20 19:01:11 2015 +0100

	Update to build against July 2015 security fixes.

	2015-07-20  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/8074312-pr2255-support_linux_4.patch:
		Removed; upstreamed.
		* patches/pax-mark-rmic-java.patch: Likewise.
		* Makefile.am:
		(ICEDTEA_PATCHES): Drop above patches. Drop
		WITH_PAX block as no longer required.
		(ICEDTEA_ECJ_PATCHES): Drop !WITH_PAX block,
		merging into main unconditional definition.
		* patches/openjdk/4963723-implement_sha-224.patch:
		Regenerated due to copyright header change.


changeset 7f74162f5403 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f74162f5403
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 22 20:38:48 2015 +0100

	Merge with icedtea6-hg for b36 update


changeset 7efdfbf5b4f3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7efdfbf5b4f3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 22 22:12:32 2015 +0100

	Update to b36 tarball.

	Changes in b36:
	  - OPENJDK6-58: Allow OpenJDK to build on PaX-enabled kernels
	  - OPENJDK6-59: Only apply PaX-marking when needed by a running PaX kernel
	  - OPENJDK6-60, PR2484: Disable export ciphers by default
	  - OPENJDK6-61: Remove translation strings for ErrorMsg.JAXP_INVALID_ATTR_VALUE_ERR which doesn't exist in OpenJDK 6
	  - OPENJDK6-62, PR2552: Restrict key size of RSA certificates to >= 1024
	  - OPENJDK6-63: Remove @Override annotation on interfaces added by 2015/07/14 security fixes.
	  - S6787645: CRL validation code should permit some clock skew when checking validity of CRLs
	  - S6996365: Evaluate the priorities of cipher suites
	  - S7185471: Avoid key expansion when AES cipher is re-init w/ the same key
	  - S8007142: Add utility classes for writing better multiprocess tests in jtreg
	  - S8008089: Delete OS dependent check in JdkFinder.getExecutable()
	  - S8024861: Incomplete token triggers GSS-API NullPointerException
	  - S8027058: sun/management/jmxremote/bootstrap/RmiBootstrapTest.sh Failed to initialize connector
	  - S8036786: Update jdk7 testlibrary to match jdk8
	  - S8042205: javax/management/monitor/*: some tests didn't  get all the notifications
	  - S8042982: Unexpected RuntimeExceptions being thrown by SSLEngine
	  - S8043200, PR2485: Decrease the preference mode of RC4 in the enabled cipher suite list
	  - S8043201: Deprecate RC4 in SunJSSE provider
	  - S8043202: Prohibit RC4 cipher suites
	  - S8046817: JDK 8 schemagen tool does not generate xsd files for enum types
	  - S8048194: GSSContext.acceptSecContext fails when a supported mech is not initiator preferred
	  - S8050158: Introduce system property to maintain RC4 preference order
	  - S8062923: XSL: Run-time internal error in 'substring()'
	  - S8062924: XSL: wrong answer from substring() function
	  - S8064546: CipherInputStream throws BadPaddingException if stream is not fully read
	  - S8065764: javax/management/monitor/CounterMonitorTest.java hangs
	  - S8066952: [TEST-BUG] javax/management/monitor/CounterMonitorTest.java hangs
	  - S8067694: Improved certification checking
	  - S8071715: Tune font layout engine
	  - S8071731: Better scaling for C1
	  - S8072490: Better font morphing redux
	  - S8072887: Better font handling improvements
	  - S8073334: Improved font substitutions
	  - S8073357: schema1.xsd has wrong content. Sequence of the enum values has been changed
	  - S8073385: Bad error message on parsing illegal character in XML attribute
	  - S8073773: Presume path preparedness
	  - S8073894: Getting to the root of certificate chains
	  - S8074098: 2D_Font/Bug8067699 test fails with SIGBUS crash on Solaris Sparc
	  - S8074297: substring in XSLT returns wrong character if string contains supplementary chars
	  - S8074312: Enable hotspot builds on 4.x Linux kernels
	  - S8074330: Set font anchors more solidly
	  - S8074335: Substitute for substitution formats
	  - S8074865: General crypto resilience changes
	  - S8074871: Adjust device table handling
	  - S8075374: Responding to OCSP responses
	  - S8075378: JNDI DnsClient Exception Handling
	  - S8075575: com/sun/security/auth/login/ConfigFile/InconsistentError.java failed in certain env.
	  - S8075576: com/sun/security/auth/module/KeyStoreLoginModule/OptionTest.java failed in certain env.
	  - S8075667: (tz) Support tzdata2015b
	  - S8075738: Better multi-JVM sharing
	  - S8075838: Method for typing MethodTypes
	  - S8075853: Proxy for MBean proxies
	  - S8076290: JCK test api/xsl/conf/string/string17 starts failing after JDK-8074297
	  - S8076328: Enforce key exchange constraints
	  - S8076376: Enhance IIOP operations
	  - S8076397: Better MBean connections
	  - S8076401: Serialize OIS data
	  - S8076405: Improve serial serialization
	  - S8076409: Reinforce RMI framework
	  - S8077520: Morph tables into improved form
	  - S8077685: (tz) Support tzdata2015d
	  - S8078348: sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java fails with BindException
	  - S8078439: SPNEGO auth fails if client proposes MS krb5 OID
	  - S8078666: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
	  - S8080318: jdk8u51 l10n resource file translation update
	  - S8081386: Test sun/management/jmxremote/bootstrap/RmiSslBootstrapTest.sh test has RC4 dependencies
	  - S8081775: two lib/testlibrary tests are failing with "Error. failed to clean up files after test" with jtreg 4.1 b12

	2015-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/openjdk/8078666-widen_increases.patch:
		Removed; upstream in b36.
		* Makefile.am:
		(OPENJDK_DATE): Bump to b36 creation date;
		22nd of July, 2015.
		(OPENJDK_SHA256SUM): Update for b36 tarball.
		* NEWS: Updated with b36 changes. Remove duplicate
		issue in 1.13.6 release notes.
		* patches/openjdk/6956398-ephemeraldhkeysize.patch:
		Regenerated against b36.


changeset 6457627bec31 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6457627bec31
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 22 22:29:27 2015 +0100

	PR2559: generated directory gets confused with generated alias

	2015-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR2559: generated directory gets confused with
		generated alias
		* Makefile.am:
		(EXTRA_DIST): Change 'generated' to
		'$(top_srcdir)/generated'.
		* NEWS: Updated.


diffstat:

 AUTHORS                                                               |     1 +
 ChangeLog                                                             |   228 +
 INSTALL                                                               |    27 +-
 Makefile.am                                                           |   133 +-
 NEWS                                                                  |   113 +-
 README                                                                |    12 +-
 acinclude.m4                                                          |   170 +-
 configure.ac                                                          |    13 +
 fsg.sh.in                                                             |     6 +-
 linux.fontconfig.Gentoo.properties.in                                 |   385 +
 patches/cacao/launcher.patch                                          |     9 +-
 patches/fonts-gentoo.patch                                            |   380 -
 patches/hotspot/hs23/systemtap.patch                                  |   140 -
 patches/jamvm/noexecstack.patch                                       |    48 +
 patches/openjdk/4890063-hprof_truncation.patch                        |    20 +
 patches/openjdk/4963723-implement_sha-224.patch                       |   189 +-
 patches/openjdk/6562615-compiler_warnings.patch                       |    33 +
 patches/openjdk/6956398-ephemeraldhkeysize.patch                      |   761 ++
 patches/openjdk/6989466-compiler_warnings.patch                       |   405 +
 patches/openjdk/6991580-ipv6_nameservers.patch                        |   137 +
 patches/openjdk/6997561-better_jndi_error_handling.patch              |   143 +
 patches/openjdk/7007905-javazic_line_numbers.patch                    |    20 +
 patches/openjdk/7017176-missing_gpl_headers.patch                     |   129 +
 patches/openjdk/7058708-javazic_warnings.patch                        |  2586 ++++++++++
 patches/openjdk/7069870-generic_array_initializers.patch              |    24 +
 patches/openjdk/7090844-support_multi_offset_change_timezones.patch   |    50 +
 patches/openjdk/7094377-ldaps_timeout.patch                           |   162 +
 patches/openjdk/7133138-timezone_io_improvement.patch                 |   205 +
 patches/openjdk/7170638-systemtap.patch                               |   292 +
 patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch   |   720 ++
 patches/openjdk/8011709-canonshaping_memory_leak.patch                |    29 +
 patches/openjdk/8023052-jvm_crash_in_native_layout.patch              |    23 +
 patches/openjdk/8039921-sha1_1024plus.patch                           |    87 +
 patches/openjdk/8041451-ldap_read_timeout_abandon.patch               |    21 +
 patches/openjdk/8042855-indiclayoutengine_null_dereference.patch      |    51 +
 patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch         |   127 +
 patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch |   611 ++
 patches/openjdk/8074312-pr2255-support_linux_4.patch                  |    19 -
 patches/openjdk/8074761-ldap_empty_optional_params.patch              |   168 +
 patches/openjdk/8078654-closettfontfilefunc.patch                     |    42 +
 patches/openjdk/8081315-giflib_interlacing.patch                      |    72 +
 patches/openjdk/8081475-systemtap-gcc5.patch                          |    24 +
 patches/openjdk/8087120-zero_gcc5.patch                               |    24 +
 patches/pax-mark-rmic-java.patch                                      |    10 -
 patches/pr2319-policy_jar_checksum.patch                              |   103 +
 patches/pr2460-policy_jar_timestamp.patch                             |   108 +
 patches/pr2481_sysconfig_clock_spaces.patch                           |    67 +
 patches/pr2486-768_dh.patch                                           |    52 +
 patches/pr2488-1024_dh.patch                                          |    53 +
 49 files changed, 8484 insertions(+), 748 deletions(-)

diffs (truncated from 10049 to 500 lines):

diff -r 0a4af164d620 -r 6457627bec31 AUTHORS
--- a/AUTHORS	Thu Apr 16 03:37:09 2015 +0100
+++ b/AUTHORS	Wed Jul 22 22:29:27 2015 +0100
@@ -9,6 +9,7 @@
 Deepak Bhole <dbhole at redhat.com>
 Tom Callaway <tcallawa at redhat.com>
 Pablo del Campo <pablogdc at gmail.com>
+James Le Cuirot <chewi at gentoo.org>
 Danesh Dadachanji <ddadacha at redhat.com>
 Thomas Fitzsimmons <fitzsim at redhat.com>
 Matthew Flaschen <matthew.flaschen at gatech.edu>
diff -r 0a4af164d620 -r 6457627bec31 ChangeLog
--- a/ChangeLog	Thu Apr 16 03:37:09 2015 +0100
+++ b/ChangeLog	Wed Jul 22 22:29:27 2015 +0100
@@ -1,3 +1,231 @@
+2015-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR2559: generated directory gets confused with
+	generated alias
+	* Makefile.am:
+	(EXTRA_DIST): Change 'generated' to
+	'$(top_srcdir)/generated'.
+	* NEWS: Updated.
+
+2015-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/8078666-widen_increases.patch:
+	Removed; upstream in b36.
+	* Makefile.am:
+	(OPENJDK_DATE): Bump to b36 creation date;
+	22nd of July, 2015.
+	(OPENJDK_SHA256SUM): Update for b36 tarball.
+	* NEWS: Updated with b36 changes. Remove duplicate
+	issue in 1.13.6 release notes.
+	* patches/openjdk/6956398-ephemeraldhkeysize.patch:
+	Regenerated against b36.
+
+2015-07-20  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/openjdk/8074312-pr2255-support_linux_4.patch:
+	Removed; upstreamed.
+	* patches/pax-mark-rmic-java.patch: Likewise.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Drop above patches. Drop
+	WITH_PAX block as no longer required.
+	(ICEDTEA_ECJ_PATCHES): Drop !WITH_PAX block,
+	merging into main unconditional definition.
+	* patches/openjdk/4963723-implement_sha-224.patch:
+	Regenerated due to copyright header change.
+
+2015-07-20  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(OPENJDK_VERSION): Bump to next release, b36.
+
+2015-07-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* AUTHORS: Add James.
+	* NEWS: Updated.
+
+2015-05-23  James Le Cuirot  <chewi at gentoo.org>
+
+	PR829: Raise javadoc and JAVAC_FLAGS memory
+	limits for CACAO
+	* patches/cacao/launcher.patch:
+	Increase memory limits so a build with CACAO
+	and doc generation succeeds.
+
+2015-07-22  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2556, G390663: Update Gentoo font configuration
+	and allow font directory to be specified
+	* INSTALL: Document --with-fonts-dir.
+	* Makefile.am:
+	(fonts): Copy the generated Gentoo
+	font properties file into the OpenJDK
+	tree.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_WITH_FONTS_DIR): Allow the user
+	to specify where the fonts are stored.
+	* configure.ac: Invoke IT_WITH_FONTS_DIR
+	and generate linux.fontconfig.Gentoo.properties
+	* linux.fontconfig.Gentoo.properties.in:
+	Template fontconfig file for Gentoo copied from
+	the main Portage tree.
+	* patches/fonts-gentoo.patch:
+	Remove outdated copy of
+	linux.fontconfig.Gentoo.properties from patch.
+
+2015-07-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2500: Add executable stack markings
+	to callNative.S on JamVM
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patch.
+	(jamvm): Drop setting -noexecstack in
+	LDFLAGS; replaced by code fix in JamVM.
+	* NEWS: Updated.
+	* patches/jamvm/noexecstack.patch:
+	Add notes to assembly files in order to
+	turn off executable stack.
+
+2015-07-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2507, G541462: Only apply PaX markings by default
+	on running PaX kernels
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_HAS_PAX): Use grep directly rather
+	than piping from cat.
+	(IT_WITH_PAX): Use ${pax_active} as the
+	default value. Handle --with-pax and
+	--without-pax options (i.e. without arguments)
+	better.
+
+2015-07-15  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2391: Make elliptic curve removal
+	optional
+	* acinclude.m4:
+	(IT_ENABLE_NON_NSS_CURVES): Check ${enableval}
+	to catch values other than yes/no.
+
+2015-07-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR2391: Make elliptic curve removal
+	optional
+	* INSTALL:
+	Document --enable-non-nss-curves.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Only apply
+	the RH1022017 patch when non-NSS
+	curves are not enabled.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_NON_NSS_CURVES): New
+	macro to allow non-NSS curves to
+	be turned on.
+	* configure.ac:
+	Invoke IT_ENABLE_NON_NSS_CURVES.
+	* fsg.sh.in:
+	Don't alter the curve list when
+	non-NSS curves are enabled.
+
+2015-07-22  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2360: Ensure all stamp targets have aliases
+	* Makefile.am:
+	Add missing aliases for add-cacao,
+	add-cacao-debug, add-jamvm, add-jamvm-debug,
+	add-nss, add-nss-debug, add-nss-ecj,
+	add-pulseaudio, add-pulseaudio-debug,
+	add-pulseaudio-ecj, add-systemtap,
+	add-systemtap-debug, add-systemtap-ecj,
+	add-tzdata-support, add-tzdata-support-debug,
+	add-tzdata-support-ecj, add-zero, add-zero-debug,
+	extract-openjdk, fonts, generated, hgforest,
+	ports, pulse-java, pulse-java-class,
+	pulse-java-headers, pulse-java-jar,
+	remove-intree-libraries, runnable-icedtea,
+	runnable-icedtea-debug and runnable-icedtea-ecj.
+	Remove dead nbplatform and rename rt-jar to rt.
+	* NEWS: Updated.
+
+2015-07-06  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2342: Update README & INSTALL files
+	* INSTALL: Remove dead --with-xalan2-jar,
+	--with-xalan2-serializer-jar,
+	--with-xerces2-jar options. Document --with-jdk-home.
+	Move --enable-system-kerberos to be listed with other
+	system library options. Mention ARM32 JIT.
+	* NEWS: Updated.
+	* README: Mention ARM32 JIT and OpenJDK
+	compatibility testing page.
+	* acinclude.m4:
+	(IT_CHECK_FOR_JDK): Add plain java-1.6.0-openjdk to
+	ICEDTEA6_VMS.
+
+2014-06-12  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR2340: Fail early if there is no native HotSpot JIT
+	& all other options are disabled
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Depend on
+	IT_HAS_NATIVE_HOTSPOT_PORT. Split out arch-dependent
+	code into that macro. Make ENABLE_CACAO test more
+	readable.
+	(IT_ENABLE_CACAO): Handle enableval same as other macros
+	so possible values are only ever yes or no.
+	(IT_ENABLE_JAMVM): Likewise.
+	(IT_HAS_NATIVE_HOTSPOT_PORT): Architecture detection
+	split out from IT_ENABLE_ZERO_BUILD. Now sets
+	has_native_hotspot_port for later reference.
+	* configure.ac:
+	Error out if there is no native HotSpot port and
+	Zero (which implies Shark & ARM32 JIT), CACAO and
+	JamVM are all disabled.
+
+2015-07-22  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/hotspot/hs23/systemtap.patch:
+	Removed; replaced by backport of upstream version.
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add patches below. Swap
+	old SystemTap patch for a backport of 7170638.
+	* NEWS: Updated.
+	* patches/openjdk/4890063-hprof_truncation.patch,
+	* patches/openjdk/6562615-compiler_warnings.patch,
+	* patches/openjdk/6956398-ephemeraldhkeysize.patch,
+	* patches/openjdk/6989466-compiler_warnings.patch,
+	* patches/openjdk/6991580-ipv6_nameservers.patch,
+	* patches/openjdk/6997561-better_jndi_error_handling.patch,
+	* patches/openjdk/7007905-javazic_line_numbers.patch,
+	* patches/openjdk/7017176-missing_gpl_headers.patch,
+	* patches/openjdk/7058708-javazic_warnings.patch,
+	* patches/openjdk/7069870-generic_array_initializers.patch,
+	* patches/openjdk/7090844-support_multi_offset_change_timezones.patch,
+	* patches/openjdk/7094377-ldaps_timeout.patch,
+	* patches/openjdk/7133138-timezone_io_improvement.patch,
+	* patches/openjdk/7170638-systemtap.patch,
+	* patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch,
+	* patches/openjdk/8011709-canonshaping_memory_leak.patch,
+	* patches/openjdk/8023052-jvm_crash_in_native_layout.patch,
+	* patches/openjdk/8039921-sha1_1024plus.patch,
+	* patches/openjdk/8041451-ldap_read_timeout_abandon.patch,
+	* patches/openjdk/8042855-indiclayoutengine_null_dereference.patch,
+	* patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch,
+	* patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch,
+	* patches/openjdk/8074761-ldap_empty_optional_params.patch,
+	* patches/openjdk/8078654-closettfontfilefunc.patch,
+	* patches/openjdk/8078666-widen_increases.patch,
+	* patches/openjdk/8081315-giflib_interlacing.patch,
+	* patches/openjdk/8081475-systemtap-gcc5.patch,
+	* patches/openjdk/8087120-zero_gcc5.patch,
+	* patches/pr2319-policy_jar_checksum.patch,
+	* patches/pr2460-policy_jar_timestamp.patch,
+	* patches/pr2481_sysconfig_clock_spaces.patch,
+	* patches/pr2486-768_dh.patch,
+	* patches/pr2488-1024_dh.patch: Added.
+
 2015-04-16  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* NEWS: Add 1.13.7 release notes.
diff -r 0a4af164d620 -r 6457627bec31 INSTALL
--- a/INSTALL	Thu Apr 16 03:37:09 2015 +0100
+++ b/INSTALL	Wed Jul 22 22:29:27 2015 +0100
@@ -91,6 +91,9 @@
   downloading and extracting a tarball.
 * --enable-system-lcms: Build using the system installation of LCMS2, not
   the version in-tree.
+* --enable-system-kerberos: Link against the system Kerberos library and
+  query it at runtime to obtain the cache location, rather than using a
+  hardcoded value.
 * --with-gcj: Compile ecj to native code with gcj prior to building.
 * --disable-bootstrap: Perform a quick build using an installed
   copy of IcedTea6.  If a directory is not specified, a check against
@@ -128,22 +131,6 @@
     - /usr/share/java/eclipse-ecj.jar
     - /usr/share/java/ecj.jar
     - /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
-* --with-xalan2-jar: Specify the location of a xalan2 JAR file.  By default, the
-  following paths are checked:
-    - /usr/share/java/xalan-j2.jar
-    - /usr/share/java/xalan2.jar
-    - /usr/share/xalan/lib/xalan.jar
-* --with-xalan2-serializer-jar: Specify the location of a xalan2 serializer JAR file.
-  By default, the following paths are checked:
-    - /usr/share/java/xalan-j2-serializer.jar
-    - /usr/share/xalan-serializer/lib/serializer.jar
-    - /usr/share/java/serializer.jar
-* --with-xerces2-jar: Specify the location of a xerces2 JAR file.  By default, the
-  following paths are checked:
-    - /usr/share/java/xerces-j2.jar
-    - /usr/share/java/xerces2.jar
-    - /usr/share/xerces-2/lib/xercesImpl.jar
-    - /usr/share/java/xercesImpl.jar
 * --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
 * --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
 * --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
@@ -157,6 +144,7 @@
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
 * --with-llvm-config: Specify the location of the llvm-config binary.
 * --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
+* --with-fonts-dir: Specify the location of system fonts. This is currently only used on Gentoo systems.
 
 Other options may be supplied which enable or disable new features.
 These are documented fully in the relevant section below.
@@ -174,9 +162,7 @@
 * --with-additional-vms=vm-list: Additional VMs to build using the system described
   below.
 * --enable-lcms2: Use LCMS 2 backport from OpenJDK 7 rather than LCMS 1.
-* --enable-system-kerberos: Link against the system Kerberos library and
-  query it at runtime to obtain the cache location, rather than using a
-  hardcoded value.
+* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521})
 
 Testing
 =======
@@ -289,6 +275,9 @@
 --enable-shark to configure.  Please note that Shark is still in
 development and builds are still likely to fail at present.
 
+On ARM32, there is also a native JIT port built on top of Zero, which
+is built on this platform by default.
+
 Support for Different Versions of HotSpot
 =========================================
 
diff -r 0a4af164d620 -r 6457627bec31 Makefile.am
--- a/Makefile.am	Thu Apr 16 03:37:09 2015 +0100
+++ b/Makefile.am	Wed Jul 22 22:29:27 2015 +0100
@@ -1,8 +1,8 @@
 # Dependencies
 
-OPENJDK_DATE = 14_apr_2015
-OPENJDK_SHA256SUM = 131cde181fbca08ac4d47bd13f6c3a64806fe2ae2106c03afe7ba651c24a4f9b
-OPENJDK_VERSION = b35
+OPENJDK_DATE = 22_jul_2015
+OPENJDK_SHA256SUM = c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4
+OPENJDK_VERSION = b36
 OPENJDK_URL = https://java.net/downloads/openjdk6/
 
 CACAO_VERSION = 68fe50ac34ec
@@ -608,11 +608,40 @@
 	patches/pr2179-avoid_x86_workaround_on_zero.patch \
 	patches/openjdk/6584008-pr2195-jvmtistringprimitivecallback_null_string.patch \
 	patches/openjdk/7199862-pr2198-ensure_cache_connection_still_alive.patch \
-	patches/openjdk/8074312-pr2255-support_linux_4.patch \
 	patches/pr2197-jhat_man_page_url.patch \
 	patches/pr2201-support_giflib_5.1.patch \
 	patches/pr2211-check_dgifclosefile_return.patch \
-	patches/pr2226-support_future_giflib_6_and_up.patch
+	patches/pr2226-support_future_giflib_6_and_up.patch \
+	patches/openjdk/4890063-hprof_truncation.patch \
+	patches/openjdk/6562615-compiler_warnings.patch \
+	patches/openjdk/6956398-ephemeraldhkeysize.patch \
+	patches/openjdk/6989466-compiler_warnings.patch \
+	patches/openjdk/6991580-ipv6_nameservers.patch \
+	patches/openjdk/7007905-javazic_line_numbers.patch \
+	patches/openjdk/7058708-javazic_warnings.patch \
+	patches/openjdk/7069870-generic_array_initializers.patch \
+	patches/openjdk/7090844-support_multi_offset_change_timezones.patch \
+	patches/openjdk/7133138-timezone_io_improvement.patch \
+	patches/openjdk/8011709-canonshaping_memory_leak.patch \
+	patches/openjdk/8023052-jvm_crash_in_native_layout.patch \
+	patches/openjdk/8039921-sha1_1024plus.patch \
+	patches/openjdk/8041451-ldap_read_timeout_abandon.patch \
+	patches/openjdk/8042855-indiclayoutengine_null_dereference.patch \
+	patches/openjdk/7094377-ldaps_timeout.patch \
+	patches/openjdk/6997561-better_jndi_error_handling.patch \
+	patches/openjdk/7017176-missing_gpl_headers.patch \
+	patches/openjdk/8000487-jndi_connection_not_honouring_timeout.patch \
+	patches/openjdk/8042857-14_stuck_threads_on_ldaprequest.patch \
+	patches/openjdk/8065238-ldap_namingexception_8041451_regression.patch \
+	patches/openjdk/8074761-ldap_empty_optional_params.patch \
+	patches/openjdk/8078654-closettfontfilefunc.patch \
+	patches/openjdk/8081315-giflib_interlacing.patch \
+	patches/openjdk/8087120-zero_gcc5.patch \
+	patches/pr2319-policy_jar_checksum.patch \
+	patches/pr2460-policy_jar_timestamp.patch \
+	patches/pr2481_sysconfig_clock_spaces.patch \
+	patches/pr2486-768_dh.patch \
+	patches/pr2488-1024_dh.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -646,29 +675,24 @@
 endif
 
 if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += patches/hotspot/hs23/systemtap.patch \
+ICEDTEA_PATCHES += patches/openjdk/7170638-systemtap.patch \
 	patches/hotspot/hs23/systemtap_gc.patch \
-	patches/hotspot/hs23/systemtap-alloc-size-workaround.patch
+	patches/hotspot/hs23/systemtap-alloc-size-workaround.patch \
+	patches/openjdk/8081475-systemtap-gcc5.patch
 endif
 
 if BUILD_JAMVM
 ICEDTEA_PATCHES += \
-	patches/jamvm/pr2190-find_class_from_caller.patch
+	patches/jamvm/pr2190-find_class_from_caller.patch \
+	patches/jamvm/noexecstack.patch
 endif
 
 if ENABLE_NSS
-ICEDTEA_PATCHES += patches/rh1022017.patch
 NSS_PATCHES = patches/nss-config.patch
 else
 NSS_PATCHES = patches/nss-not-enabled-config.patch
 endif
 
-if WITH_PAX
-ICEDTEA_PATCHES += \
-	patches/no-test_gamma.patch \
-	patches/pax-mark-rmic-java.patch
-endif
-
 if USE_SYSTEM_ZLIB
 ICEDTEA_PATCHES += \
 	patches/libraries-zlib.patch \
@@ -693,6 +717,10 @@
 	patches/libraries-gif.patch
 endif
 
+if !USE_NON_NSS_CURVES
+ICEDTEA_PATCHES += patches/rh1022017.patch
+endif
+
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
 
 # Bootstrapping patches
@@ -711,7 +739,8 @@
 	patches/ecj/jaxws-jdk-dependency.patch \
 	patches/ecj/hotspot/hs23/hotspot-jdk-dependency.patch \
 	patches/ecj/fphexconstants.patch \
-	patches/ecj/no-sun-classes.patch
+	patches/ecj/no-sun-classes.patch \
+	patches/ecj/no-test_gamma.patch
 
 if DTDTYPE_QNAME
 ICEDTEA_ECJ_PATCHES += \
@@ -735,10 +764,6 @@
 	patches/ecj/xbootclasspath.patch
 endif
 
-if !WITH_PAX
-ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
-endif
-
 # If date parsing bug is present, drop Lithuania and Latvia EUR transition
 # dates as they are already in the past anyway.
 if CP64174
@@ -938,7 +963,7 @@
 # FIXME (distclean): Add jtreg sources
 # FIXME (distclean): Add pulseaudio sources
 
-EXTRA_DIST = generated \
+EXTRA_DIST = $(top_srcdir)/generated \
 	$(top_srcdir)/patches/* \
 	contrib arm_port \
 	overlays \
@@ -1353,6 +1378,7 @@
 	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.10.properties
 	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.11.properties
 	cp $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.properties $(FONTCONFIG_PATH)/linux.fontconfig.Fedora.12.properties
+	cp linux.fontconfig.Gentoo.properties $(FONTCONFIG_PATH)
 	mkdir -p stamps
 	touch $@
 
@@ -2415,7 +2441,6 @@
 stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
 if BUILD_JAMVM
 	cd jamvm/jamvm && \
-	LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
 	./autogen.sh --with-java-runtime-library=openjdk6 \
 	  --prefix=$(abs_top_builddir)/jamvm/install ; \
 	$(MAKE) ; \
@@ -2875,6 +2900,42 @@
 
 add-archive-ecj: stamps/add-archive-ecj.stamp
 
+add-cacao: stamps/add-cacao.stamp
+
+add-cacao-debug: stamps/add-cacao-debug.stamp
+
+add-jamvm: stamps/add-jamvm.stamp
+
+add-jamvm-debug: stamps/add-jamvm-debug.stamp
+
+add-nss: stamps/add-nss.stamp
+
+add-nss-debug: stamps/add-nss-debug.stamp
+
+add-nss-ecj: stamps/add-nss-ecj.stamp
+
+add-pulseaudio: stamps/add-pulseaudio.stamp
+
+add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp
+
+add-pulseaudio-ecj: stamps/add-pulseaudio-ecj.stamp
+
+add-systemtap: stamps/add-systemtap.stamp
+
+add-systemtap-debug: stamps/add-systemtap-debug.stamp
+
+add-systemtap-ecj: stamps/add-systemtap-ecj.stamp
+
+add-tzdata-support: stamps/add-tzdata-support.stamp
+
+add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp
+
+add-tzdata-support-ecj: stamps/add-tzdata-support-ecj.stamp
+
+add-zero: stamps/add-zero.stamp
+
+add-zero-debug: stamps/add-zero-debug.stamp


More information about the distro-pkg-dev mailing list