/hg/icedtea6-hg: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Feb 4 07:30:47 PST 2014
changeset 29333c29963d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=29333c29963d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 23 18:46:47 2014 +0000
Remove unneeded jdk_generic_profile.sh patch that breaks when system LCMS is disabled.
2014-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/alternative_krb5_cache_fixup.patch:
Remove unneeded jdk_generic_profile.sh fragment
that doesn't apply when system LCMS is disabled.
changeset 2ec0e83f2e83 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2ec0e83f2e83
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 23 18:56:55 2014 +0000
Disable LCMS2 system library check when LCMS2 isn't required.
2014-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
* acinclude.m4:
(IT_CHECK_FOR_LCMS): Depend on IT_ENABLE_LCMS2
and only enable system LCMS by default if it's
enabled.
* configure.ac:
Don't invoke IT_ENABLE_LCMS2 explicitly.
changeset 963a9ab43d7f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=963a9ab43d7f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 30 21:38:08 2014 +0000
Add 1.11.15 release notes.
2014-01-30 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.11.15 release notes.
changeset 8c338e95fea0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=8c338e95fea0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Sat Feb 01 15:57:33 2014 +0000
Start work on next release, b31.
2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b31.
changeset 2fba937157de in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2fba937157de
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Feb 04 15:30:30 2014 +0000
Sync linker-libs-order.patch with upstream.
2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/linker-libs-order.patch:
Regenerate, removing upstreamed fragment.
diffstat:
ChangeLog | 29 +++++++++++++++++
Makefile.am | 2 +-
NEWS | 51 ++++++++++++++++++++++++++++++
acinclude.m4 | 3 +-
configure.ac | 5 +--
patches/alternative_krb5_cache_fixup.patch | 18 ----------
patches/linker-libs-order.patch | 44 +++++++++----------------
7 files changed, 100 insertions(+), 52 deletions(-)
diffs (231 lines):
diff -r 94c0b31c2a43 -r 2fba937157de ChangeLog
--- a/ChangeLog Mon Jan 20 18:42:31 2014 +0000
+++ b/ChangeLog Tue Feb 04 15:30:30 2014 +0000
@@ -1,3 +1,32 @@
+2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/linker-libs-order.patch:
+ Regenerate, removing upstreamed fragment.
+
+2014-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b31.
+
+2014-01-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add 1.11.15 release notes.
+
+2014-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_LCMS): Depend on IT_ENABLE_LCMS2
+ and only enable system LCMS by default if it's
+ enabled.
+ * configure.ac:
+ Don't invoke IT_ENABLE_LCMS2 explicitly.
+
+2014-01-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/alternative_krb5_cache_fixup.patch:
+ Remove unneeded jdk_generic_profile.sh fragment
+ that doesn't apply when system LCMS is disabled.
+
2014-01-20 Andrew John Hughes <gnu.andrew at redhat.com>
* AUTHORS:
diff -r 94c0b31c2a43 -r 2fba937157de Makefile.am
--- a/Makefile.am Mon Jan 20 18:42:31 2014 +0000
+++ b/Makefile.am Tue Feb 04 15:30:30 2014 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 21_jan_2014
OPENJDK_SHA256SUM = ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475
-OPENJDK_VERSION = b30
+OPENJDK_VERSION = b31
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
diff -r 94c0b31c2a43 -r 2fba937157de NEWS
--- a/NEWS Mon Jan 20 18:42:31 2014 +0000
+++ b/NEWS Tue Feb 04 15:30:30 2014 +0000
@@ -14,6 +14,57 @@
New in release 1.14.0 (201X-XX-XX):
+New in release 1.11.15 (2014-01-21):
+
+* Security fixes
+ - S6727821: Enhance JAAS Configuration
+ - S7068126, CVE-2014-0373: Enhance SNMP status
+ - S8010935: Better XML handling
+ - S8011786, CVE-2014-0368: Better applet networking
+ - S8021257, CVE-2013-5896: com.sun.corba.se.** should be on restricted package list
+ - S8022904: Enhance JDBC Parsers
+ - S8022927: Input validation for byte/endian conversions
+ - S8022935: Enhance Apache resolver classes
+ - S8022945: Enhance JNDI implementation classes
+ - S8023057: Enhance start up image display
+ - S8023069, CVE-2014-0411: Enhance TLS connections
+ - S8023245, CVE-2014-0423: Enhance Beans decoding
+ - S8023301: Enhance generic classes
+ - S8023672: Enhance jar file validation
+ - S8024306, CVE-2014-0416: Enhance Subject consistency
+ - S8024530: Enhance font process resilience
+ - S8024867: Enhance logging start up
+ - S8025014: Enhance Security Policy
+ - S8025018, CVE-2014-0376: Enhance JAX-P set up
+ - S8025026, CVE-2013-5878: Enhance canonicalization
+ - S8025034, CVE-2013-5907: Improve layout lookups
+ - S8025448: Enhance listening events
+ - S8025758, CVE-2014-0422: Enhance Naming management
+ - S8025767, CVE-2014-0428: Enhance IIOP Streams
+ - S8026172: Enhance UI Management
+ - S8026176: Enhance document printing
+ - S8026193, CVE-2013-5884: Enhance CORBA stub factories
+ - S8026204: Enhance auth login contexts
+ - S8026417, CVE-2013-5910: Enhance XML canonicalization
+ - S8027201, CVE-2014-0376: Enhance JAX-P set up
+* Backports
+ - S6763340: memory leak in com.sun.corba.se.* classes
+ - S6873605: Missing finishedDispatch() call in ORBImpl causes test failures after 5u20 b04
+ - S6893617: JDK 6 CNCtx always uses the default ORB
+ - S6980681: CORBA deadlock in Java SE believed to be related to CR 6238477
+ - S6995424: Eliminate dependency to a deprecated API com.sun.security.auth.PolicyFile
+ - S7162902: Umbrella port of a number of corba bug fixes from JDK 6 to jdk7u/8
+ - S8026826: JDK 7 fix for 8010935 broke the build
+ - S8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
+* Bug fixes
+ - D729448: 32-bit alignment on mips and mipsel
+ - Fail if a C and C++ compiler are not detected.
+ - Only copy tz.properties if the destination directory exists.
+ - Fix GenerateBreakIteratorData tool so that crashes have stack traces.
+ - Fix path in nss-not-enabled-config.patch.
+* SystemTap support:
+ - Add garbage collection dtrace/SystemTap probes to HotSpot.
+
New in release 1.13.1 (2014-01-22):
* Security fixes
diff -r 94c0b31c2a43 -r 2fba937157de acinclude.m4
--- a/acinclude.m4 Mon Jan 20 18:42:31 2014 +0000
+++ b/acinclude.m4 Tue Feb 04 15:30:30 2014 +0000
@@ -1537,6 +1537,7 @@
AC_DEFUN_ONCE([IT_CHECK_FOR_LCMS],
[
+ AC_REQUIRE([IT_ENABLE_LCMS2])
AC_MSG_CHECKING([whether to use the system LCMS install])
AC_ARG_ENABLE([system-lcms],
[AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
@@ -1544,7 +1545,7 @@
ENABLE_SYSTEM_LCMS="${enableval}"
],
[
- if test x"${target_os}" = "xlinux-gnu"; then
+ if test x"${ENABLE_LCMS2}" = "xyes" -a x"${target_os}" = "xlinux-gnu" ; then
ENABLE_SYSTEM_LCMS="yes" ;
else
ENABLE_SYSTEM_LCMS="no" ;
diff -r 94c0b31c2a43 -r 2fba937157de configure.ac
--- a/configure.ac Mon Jan 20 18:42:31 2014 +0000
+++ b/configure.ac Tue Feb 04 15:30:30 2014 +0000
@@ -296,10 +296,6 @@
IT_WITH_PAX
AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
-IT_ENABLE_LCMS2
-
-IT_CHECK_FOR_KERBEROS
-
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR([Could not find CUPS headers;
@@ -313,6 +309,7 @@
IT_CHECK_FOR_PNG
IT_CHECK_FOR_GIF
IT_CHECK_FOR_LCMS
+IT_CHECK_FOR_KERBEROS
AC_CONFIG_FILES([remove-intree-libraries.sh])
dnl Check for Xproto headers and libraries.
diff -r 94c0b31c2a43 -r 2fba937157de patches/alternative_krb5_cache_fixup.patch
--- a/patches/alternative_krb5_cache_fixup.patch Mon Jan 20 18:42:31 2014 +0000
+++ b/patches/alternative_krb5_cache_fixup.patch Tue Feb 04 15:30:30 2014 +0000
@@ -1,21 +1,3 @@
-diff -Nru openjdk.orig/jdk/make/jdk_generic_profile.sh openjdk/jdk/make/jdk_generic_profile.sh
---- openjdk.orig/jdk/make/jdk_generic_profile.sh 2013-08-30 02:41:17.276807687 +0100
-+++ openjdk/jdk/make/jdk_generic_profile.sh 2013-08-30 12:11:12.428923185 +0100
-@@ -467,5 +467,14 @@
- export LCMS_CFLAGS
- export LCMS_LIBS
-
-+# Export variables for system krb5
-+# KRB5_CFLAGS and KRB5_LIBS tell the compiler how to compile and
-+# link against Kerberos
-+if [ "${KRB5_LIBS}" = "" ] ; then
-+ KRB5_LIBS="-lkrb5"
-+fi
-+export KRB5_LIBS
-+
- # IcedTea defaults; use system libraries
- export SYSTEM_LCMS=true
-+export SYSTEM_KRB5=true
diff -Nru openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile
--- openjdk.orig/jdk/make/sun/security/krb5/internal/ccache/Makefile 2013-08-30 02:41:17.408809749 +0100
+++ openjdk/jdk/make/sun/security/krb5/internal/ccache/Makefile 2013-08-30 12:10:34.336330523 +0100
diff -r 94c0b31c2a43 -r 2fba937157de patches/linker-libs-order.patch
--- a/patches/linker-libs-order.patch Mon Jan 20 18:42:31 2014 +0000
+++ b/patches/linker-libs-order.patch Tue Feb 04 15:30:30 2014 +0000
@@ -1,7 +1,19 @@
-diff -durN openjdk-orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
---- openjdk-orig/jdk/make/common/shared/Sanity.gmk 2008-10-27 00:25:33.000000000 +0000
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2008-10-28 21:42:16.000000000 +0000
-@@ -1397,7 +1397,7 @@
+diff -Nru openjdk.orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
+--- openjdk.orig/jdk/make/com/sun/java/pack/Makefile 2013-08-21 20:32:57.128216515 +0100
++++ openjdk/jdk/make/com/sun/java/pack/Makefile 2014-02-01 15:58:10.921834941 +0000
+@@ -144,7 +144,7 @@
+
+ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
+ $(prep-target)
+- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
++ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+
+
+diff -Nru openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-02-01 15:43:22.344232267 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-02-01 15:58:10.921834941 +0000
+@@ -1344,7 +1344,7 @@
ifdef ALSA_VERSION_CHECK
$(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
@$(prep-target)
@@ -10,27 +22,3 @@
$(ALSA_VERSION_CHECK).c:
@$(prep-target)
-diff -durN openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
---- openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile 2008-08-28 09:10:50.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile 2008-10-28 21:55:27.000000000 +0000
-@@ -65,7 +65,7 @@
- $(MIDIFILES_export) \
- $(PORTFILES_export)
-
--LDFLAGS += -lasound
-+OTHER_LDLIBS += -lasound
-
- CPPFLAGS += \
- -DUSE_DAUDIO=TRUE \
-diff -durN openjdk-orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
---- openjdk-orig/jdk/make/com/sun/java/pack/Makefile 2008-10-27 00:25:30.000000000 +0000
-+++ openjdk/jdk/make/com/sun/java/pack/Makefile 2008-10-28 23:27:55.000000000 +0000
-@@ -142,7 +141,7 @@
-
- $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
- $(prep-target)
-- $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
-+ $(LINKER) $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
- $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
-
-
More information about the distro-pkg-dev
mailing list