/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jan 20 05:40:34 UTC 2015
changeset be55ad609ddc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be55ad609ddc
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 20 05:14:21 2015 +0000
PR1831: Drop version requirement for LCMS 2
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1831: Drop version requirement for LCMS 2
* INSTALL: Document lcms2 requirement.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
changeset 92941f2c41f4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92941f2c41f4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 20 05:24:23 2015 +0000
PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1832, RH1022017: Report elliptic curves
supported by NSS, not the SunEC library
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch when
PKCS11+NSS or SunEC+NSS are enabled, so
that the NSS set of curves are announced
via SSL.
* NEWS: Updated.
* patches/rh1022017.patch:
Reduce number of curves announced over SSL
to just those supported by NSS.
changeset 2506d10f6b3a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2506d10f6b3a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 20 05:29:10 2015 +0000
PR2062: Unset OS before running OpenJDK build
2015-01-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2062: Unset OS before running OpenJDK build
* Makefile.am:
(ICEDTEA_UNSET): Introduce variable to
store unsetting of environment variables.
(ICEDTEA_ENV): Move JAVAC, JAVA_HOME and
JDK_HOME to ICEDTEA_UNSET.
(icedtea): Unset variables prior to running
$(MAKE).
(icedtea-debug): Likewise.
(icedtea-ecj): Likewise.
* NEWS: Updated.
changeset b34e892816ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b34e892816ca
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 20 05:40:11 2015 +0000
PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
2014-12-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2125: Synchronise elliptic curves in
sun.security.ec.NamedCurve with those listed by NSS
* fsg.sh: Moved to...
* Makefile.am:
(EXTRA_DIST): Remove fsg.sh, now generated
by configure.
(extract-openjdk): Fix path to new generated
fsg.sh and mark as executable
* NEWS: Updated.
* configure.ac: Add fsg.sh to AC_CONFIG_FILES.
* fsg.sh.in: ... here and added application
of PR2125 patch.
* patches/pr2125.patch: Patch to remove curves
unsupported by NSS.
diffstat:
ChangeLog | 53 +++++
INSTALL | 1 +
Makefile.am | 21 +-
NEWS | 4 +
acinclude.m4 | 4 +-
configure.ac | 2 +-
fsg.sh | 91 --------
fsg.sh.in | 94 +++++++++
patches/pr2125.patch | 486 ++++++++++++++++++++++++++++++++++++++++++++++++
patches/rh1022017.patch | 44 ++++
10 files changed, 698 insertions(+), 102 deletions(-)
diffs (truncated from 927 to 500 lines):
diff -r 199332d3ed53 -r b34e892816ca ChangeLog
--- a/ChangeLog Wed Nov 12 23:58:13 2014 +0000
+++ b/ChangeLog Tue Jan 20 05:40:11 2015 +0000
@@ -1,3 +1,56 @@
+2014-12-05 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2125: Synchronise elliptic curves in
+ sun.security.ec.NamedCurve with those listed by NSS
+ * fsg.sh: Moved to...
+ * Makefile.am:
+ (EXTRA_DIST): Remove fsg.sh, now generated
+ by configure.
+ (extract-openjdk): Fix path to new generated
+ fsg.sh and mark as executable
+ * NEWS: Updated.
+ * configure.ac: Add fsg.sh to AC_CONFIG_FILES.
+ * fsg.sh.in: ... here and added application
+ of PR2125 patch.
+ * patches/pr2125.patch: Patch to remove curves
+ unsupported by NSS.
+
+2015-01-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2062: Unset OS before running OpenJDK build
+ * Makefile.am:
+ (ICEDTEA_UNSET): Introduce variable to
+ store unsetting of environment variables.
+ (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and
+ JDK_HOME to ICEDTEA_UNSET.
+ (icedtea): Unset variables prior to running
+ $(MAKE).
+ (icedtea-debug): Likewise.
+ (icedtea-ecj): Likewise.
+ * NEWS: Updated.
+
+2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1832, RH1022017: Report elliptic curves
+ supported by NSS, not the SunEC library
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch when
+ PKCS11+NSS is enabled, so
+ that the NSS set of curves are announced
+ via SSL.
+ * NEWS: Updated.
+ * patches/rh1022017.patch:
+ Reduce number of curves announced over SSL
+ to just those supported by NSS.
+
+2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1831: Drop version requirement for LCMS 2
+ * INSTALL: Document lcms2 requirement.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
+
2014-11-12 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
diff -r 199332d3ed53 -r b34e892816ca INSTALL
--- a/INSTALL Wed Nov 12 23:58:13 2014 +0000
+++ b/INSTALL Tue Jan 20 05:40:11 2015 +0000
@@ -36,6 +36,7 @@
pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
LLVM 2.5 or later (for --enable-shark)
systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9)
+lcms2-devel (for --enable-lcms2 and --enable-system-lcms)
See ./configure --help if you need to override the defaults.
diff -r 199332d3ed53 -r b34e892816ca Makefile.am
--- a/Makefile.am Wed Nov 12 23:58:13 2014 +0000
+++ b/Makefile.am Tue Jan 20 05:40:11 2015 +0000
@@ -667,6 +667,7 @@
endif
if ENABLE_NSS
+ICEDTEA_PATCHES += patches/rh1022017.patch
NSS_PATCHES = patches/nss-config.patch
else
NSS_PATCHES = patches/nss-not-enabled-config.patch
@@ -779,6 +780,12 @@
WERROR_STATUS=false
endif
+ICEDTEA_UNSET = \
+ JAVAC= \
+ JAVA_HOME= \
+ JDK_HOME= \
+ OS=
+
ICEDTEA_ENV = \
ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
ANT="$(ANT)" \
@@ -809,9 +816,6 @@
FT2_LIB="$(FREETYPE2_LIBS)" \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
- JAVAC="" \
- JAVA_HOME="" \
- JDK_HOME="" \
ANT_RESPECT_JAVA_HOME="TRUE" \
DISTRIBUTION_ID="$(DIST_ID)" \
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
@@ -942,7 +946,7 @@
contrib arm_port \
overlays \
jconsole.desktop policytool.desktop \
- $(JTREG_SRCS) HACKING pulseaudio fsg.sh \
+ $(JTREG_SRCS) HACKING pulseaudio \
hotspot.map \
autogen.sh \
tapset/hotspot.stp.in \
@@ -1227,7 +1231,8 @@
mkdir openjdk ; \
$(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
- sh $(abs_top_srcdir)/fsg.sh ; \
+ chmod +x $(builddir)/fsg.sh ; \
+ sh $(builddir)/fsg.sh ; \
fi
endif
endif
@@ -1665,7 +1670,7 @@
stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
$(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
stamps/jamvm.stamp
- $(ARCH_PREFIX) $(MAKE) -j1 \
+ $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk \
$(ICEDTEA_BUILD_TARGET)
@@ -1696,7 +1701,7 @@
stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
$(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
stamps/jamvm.stamp
- $(ARCH_PREFIX) $(MAKE) -j1 \
+ $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV) \
-C openjdk \
$(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -2080,7 +2085,7 @@
stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
$(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \
stamps/rewrite-rhino.stamp
- $(ARCH_PREFIX) $(MAKE) -j1 \
+ $(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
$(ICEDTEA_ENV_ECJ) \
-C openjdk-ecj/ \
$(ICEDTEA_BUILD_TARGET)
diff -r 199332d3ed53 -r b34e892816ca NEWS
--- a/NEWS Wed Nov 12 23:58:13 2014 +0000
+++ b/NEWS Tue Jan 20 05:40:11 2015 +0000
@@ -26,9 +26,13 @@
- S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
- S8026887: Make issues due to failed large pages allocations easier to debug
* Bug fixes
+ - PR1831: Drop version requirement for LCMS 2
+ - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
- PR1886: IcedTea does not checksum supplied tarballs
- PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
+ - PR2062: Unset OS before running OpenJDK build
- PR2083: Add support for building Zero on AArch64
+ - PR2125: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
New in release 1.13.5 (2014-10-14):
diff -r 199332d3ed53 -r b34e892816ca acinclude.m4
--- a/acinclude.m4 Wed Nov 12 23:58:13 2014 +0000
+++ b/acinclude.m4 Tue Jan 20 05:40:11 2015 +0000
@@ -1554,10 +1554,10 @@
AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
dnl Check for LCMS2 headers and libraries.
- PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
+ PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
if test "x${LCMS2_FOUND}" = xno
then
- AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.])
+ AC_MSG_ERROR([Could not find LCMS 2; install it or build with --disable-system-lcms to use the in-tree copy.])
fi
AC_SUBST(LCMS2_CFLAGS)
AC_SUBST(LCMS2_LIBS)
diff -r 199332d3ed53 -r b34e892816ca configure.ac
--- a/configure.ac Wed Nov 12 23:58:13 2014 +0000
+++ b/configure.ac Tue Jan 20 05:40:11 2015 +0000
@@ -2,7 +2,7 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile fsg.sh])
# Older automake doesn't generate these correctly
abs_top_builddir=`pwd -P`
diff -r 199332d3ed53 -r b34e892816ca fsg.sh
--- a/fsg.sh Wed Nov 12 23:58:13 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-#!/bin/sh
-
-echo "Further liberating OpenJDK..."
-
-# 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 bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
-
-# PR146/S6713083
-# Remove binaries
-rm -f \
- openjdk/jdk/test/sun/management/windows/revokeall.exe \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
- openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
-
-rm -f \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
- openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
- openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
- openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
-
-rm -f \
- openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
- openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
- openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
- openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
- openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
-
-# Remove test sources with questionable license headers.
-rm -f \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
- openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
- openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
- openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
- openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
- openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
- openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
- openjdk/jdk/test/java/util/Locale/LocaleTest.java \
- openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
- openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
- openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
-
-# Remove J2DBench sources, some of which have questionable license
-# headers.
-rm -rf \
- openjdk/jdk/src/share/demo/java2d/J2DBench
-
-# BEGIN Debian/Ubuntu additions
-
-# binary files
-rm -f \
- openjdk/jdk/test/sun/net/idn/*.spp
-
-# END Debian/Ubuntu additions
-
-# Remove man page for proprietary javaws
-rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \
- openjdk/jdk/src/linux/doc/man/ja/javaws.1 \
- openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \
- openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1
diff -r 199332d3ed53 -r b34e892816ca fsg.sh.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/fsg.sh.in Tue Jan 20 05:40:11 2015 +0000
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+echo "Further liberating OpenJDK..."
+
+# 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 bug database (http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=x)
+
+# PR146/S6713083
+# Remove binaries
+rm -f \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
+
+rm -f \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/linux-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-i586/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparc/libLauncher.so \
+ openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-sparcv9/libLauncher.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/i386/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib32/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/lib64/liblibrary.so \
+ openjdk/jdk/test/tools/launcher/lib/sparc/lib64/liblibrary.so
+
+rm -f \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.exe \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.jds3 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.rhel4 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sh \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.sol10 \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winvista \
+ openjdk/jdk/test/java/util/Locale/data/deflocale.winxp \
+
+# Remove test sources with questionable license headers.
+rm -f \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4165815Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4083270Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4177489_Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4168625Class.java \
+ openjdk/jdk/test/java/util/Locale/Bug4175998Test.java \
+ openjdk/jdk/test/java/util/ResourceBundle/RBTestFmwk.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Resource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Getter.java \
+ openjdk/jdk/test/java/util/ResourceBundle/Bug4179766Class.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/FakeTestResource.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_de.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestBug4179766.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_fr_CH.java \
+ openjdk/jdk/test/java/util/ResourceBundle/ResourceBundleTest.java \
+ openjdk/jdk/test/java/util/ResourceBundle/TestResource_it.java \
+ openjdk/jdk/test/java/util/Locale/PrintDefaultLocale.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTest.java \
+ openjdk/jdk/test/java/util/Locale/LocaleTestFmwk.java \
+ openjdk/jdk/test/java/util/Locale/Bug4184873Test.java \
+ openjdk/jdk/test/sun/text/resources/LocaleDataTest.java
+
+# Remove J2DBench sources, some of which have questionable license
+# headers.
+rm -rf \
+ openjdk/jdk/src/share/demo/java2d/J2DBench
+
+# BEGIN Debian/Ubuntu additions
+
+# binary files
+rm -f \
+ openjdk/jdk/test/sun/net/idn/*.spp
+
+# END Debian/Ubuntu additions
+
+# Remove man page for proprietary javaws
+rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \
+ openjdk/jdk/src/linux/doc/man/ja/javaws.1 \
+ openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \
+ openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1
+
+echo "Syncing EC list with NSS"
+patch -Np0 < @abs_top_srcdir@/patches/pr2125.patch
diff -r 199332d3ed53 -r b34e892816ca patches/pr2125.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr2125.patch Tue Jan 20 05:40:11 2015 +0000
@@ -0,0 +1,486 @@
+diff -r 9665966de2e7 src/share/classes/sun/security/ec/NamedCurve.java
+--- openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:53:29 2014 +0000
++++ openjdk/jdk/src/share/classes/sun/security/ec/NamedCurve.java Fri Dec 05 02:58:18 2014 +0000
+@@ -162,114 +162,6 @@
+
+ static {
+ /* SEC2 prime curves */
+- add("secp112r1", "1.3.132.0.6", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "DB7C2ABF62E35E668076BEAD2088",
+- "659EF8BA043916EEDE8911702B22",
+- "09487239995A5EE76B55F9C2F098",
+- "A89CE5AF8724C0A23E0E0FF77500",
+- "DB7C2ABF62E35E7628DFAC6561C5",
+- 1);
+-
+- add("secp112r2", "1.3.132.0.7", P,
+- "DB7C2ABF62E35E668076BEAD208B",
+- "6127C24C05F38A0AAAF65C0EF02C",
+- "51DEF1815DB5ED74FCC34C85D709",
+- "4BA30AB5E892B4E1649DD0928643",
+- "adcd46f5882e3747def36e956e97",
+- "36DF0AAFD8B8D7597CA10520D04B",
+- 4);
+-
+- add("secp128r1", "1.3.132.0.28", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC",
+- "E87579C11079F43DD824993C2CEE5ED3",
+- "161FF7528B899B2D0C28607CA52C5B86",
+- "CF5AC8395BAFEB13C02DA292DDED7A83",
+- "FFFFFFFE0000000075A30D1B9038A115",
+- 1);
+-
+- add("secp128r2", "1.3.132.0.29", P,
+- "FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF",
+- "D6031998D1B3BBFEBF59CC9BBFF9AEE1",
+- "5EEEFCA380D02919DC2C6558BB6D8A5D",
+- "7B6AA5D85E572983E6FB32A7CDEBC140",
+- "27B6916A894D3AEE7106FE805FC34B44",
+- "3FFFFFFF7FFFFFFFBE0024720613B5A3",
+- 4);
+-
+- add("secp160k1", "1.3.132.0.9", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "0000000000000000000000000000000000000000",
+- "0000000000000000000000000000000000000007",
+- "3B4C382CE37AA192A4019E763036F4F5DD4D7EBB",
+- "938CF935318FDCED6BC28286531733C3F03C4FEE",
+- "0100000000000000000001B8FA16DFAB9ACA16B6B3",
+- 1);
+-
+- add("secp160r1", "1.3.132.0.8", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC",
+- "1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45",
+- "4A96B5688EF573284664698968C38BB913CBFC82",
+- "23A628553168947D59DCC912042351377AC5FB32",
+- "0100000000000000000001F4C8F927AED3CA752257",
+- 1);
+-
+- add("secp160r2", "1.3.132.0.30", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70",
+- "B4E134D3FB59EB8BAB57274904664D5AF50388BA",
+- "52DCB034293A117E1F4FF11B30F7199D3144CE6D",
+- "FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E",
+- "0100000000000000000000351EE786A818F3A1A16B",
+- 1);
+-
+- add("secp192k1", "1.3.132.0.31", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37",
+- "000000000000000000000000000000000000000000000000",
+- "000000000000000000000000000000000000000000000003",
+- "DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D",
+- "9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D",
+- "FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D",
+- 1);
+-
+- add("secp192r1 [NIST P-192, X9.62 prime192v1]", "1.2.840.10045.3.1.1", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC",
+- "64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1",
+- "188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012",
+- "07192B95FFC8DA78631011ED6B24CDD573F977A11E794811",
+- "FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831",
+- 1);
+-
+- add("secp224k1", "1.3.132.0.32", P,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D",
+- "00000000000000000000000000000000000000000000000000000000",
+- "00000000000000000000000000000000000000000000000000000005",
+- "A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C",
+- "7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5",
+- "010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7",
+- 1);
+-
+- add("secp224r1 [NIST P-224]", "1.3.132.0.33", PD,
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE",
+- "B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4",
+- "B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21",
+- "BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34",
+- "FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D",
+- 1);
+-
+- add("secp256k1", "1.3.132.0.10", P,
More information about the distro-pkg-dev
mailing list