/hg/release/icedtea7-2.5: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jun 12 14:46:09 UTC 2014
changeset 9755b09356f0 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=9755b09356f0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 11 01:12:11 2014 +0100
PR1371: Provide option to build without debugging
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1371: Provide option to build without debugging
* INSTALL: Updated.
* Makefile.am:
(ICEDTEA_ENV): Only set DEBUG_CLASSFILES
and DEBUG_BINARIES when ENABLE_JAVA_DEBUGINFO
and ENABLE_NATIVE_DEBUGINFO are set, respectively.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_NATIVE_DEBUGINFO): New macro to add
option --enable-native-debuginfo.
(IT_ENABLE_JAVA_DEBUGINFO): New macro to add
option --enable-java-debuginfo.
* configure.ac: Invoke new macros.
changeset ddaa2991858e in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=ddaa2991858e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 11 01:21:21 2014 +0100
PR1827: Support AM_MAINTAINER_MODE
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1827: Support AM_MAINTAINER_MODE
* NEWS: Updated.
* configure.ac: Invoke the AM_MAINTAINER_MODE
macro with a default of enabled.
changeset a4953c31f1b7 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=a4953c31f1b7
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 11 01:26:45 2014 +0100
PR1830: Drop version requirement for LCMS 2
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1830: Drop version requirement for LCMS 2
* INSTALL: Document lcms2 requirement.
* NEWS: Updated.
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
changeset 716f160592e2 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=716f160592e2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 11 02:29:44 2014 +0100
PR1833, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1833, RH1022017: Report elliptic curves
supported by NSS, not the SunEC library
* NEWS: Updated.
* 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.
* patches/rh1022017.patch:
Reduce number of curves announced over SSL
to just those supported by NSS.
diffstat:
ChangeLog | 45 +++++++++++++++++++++++++++++++++++++++++++++
INSTALL | 4 ++++
Makefile.am | 21 ++++++++++++++++++---
NEWS | 4 ++++
acinclude.m4 | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
configure.ac | 3 +++
patches/rh1022017.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 164 insertions(+), 5 deletions(-)
diffs (263 lines):
diff -r f990f8b724ad -r 716f160592e2 ChangeLog
--- a/ChangeLog Thu Jun 05 16:50:44 2014 +0100
+++ b/ChangeLog Wed Jun 11 02:29:44 2014 +0100
@@ -1,3 +1,48 @@
+2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1833, RH1022017: Report elliptic curves
+ supported by NSS, not the SunEC library
+ * NEWS: Updated.
+ * 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.
+ * 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>
+
+ PR1830: Drop version requirement for LCMS 2
+ * INSTALL: Document lcms2 requirement.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
+
+2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1827: Support AM_MAINTAINER_MODE
+ * NEWS: Updated.
+ * configure.ac: Invoke the AM_MAINTAINER_MODE
+ macro with a default of enabled.
+
+2014-06-10 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1371: Provide option to build without debugging
+ * INSTALL: Updated.
+ * Makefile.am:
+ (ICEDTEA_ENV): Only set DEBUG_CLASSFILES
+ and DEBUG_BINARIES when ENABLE_JAVA_DEBUGINFO
+ and ENABLE_NATIVE_DEBUGINFO are set, respectively.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_NATIVE_DEBUGINFO): New macro to add
+ option --enable-native-debuginfo.
+ (IT_ENABLE_JAVA_DEBUGINFO): New macro to add
+ option --enable-java-debuginfo.
+ * configure.ac: Invoke new macros.
+
2014-06-02 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1814: HotSpot URL should be used with --enable-hg
diff -r f990f8b724ad -r 716f160592e2 INSTALL
--- a/INSTALL Thu Jun 05 16:50:44 2014 +0100
+++ b/INSTALL Wed Jun 11 02:29:44 2014 +0100
@@ -27,6 +27,7 @@
libpng-devel (for --enable-system-png)
libjpeg-devel >= 6b (for --enable-system-jpeg)
zlib-devel (for --enable-system-zlib)
+lcms2-devel (for --enable-system-lcms)
fontconfig (for --enable-system-fontconfig)
libc6-dev & libattr-devel/libattr1-dev (for --enable-compile-against-syscalls)
libpcsclite (for --enable-system-pcsc)
@@ -204,6 +205,9 @@
query it at runtime to obtain the cache location, rather than using a
hardcoded value.
* --enable-arm32-jit: Build the ARM32 JIT.
+* --enable-sunec: Build the SunEC crypto provider against system NSS.
+* --enable-native-debuginfo: Include debuginfo in native binaries.
+* --enable-java-debuginfo: Include debuginfo in Java class files.
Testing
=======
diff -r f990f8b724ad -r 716f160592e2 Makefile.am
--- a/Makefile.am Thu Jun 05 16:50:44 2014 +0100
+++ b/Makefile.am Wed Jun 11 02:29:44 2014 +0100
@@ -292,7 +292,14 @@
endif
if ENABLE_NSS
-ICEDTEA_PATCHES += patches/nss-config.patch
+ICEDTEA_PATCHES += patches/nss-config.patch \
+ patches/rh1022017.patch
+endif
+
+if ENABLE_SUNEC
+if !ENABLE_NSS
+ICEDTEA_PATCHES += patches/rh1022017.patch
+endif
endif
if WITH_ALT_HSBUILD
@@ -478,8 +485,6 @@
DISTRIBUTION_ID="$(DIST_ID)" \
DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
- DEBUG_CLASSFILES="true" \
- DEBUG_BINARIES="true" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
VERBOSE="$(VERBOSE)" \
STATIC_CXX="false" \
@@ -580,6 +585,16 @@
DISABLE_INTREE_EC="true"
endif
+if ENABLE_NATIVE_DEBUGINFO
+ICEDTEA_ENV += \
+ DEBUG_BINARIES="true"
+endif
+
+if ENABLE_JAVA_DEBUGINFO
+ICEDTEA_ENV += \
+ DEBUG_CLASSFILES="true"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
diff -r f990f8b724ad -r 716f160592e2 NEWS
--- a/NEWS Thu Jun 05 16:50:44 2014 +0100
+++ b/NEWS Wed Jun 11 02:29:44 2014 +0100
@@ -279,6 +279,10 @@
- PR1807: Support Debian/Ubuntu 7 OpenJDK Install as Boot JDK
- PR1365: Replace hgforest support
- PR1814: HotSpot URL should be used with --enable-hg
+ - PR1371: Provide option to build without debugging
+ - PR1827: Support AM_MAINTAINER_MODE
+ - PR1830: Drop version requirement for LCMS 2
+ - PR1833, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
* PPC & AIX port
- Add AIX-specific build instructions to README-ppc.html
- Added AIX as testing platform for more jtreg tests written in shell-script
diff -r f990f8b724ad -r 716f160592e2 acinclude.m4
--- a/acinclude.m4 Thu Jun 05 16:50:44 2014 +0100
+++ b/acinclude.m4 Wed Jun 11 02:29:44 2014 +0100
@@ -1945,10 +1945,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)
@@ -2742,3 +2742,47 @@
fi
AC_SUBST(TOOLS_JAR)
])
+
+AC_DEFUN_ONCE([IT_ENABLE_NATIVE_DEBUGINFO],
+[
+ AC_MSG_CHECKING([whether to build native code with debugging information])
+ AC_ARG_ENABLE([native-debuginfo],
+ [AS_HELP_STRING(--enable-native-debuginfo,build with native code debuginfo [[default=yes]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_native_debuginfo=yes
+ ;;
+ *)
+ enable_native_debuginfo=no
+ ;;
+ esac
+ ],
+ [
+ enable_native_debuginfo=yes
+ ])
+ AC_MSG_RESULT([$enable_native_debuginfo])
+ AM_CONDITIONAL([ENABLE_NATIVE_DEBUGINFO], test x"${enable_native_debuginfo}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JAVA_DEBUGINFO],
+[
+ AC_MSG_CHECKING([whether to build Java bytecode with debugging information])
+ AC_ARG_ENABLE([java-debuginfo],
+ [AS_HELP_STRING(--enable-java-debuginfo,build with Java bytecode debuginfo [[default=yes]])],
+ [
+ case "${enableval}" in
+ yes)
+ enable_java_debuginfo=yes
+ ;;
+ *)
+ enable_java_debuginfo=no
+ ;;
+ esac
+ ],
+ [
+ enable_java_debuginfo=yes
+ ])
+ AC_MSG_RESULT([$enable_java_debuginfo])
+ AM_CONDITIONAL([ENABLE_JAVA_DEBUGINFO], test x"${enable_java_debuginfo}" = "xyes")
+])
diff -r f990f8b724ad -r 716f160592e2 configure.ac
--- a/configure.ac Thu Jun 05 16:50:44 2014 +0100
+++ b/configure.ac Wed Jun 11 02:29:44 2014 +0100
@@ -1,5 +1,6 @@
AC_INIT([icedtea], [2.5pre07], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
# Older automake doesn't generate these correctly
@@ -51,6 +52,8 @@
IT_DISABLE_LANGTOOLS_TESTS
IT_DISABLE_JDK_TESTS
IT_ENABLE_SUNEC
+IT_ENABLE_NATIVE_DEBUGINFO
+IT_ENABLE_JAVA_DEBUGINFO
# 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], [])
diff -r f990f8b724ad -r 716f160592e2 patches/rh1022017.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/rh1022017.patch Wed Jun 11 02:29:44 2014 +0100
@@ -0,0 +1,44 @@
+diff -r cdfd161703ed src/share/classes/sun/security/ssl/HelloExtensions.java
+--- openjdk/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java Wed Oct 23 05:22:55 2013 +0100
++++ openjdk/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java Thu Nov 07 12:41:45 2013 +0000
+@@ -435,25 +435,11 @@
+ // the extension value to send in the ClientHello message
+ static final SupportedEllipticCurvesExtension DEFAULT;
+
+- private static final boolean fips;
+-
+ static {
+- int[] ids;
+- fips = SunJSSE.isFIPS();
+- if (fips == false) {
+- ids = new int[] {
+- // NIST curves first
+- // prefer NIST P-256, rest in order of increasing key length
+- 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
+- // non-NIST curves
+- 15, 16, 17, 2, 18, 4, 5, 20, 8, 22,
+- };
+- } else {
+- ids = new int[] {
+- // same as above, but allow only NIST curves in FIPS mode
+- 23, 1, 3, 19, 21, 6, 7, 9, 10, 24, 11, 12, 25, 13, 14,
+- };
+- }
++ int[] ids = new int[] {
++ // NSS currently only supports these three NIST curves
++ 23, 24, 25
++ };
+ DEFAULT = new SupportedEllipticCurvesExtension(ids);
+ }
+
+@@ -545,10 +531,6 @@
+ if ((index <= 0) || (index >= NAMED_CURVE_OID_TABLE.length)) {
+ return false;
+ }
+- if (fips == false) {
+- // in non-FIPS mode, we support all valid indices
+- return true;
+- }
+ return DEFAULT.contains(index);
+ }
+
More information about the distro-pkg-dev
mailing list