/hg/icedtea6: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 22 17:54:24 UTC 2016
changeset 896b78492d42 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=896b78492d42
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Nov 26 19:24:15 2015 +0000
Bump to next release, b38.
2015-11-26 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b38.
changeset cc919eba91fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc919eba91fa
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jan 20 03:45:50 2016 +0000
Merge
changeset 6df2ff9d8f54 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6df2ff9d8f54
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jan 20 05:19:11 2016 +0000
Update to build against January 2016 security fixes.
Upstream changes:
- OPENJDK6-69: Windows build broken after b37 changes
- OPENJDK6-70: Allow versions of ALSA >= 1.1.0
- S4898461: Support for ECB and CBC/PKCS5Padding
- S6720721: CRL check with circular depency support needed
- S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only]
- S6867345: Turkish regional options cause NPE in sun.security.x509.AlgorithmId.algOID
- S7166570: JSSE certificate validation has started to fail for certificate chains
- S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified
- S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
- S8059054: Better URL processing
- S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException
- S8074068: Cleanup in src/share/classes/sun/security/x509/
- S8075773: jps running as root fails after the fix of JDK-8050807
- S8081297: SSL Problem with Tomcat
- S8130710: Better attributes processing
- S8133962: More general limits
- S8134605: Partial rework of the fix for 8081297
- S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing
- S8137060: JMX memory management improvements
- S8138716: (tz) Support tzdata2015g
- S8139012: Better font substitutions
- S8139017: More stable image decoding
- S8140543: Arrange font actions
- S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS
- S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2
- S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure
- S8143185: Cleanup for handling proxies
- S8143941: Update splashscreen displays
- S8144955: Wrong changes were pushed with 8143942
- S8145551: Test failed with Crash for Improved font lookups
- S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp
2016-01-19 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
* patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch:
Removed; added upstream in OpenJDK 6 b38.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* NEWS: Updated.
* patches/openjdk/6799141-split_out_versions.patch:
Regenerated following OPENJDK6-70.
changeset eac2bcbee2d4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=eac2bcbee2d4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jan 21 01:17:36 2016 +0000
Update to b38 tarball.
2016-01-20 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to b38 creation date;
20th of January, 2016.
(OPENJDK_SHA256SUM): Update for b38 tarball.
diffstat:
ChangeLog | 32 +
Makefile.am | 12 +-
NEWS | 33 +
patches/openjdk/6799141-split_out_versions.patch | 40 +-
patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch | 54 +
patches/openjdk/8140620-pr2711-find_default.sf2.patch | 53 +
patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch | 1169 ----------
patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch | 328 --
8 files changed, 198 insertions(+), 1523 deletions(-)
diffs (truncated from 1866 to 500 lines):
diff -r efe390605797 -r eac2bcbee2d4 ChangeLog
--- a/ChangeLog Wed Nov 18 03:16:15 2015 +0000
+++ b/ChangeLog Thu Jan 21 01:17:36 2016 +0000
@@ -1,3 +1,35 @@
+2016-01-20 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Bump to b38 creation date;
+ 20th of January, 2016.
+ (OPENJDK_SHA256SUM): Update for b38 tarball.
+
+2016-01-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch,
+ * patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch:
+ Removed; added upstream in OpenJDK 6 b38.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+ * NEWS: Updated.
+ * patches/openjdk/6799141-split_out_versions.patch:
+ Regenerated following OPENJDK6-70.
+
+2016-01-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch,
+ * patches/openjdk/8140620-pr2711-find_default.sf2.patch:
+ New backports for issues to be fixed in 1.13.10.
+
+2015-11-26 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b38.
+
2015-11-17 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.13.9 release notes.
diff -r efe390605797 -r eac2bcbee2d4 Makefile.am
--- a/Makefile.am Wed Nov 18 03:16:15 2015 +0000
+++ b/Makefile.am Thu Jan 21 01:17:36 2016 +0000
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 11_nov_2015
-OPENJDK_SHA256SUM = 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d
-OPENJDK_VERSION = b37
+OPENJDK_DATE = 20_jan_2016
+OPENJDK_SHA256SUM = ff88dbcbda6c3c7d80b7cbd28065a455cdb009de9874fcf9ff9ca8205d38a257
+OPENJDK_VERSION = b38
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -463,11 +463,9 @@
patches/remove-gcm-test.patch \
patches/skip_wrap_mode.patch \
patches/remove_multicatch_in_testrsa.patch \
- patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch \
patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \
patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \
patches/openjdk/p11cipher-6812738-native_cleanup.patch \
- patches/openjdk/p11cipher-6867345-turkish_regional_options_cause_npe_in_algoid.patch \
patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
@@ -647,7 +645,9 @@
patches/openjdk/6763122-no_zipfile_ctor_exception.patch \
patches/openjdk/6599383-pr363-large_zip_files.patch \
patches/openjdk/6929479-pr363-disable_mmap_zip.patch \
- patches/pr2513-layoutengine_reset.patch
+ patches/pr2513-layoutengine_reset.patch \
+ patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch \
+ patches/openjdk/8140620-pr2711-find_default.sf2.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
diff -r efe390605797 -r eac2bcbee2d4 NEWS
--- a/NEWS Wed Nov 18 03:16:15 2015 +0000
+++ b/NEWS Thu Jan 21 01:17:36 2016 +0000
@@ -14,14 +14,47 @@
New in release 1.14.0 (201X-XX-XX):
+* Security fixes
+ - S8059054, CVE-2016-0402: Better URL processing
+ - S8130710, CVE-2016-0448: Better attributes processing
+ - S8133962, CVE-2016-0466: More general limits
+ - S8137060: JMX memory management improvements
+ - S8139012: Better font substitutions
+ - S8139017, CVE-2016-0483: More stable image decoding
+ - S8140543, CVE-2016-0494: Arrange font actions
+ - S8143185: Cleanup for handling proxies
+ - S8143941, CVE-2015-8126, CVE-2015-8472: Update splashscreen displays
+* Import of OpenJDK6 b38
+ - OJ69: Windows build broken after b37 changes
+ - OJ70: Allow versions of ALSA >= 1.1.0
+ - S6720721: CRL check with circular depency support needed
+ - S6852744: PIT b61: PKI test suite fails because self signed certificates are being rejected [Tests only]
+ - S7166570: JSSE certificate validation has started to fail for certificate chains
+ - S7167988: PKIX CertPathBuilder in reverse mode doesn't work if more than one trust anchor is specified
+ - S7171223: Building ExtensionSubtables.cpp should use -fno-strict-aliasing
+ - S8068761: [TEST_BUG] java/nio/channels/ServerSocketChannel/AdaptServerSocket.java failed with SocketTimeoutException
+ - S8074068: Cleanup in src/share/classes/sun/security/x509/
+ - S8075773: jps running as root fails after the fix of JDK-8050807
+ - S8081297: SSL Problem with Tomcat
+ - S8134605: Partial rework of the fix for 8081297
+ - S8135307: CompletionFailure thrown when calling FieldDoc.type, if the field's type is missing
+ - S8138716: (tz) Support tzdata2015g
+ - S8141213: [Parfait]Potentially blocking function GetArrayLength called in JNI critical region at line 239 of jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c in function GET_ARRAYS
+ - S8141287: Add MD5 to jdk.certpath.disabledAlgorithms - Take 2
+ - S8142928: [TEST_BUG] sun/security/provider/certpath/ReverseBuilder/ReverseBuild.java 8u71 failure
+ - S8144955: Wrong changes were pushed with 8143942
+ - S8145551: Test failed with Crash for Improved font lookups
+ - S8147466: Add -fno-strict-overflow to IndicRearrangementProcessor{,2}.cpp
* Backports
- S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
- S6727719: Performance of TextLayout.getBounds()
- S6745225: Memory leak while drawing Attributed String
- S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
- S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
+ - S7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F
- 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
+ - S8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux
* Bug fixes
- PR1886: IcedTea does not checksum supplied tarballs
- PR2083: Add support for building Zero on AArch64
diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/6799141-split_out_versions.patch
--- a/patches/openjdk/6799141-split_out_versions.patch Wed Nov 18 03:16:15 2015 +0000
+++ b/patches/openjdk/6799141-split_out_versions.patch Thu Jan 21 01:17:36 2016 +0000
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2014-07-30 13:42:56.308105637 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2014-07-30 13:47:55.596394090 +0100
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2016-01-20 04:02:31.642880064 +0000
++++ openjdk/jdk/make/common/Defs-linux.gmk 2016-01-20 04:06:25.098914903 +0000
@@ -135,6 +135,14 @@
LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
endif
@@ -17,8 +17,8 @@
# Selection of warning messages
#
diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:42:56.132103116 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:02:30.290903028 +0000
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2016-01-20 04:06:25.098914903 +0000
@@ -143,18 +143,10 @@
CC = $(COMPILER_PATH)gcc
CPP = $(COMPILER_PATH)gcc -E
@@ -40,8 +40,8 @@
# Get gcc version
diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk openjdk/jdk/make/common/shared/Compiler-msvc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-14 04:24:43.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2014-07-30 13:49:10.217463061 +0100
+--- openjdk.orig/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 01:41:59.589809293 +0000
++++ openjdk/jdk/make/common/shared/Compiler-msvc.gmk 2016-01-20 04:06:25.098914903 +0000
@@ -47,8 +47,6 @@
# Fill in unknown values
COMPILER_NAME=Unknown MSVC Compiler
@@ -52,8 +52,8 @@
# unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
NMAKE = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk openjdk/jdk/make/common/shared/Compiler-sun.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:42:56.296105466 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:02:31.598880811 +0000
++++ openjdk/jdk/make/common/shared/Compiler-sun.gmk 2016-01-20 04:06:25.098914903 +0000
@@ -33,29 +33,20 @@
ifeq ($(PLATFORM), solaris)
# FIXUP: Change to SS12 when validated
@@ -87,8 +87,8 @@
CPP = $(COMPILER_PATH)cc -E
CXX = $(COMPILER_PATH)CC
diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk 2014-07-30 13:42:56.312105695 +0100
-+++ openjdk/jdk/make/common/shared/Defs.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk 2016-01-20 04:02:31.646879996 +0000
++++ openjdk/jdk/make/common/shared/Defs.gmk 2016-01-20 04:06:25.102914835 +0000
@@ -113,9 +113,9 @@
fi)
endef
@@ -152,7 +152,7 @@
+
diff -Nru openjdk.orig/jdk/make/common/shared/Defs-versions.gmk openjdk/jdk/make/common/shared/Defs-versions.gmk
--- openjdk.orig/jdk/make/common/shared/Defs-versions.gmk 1970-01-01 01:00:00.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2014-07-30 13:47:55.600394147 +0100
++++ openjdk/jdk/make/common/shared/Defs-versions.gmk 2016-01-20 04:06:25.102914835 +0000
@@ -0,0 +1,183 @@
+#
+# Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
@@ -338,8 +338,8 @@
+REQUIRED_ZIP_VER = 2.2
+
diff -Nru openjdk.orig/jdk/make/common/shared/Defs-windows.gmk openjdk/jdk/make/common/shared/Defs-windows.gmk
---- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2014-07-14 04:24:43.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 01:41:59.597809158 +0000
++++ openjdk/jdk/make/common/shared/Defs-windows.gmk 2016-01-20 04:06:25.102914835 +0000
@@ -147,10 +147,7 @@
UNIXCOMMAND_PATH:=$(call AltCheckSpaces,UNIXCOMMAND_PATH)
@@ -353,8 +353,8 @@
MKS_VER :=$(call GetVersion,$(_MKS_VER))
# At this point, we can re-define FullPath to use DOSNAME_CMD
diff -Nru openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk
---- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-07-30 13:42:56.132103116 +0100
-+++ openjdk/jdk/make/common/shared/Platform.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2016-01-20 04:02:30.290903028 +0000
++++ openjdk/jdk/make/common/shared/Platform.gmk 2016-01-20 04:06:57.042372407 +0000
@@ -51,8 +51,6 @@
# USER login name of user (minus blanks)
# PLATFORM windows, solaris, or linux
@@ -447,7 +447,7 @@
- endif
- ifneq ($(ARCH), ia64)
- # ALSA 0.9.1 and above
-- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.]0[.][0-9]))[0-9]*
+- REQUIRED_ALSA_VERSION = ^((0[.]9[.][1-9])|(1[.][0-9][.][0-9]))[0-9]*
- endif
# How much RAM does this machine have:
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
@@ -513,8 +513,8 @@
ifneq ($(PLATFORM), windows)
# Temporary disk area
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-07-30 13:42:53.596066769 +0100
-+++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:02:27.542949705 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk 2016-01-20 04:06:25.102914835 +0000
@@ -44,54 +44,100 @@
SANITY_FILES = $(ERROR_FILE) $(WARNING_FILE) $(MESSAGE_FILE)
@@ -861,8 +861,8 @@
" The compiler was obtained from the following location: \n" \
" $(GCC_COMPILER_PATH) \n" \
diff -Nru openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk openjdk/jdk/make/common/shared/Sanity-Settings.gmk
---- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-14 04:24:43.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2014-07-30 13:47:55.600394147 +0100
+--- openjdk.orig/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 01:42:00.025801958 +0000
++++ openjdk/jdk/make/common/shared/Sanity-Settings.gmk 2016-01-20 04:06:25.102914835 +0000
@@ -177,8 +177,6 @@
ifeq ($(PLATFORM),windows)
ALL_SETTINGS+=$(call addRequiredSetting,PROCESSOR_ARCHITECTURE)
diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7169111-pr2757-unreadable_menu_bar_with_ambiance_theme.patch Thu Jan 21 01:17:36 2016 +0000
@@ -0,0 +1,54 @@
+# HG changeset patch
+# User rupashka
+# Date 1342090033 -14400
+# Thu Jul 12 14:47:13 2012 +0400
+# Node ID 05c69338ee73c1e454aa632ced5cbc057420b404
+# Parent 0039f5c7fb512e1ec2e22bceb69ee324426a684f
+7169111, PR2757: Unreadable menu bar with Ambiance theme in GTK L&F
+Reviewed-by: kizune
+
+diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java
+--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Wed Jul 11 16:19:41 2012 -0700
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Thu Jul 12 14:47:13 2012 +0400
+@@ -796,9 +796,10 @@
+ "Menu.margin", zeroInsets,
+ "Menu.cancelMode", "hideMenuTree",
+ "Menu.alignAcceleratorText", Boolean.FALSE,
++ "Menu.useMenuBarForTopLevelMenus", Boolean.TRUE,
+
+
+- "MenuBar.windowBindings", new Object[] {
++ "MenuBar.windowBindings", new Object[] {
+ "F10", "takeFocus" },
+ "MenuBar.font", new FontLazyValue(Region.MENU_BAR),
+
+diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java
+--- openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Wed Jul 11 16:19:41 2012 -0700
++++ openjdk/jdk/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyleFactory.java Thu Jul 12 14:47:13 2012 +0400
+@@ -92,7 +92,13 @@
+ boolean defaultCapable = btn.isDefaultCapable();
+ key = new ComplexKey(wt, toolButton, defaultCapable);
+ }
++ } else if (id == Region.MENU) {
++ if (c instanceof JMenu && ((JMenu) c).isTopLevelMenu() &&
++ UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus")) {
++ wt = WidgetType.MENU_BAR;
++ }
+ }
++
+ if (key == null) {
+ // Otherwise, just use the WidgetType as the key.
+ key = wt;
+diff -r 0039f5c7fb51 -r 05c69338ee73 src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java
+--- openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Wed Jul 11 16:19:41 2012 -0700
++++ openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthMenuUI.java Thu Jul 12 14:47:13 2012 +0400
+@@ -299,7 +299,8 @@
+ */
+ @Override
+ public void propertyChange(PropertyChangeEvent e) {
+- if (SynthLookAndFeel.shouldUpdateStyle(e)) {
++ if (SynthLookAndFeel.shouldUpdateStyle(e) ||
++ (e.getPropertyName().equals("ancestor") && UIManager.getBoolean("Menu.useMenuBarForTopLevelMenus"))) {
+ updateStyle((JMenu)e.getSource());
+ }
+ }
diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/8140620-pr2711-find_default.sf2.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8140620-pr2711-find_default.sf2.patch Thu Jan 21 01:17:36 2016 +0000
@@ -0,0 +1,53 @@
+# HG changeset patch
+# User omajid
+# Date 1445973555 14400
+# Tue Oct 27 15:19:15 2015 -0400
+# Node ID 79e4644bd40482ec3ae557f086137e2869b3f50a
+# Parent 09c2cc84d4517af288f26607a39ff0515a05e771
+8140620, PR2711: Find and load default.sf2 as the default soundbank on Linux
+Reviewed-by: serb
+
+diff -r 09c2cc84d451 -r 79e4644bd404 src/share/classes/com/sun/media/sound/SoftSynthesizer.java
+--- openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Fri Nov 13 05:11:53 2015 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400
+@@ -668,6 +668,40 @@
+ actions.add(new PrivilegedAction<InputStream>() {
+ public InputStream run() {
+ if (System.getProperties().getProperty("os.name")
++ .startsWith("Linux")) {
++
++ File[] systemSoundFontsDir = new File[] {
++ /* Arch, Fedora, Mageia */
++ new File("/usr/share/soundfonts/"),
++ new File("/usr/local/share/soundfonts/"),
++ /* Debian, Gentoo, OpenSUSE, Ubuntu */
++ new File("/usr/share/sounds/sf2/"),
++ new File("/usr/local/share/sounds/sf2/"),
++ };
++
++ /*
++ * Look for a default.sf2
++ */
++ for (File systemSoundFontDir : systemSoundFontsDir) {
++ if (systemSoundFontDir.exists()) {
++ File defaultSoundFont = new File(systemSoundFontDir, "default.sf2");
++ if (defaultSoundFont.exists()) {
++ try {
++ return new FileInputStream(defaultSoundFont);
++ } catch (IOException e) {
++ // continue with lookup
++ }
++ }
++ }
++ }
++ }
++ return null;
++ }
++ });
++
++ actions.add(new PrivilegedAction<InputStream>() {
++ public InputStream run() {
++ if (System.getProperties().getProperty("os.name")
+ .startsWith("Windows")) {
+ File gm_dls = new File(System.getenv("SystemRoot")
+ + "\\system32\\drivers\\gm.dls");
diff -r efe390605797 -r eac2bcbee2d4 patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch
--- a/patches/openjdk/p11cipher-4898461-support_ecb_and_cbc.patch Wed Nov 18 03:16:15 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1169 +0,0 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java
---- openjdk.orig/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:00:58.332289584 +0100
-+++ openjdk/jdk/src/share/classes/sun/security/pkcs11/P11Cipher.java 2012-10-23 18:10:13.013034333 +0100
-@@ -22,10 +22,10 @@
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
--
- package sun.security.pkcs11;
-
- import java.nio.ByteBuffer;
-+import java.util.Arrays;
-
- import java.security.*;
- import java.security.spec.*;
-@@ -34,7 +34,6 @@
- import javax.crypto.spec.*;
-
- import sun.nio.ch.DirectBuffer;
--
- import sun.security.pkcs11.wrapper.*;
- import static sun.security.pkcs11.wrapper.PKCS11Constants.*;
-
-@@ -43,8 +42,8 @@
- * DES, DESede, AES, ARCFOUR, and Blowfish.
- *
- * This class is designed to support ECB and CBC with NoPadding and
-- * PKCS5Padding for both. However, currently only CBC/NoPadding (and
-- * ECB/NoPadding for stream ciphers) is functional.
-+ * PKCS5Padding for both. It will use its own padding impl if the
-+ * native mechanism does not support padding.
- *
- * Note that PKCS#11 current only supports ECB and CBC. There are no
- * provisions for other modes such as CFB, OFB, PCBC, or CTR mode.
-@@ -62,10 +61,56 @@
- private final static int MODE_CBC = 4;
-
- // padding constant for NoPadding
-- private final static int PAD_NONE = 5;
-+ private final static int PAD_NONE = 5;
- // padding constant for PKCS5Padding
- private final static int PAD_PKCS5 = 6;
-
-+ private static interface Padding {
-+ // ENC: format the specified buffer with padding bytes and return the
-+ // actual padding length
-+ int setPaddingBytes(byte[] paddingBuffer, int padLen);
-+
-+ // DEC: return the length of trailing padding bytes given the specified
-+ // padded data
-+ int unpad(byte[] paddedData, int ofs, int len)
-+ throws BadPaddingException;
-+ }
-+
-+ private static class PKCS5Padding implements Padding {
-+
-+ private final int blockSize;
-+
-+ PKCS5Padding(int blockSize)
-+ throws NoSuchPaddingException {
-+ if (blockSize == 0) {
-+ throw new NoSuchPaddingException
-+ ("PKCS#5 padding not supported with stream ciphers");
-+ }
-+ this.blockSize = blockSize;
-+ }
-+
-+ public int setPaddingBytes(byte[] paddingBuffer, int padLen) {
-+ Arrays.fill(paddingBuffer, 0, padLen, (byte) (padLen & 0x007f));
-+ return padLen;
-+ }
-+
-+ public int unpad(byte[] paddedData, int ofs, int len)
-+ throws BadPaddingException {
-+ byte padValue = paddedData[ofs + len - 1];
-+ if (padValue < 1 || padValue > blockSize) {
-+ throw new BadPaddingException("Invalid pad value!");
-+ }
-+ // sanity check padding bytes
-+ int padStartIndex = ofs + len - padValue;
-+ for (int i = padStartIndex; i < len; i++) {
-+ if (paddedData[i] != padValue) {
-+ throw new BadPaddingException("Invalid pad bytes!");
-+ }
-+ }
-+ return padValue;
-+ }
-+ }
-+
- // token instance
- private final Token token;
-
-@@ -99,64 +144,92 @@
- // padding type, on of PAD_* above (PAD_NONE for stream ciphers)
- private int paddingType;
-
-+ // when the padding is requested but unsupported by the native mechanism,
-+ // we use the following to do padding and necessary data buffering.
-+ // padding object which generate padding and unpad the decrypted data
-+ private Padding paddingObj;
-+ // buffer for holding back the block which contains padding bytes
-+ private byte[] padBuffer;
-+ private int padBufferLen;
-+
- // original IV, if in MODE_CBC
- private byte[] iv;
-
-- // total number of bytes processed
-- private int bytesProcessed;
-+ // number of bytes buffered internally by the native mechanism and padBuffer
-+ // if we do the padding
-+ private int bytesBuffered;
-
- P11Cipher(Token token, String algorithm, long mechanism)
-- throws PKCS11Exception {
-+ throws PKCS11Exception, NoSuchAlgorithmException {
- super();
- this.token = token;
- this.algorithm = algorithm;
- this.mechanism = mechanism;
-- keyAlgorithm = algorithm.split("/")[0];
-+
-+ String algoParts[] = algorithm.split("/");
-+ keyAlgorithm = algoParts[0];
-+
- if (keyAlgorithm.equals("AES")) {
- blockSize = 16;
-- blockMode = MODE_CBC;
-- // XXX change default to PKCS5Padding
-- paddingType = PAD_NONE;
-- } else if (keyAlgorithm.equals("RC4") || keyAlgorithm.equals("ARCFOUR")) {
-+ } else if (keyAlgorithm.equals("RC4") ||
-+ keyAlgorithm.equals("ARCFOUR")) {
- blockSize = 0;
-- blockMode = MODE_ECB;
More information about the distro-pkg-dev
mailing list