/hg/icedtea8-forest/jdk: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jan 28 03:02:27 UTC 2016
changeset edf1cacfe015 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=edf1cacfe015
author: andrew
date: Thu Jan 28 02:36:08 2016 +0000
PR2459: Policy JAR files should be timestamped with the date of the policy file they hold
Summary: Timestamp the policy files with their original creation dates and propogate to manifest and JAR file.
changeset d7fa6efaf02a in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=d7fa6efaf02a
author: andrew
date: Thu Jan 28 02:39:11 2016 +0000
PR2767: Remove remaining rogue binaries from OpenJDK tree
changeset 809d98eeda49 in /hg/icedtea8-forest/jdk
details: http://icedtea.classpath.org/hg/icedtea8-forest/jdk?cmd=changeset;node=809d98eeda49
author: omajid
date: Tue Oct 27 15:19:15 2015 -0400
8140620, PR2769: Find and load default.sf2 as the default soundbank on Linux
Reviewed-by: serb
diffstat:
make/CreateSecurityJars.gmk | 57 ++++++---
src/share/classes/com/sun/media/sound/SoftSynthesizer.java | 34 +++++
test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so | Bin
test/sun/management/jmxremote/bootstrap/linux-amd64/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher | Bin
test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher | Bin
test/sun/net/idn/nfscis.spp | Bin
test/sun/net/idn/nfscsi.spp | Bin
test/sun/net/idn/nfscss.spp | Bin
test/sun/net/idn/nfsmxp.spp | Bin
test/sun/net/idn/nfsmxs.spp | Bin
11 files changed, 71 insertions(+), 20 deletions(-)
diffs (170 lines):
diff -r 26e2e029ee25 -r 809d98eeda49 make/CreateSecurityJars.gmk
--- a/make/CreateSecurityJars.gmk Wed Jan 27 04:02:27 2016 +0000
+++ b/make/CreateSecurityJars.gmk Tue Oct 27 15:19:15 2015 -0400
@@ -179,6 +179,8 @@
##########################################################################################
+POLICY_CREATION_DATE := 200712010000
+
US_EXPORT_POLICY_JAR_DST := $(JDK_OUTPUTDIR)/lib/security/US_export_policy.jar
ifneq ($(BUILD_CRYPTO), no)
@@ -204,23 +206,28 @@
$(US_EXPORT_POLICY_JAR_TMP)/%: $(US_EXPORT_POLICY_JAR_SRC_DIR)/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
- $(US_EXPORT_POLICY_JAR_MANIFEST_FILE):
+ $(US_EXPORT_POLICY_JAR_MANIFEST_FILE): $(US_EXPORT_POLICY_JAR_POLICIES)
$(MKDIR) -p $(US_EXPORT_POLICY_JAR_TMP)/META-INF
- $(ECHO) "Manifest-Version: 1.0" > $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
- $(ECHO) "Crypto-Strength: unlimited" >> $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
- $(TOUCH) -t 198001010000 $(US_EXPORT_POLICY_JAR_TMP)/META-INF
- $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/META-INF $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: unlimited" >> $@
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy \
+ $(US_EXPORT_POLICY_JAR_TMP)/META-INF
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_TMP)/META-INF $@
- US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy \
- $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
+ US_EXPORT_POLICY_JAR_POLICIES := $(US_EXPORT_POLICY_JAR_TMP)/default_US_export.policy
+
+ US_EXPORT_POLICY_JAR_DEPS := $(US_EXPORT_POLICY_JAR_POLICIES) $(US_EXPORT_POLICY_JAR_MANIFEST_FILE)
$(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_DEPS)
( $(CD) $(US_EXPORT_POLICY_JAR_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_MANIFEST_FILE) $@
$(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED): $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
$(ECHO) $(LOG_INFO) Copying unlimited $(patsubst $(OUTPUT_ROOT)/%,%,$@)
$(install-file)
+ $(TOUCH) -r $(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED) $@
TARGETS += $(US_EXPORT_POLICY_JAR_LIMITED_UNSIGNED) \
$(US_EXPORT_POLICY_JAR_UNLIMITED_UNSIGNED)
@@ -271,36 +278,46 @@
$(LOCAL_POLICY_JAR_LIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/limited/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
- $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE):
+ $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_LIMITED_POLICIES)
$(MKDIR) -p $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF
- $(ECHO) "Manifest-Version: 1.0" > $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE)
- $(ECHO) "Crypto-Strength: limited" >> $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE)
- $(TOUCH) -t 198001010000 $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF
- $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE)
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: limited" >> $@
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_TMP)/META-INF $@
- LOCAL_POLICY_JAR_LIMITED_DEPS := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
- $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy \
+ LOCAL_POLICY_JAR_LIMITED_POLICIES := $(LOCAL_POLICY_JAR_LIMITED_TMP)/exempt_local.policy \
+ $(LOCAL_POLICY_JAR_LIMITED_TMP)/default_local.policy
+
+ LOCAL_POLICY_JAR_LIMITED_DEPS := $(LOCAL_POLICY_JAR_LIMITED_POLICIES) \
$(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE)
$(LOCAL_POLICY_JAR_LIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_LIMITED_DEPS)
( $(CD) $(LOCAL_POLICY_JAR_LIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_LIMITED_MANIFEST_FILE) $@
$(LOCAL_POLICY_JAR_UNLIMITED_TMP)/%: $(JDK_TOPDIR)/make/data/cryptopolicy/unlimited/%
$(install-file)
+ $(TOUCH) -t $(POLICY_CREATION_DATE) $@
- $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE):
+ $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE): $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES)
$(MKDIR) -p $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF
- $(ECHO) "Manifest-Version: 1.0" > $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE)
- $(ECHO) "Crypto-Strength: unlimited" >> $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE)
- $(TOUCH) -t 198001010000 $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF
- $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE)
+ $(ECHO) "Manifest-Version: 1.0" > $@
+ $(ECHO) "Crypto-Strength: unlimited" >> $@
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy \
+ $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/META-INF $@
- LOCAL_POLICY_JAR_UNLIMITED_DEPS := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy \
+ LOCAL_POLICY_JAR_UNLIMITED_POLICIES := $(LOCAL_POLICY_JAR_UNLIMITED_TMP)/default_local.policy
+
+ LOCAL_POLICY_JAR_UNLIMITED_DEPS := $(LOCAL_POLICY_JAR_UNLIMITED_POLICIES) \
$(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE)
$(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED): $(LOCAL_POLICY_JAR_UNLIMITED_DEPS)
( $(CD) $(LOCAL_POLICY_JAR_UNLIMITED_TMP) && $(ZIP) -Xr $@ META-INF *.policy )
+ $(TOUCH) -r $(LOCAL_POLICY_JAR_UNLIMITED_MANIFEST_FILE) $@
TARGETS += $(LOCAL_POLICY_JAR_LIMITED_UNSIGNED) $(LOCAL_POLICY_JAR_UNLIMITED_UNSIGNED)
diff -r 26e2e029ee25 -r 809d98eeda49 src/share/classes/com/sun/media/sound/SoftSynthesizer.java
--- a/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Wed Jan 27 04:02:27 2016 +0000
+++ b/src/share/classes/com/sun/media/sound/SoftSynthesizer.java Tue Oct 27 15:19:15 2015 -0400
@@ -669,6 +669,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 26e2e029ee25 -r 809d98eeda49 test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so
Binary file test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/solaris-amd64/libLauncher.so has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/linux-amd64/launcher
Binary file test/sun/management/jmxremote/bootstrap/linux-amd64/launcher has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher
Binary file test/sun/management/jmxremote/bootstrap/solaris-amd64/launcher has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher
Binary file test/sun/management/jmxremote/bootstrap/solaris-sparcv9/launcher has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscis.spp
Binary file test/sun/net/idn/nfscis.spp has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscsi.spp
Binary file test/sun/net/idn/nfscsi.spp has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfscss.spp
Binary file test/sun/net/idn/nfscss.spp has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfsmxp.spp
Binary file test/sun/net/idn/nfsmxp.spp has changed
diff -r 26e2e029ee25 -r 809d98eeda49 test/sun/net/idn/nfsmxs.spp
Binary file test/sun/net/idn/nfsmxs.spp has changed
More information about the distro-pkg-dev
mailing list