/hg/icedtea7: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Thu Jul 16 23:07:27 UTC 2015
changeset 02a6a3c2fb0e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=02a6a3c2fb0e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 01:09:17 2015 +0100
Bump to 2.6.0.
2015-07-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
(JDK_CHANGESET): Update to icedtea-2.6.0.
(JDK_SHA256SUM): Likewise.
* configure.ac: Bump to 2.6.0
changeset f7a75cccf21b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=f7a75cccf21b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 01:09:59 2015 +0100
Set 2.6.0 release date.
2015-07-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
* NEWS: Set 2.6.0 release date.
changeset e6ffd4b963d6 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e6ffd4b963d6
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 19:25:59 2015 +0100
PR2537: Desktop files do not allow installation from multiple versions of IcedTea
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2537: Desktop files do not allow installation from
multiple versions of IcedTea
* jconsole.desktop: Moved to jconsole.desktop.in.
* policytool.desktop: Moved to policytool.desktop.in.
* Makefile.am:
(ICEDTEA_ENV): Use @JAVA_VER@ in JRE_RELEASE_VERSION,
rather than hardcoding version.
(DESKTOP_FILES): Add Java version to filenames.
(EXTRA_DIST): Remove $(DESKTOP_FILES) as they are
now handled by autoconf and generated versions shouldn't
be packaged.
(all-local): Depend on $(DESKTOP_FILES) being created.
(clean-local): Add clean-policytool- at JAVA_VER@.desktop
and clean-jconsole- at JAVA_VER@.desktop
(.PHONY): Likewise.
(policytool- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-policytool- at JAVA_VER@.desktop): Remove generated file.
(jconsole- at JAVA_VER@.desktop): Generate desktop file
by replacing _BINDIR_ with actual make variable $(bindir).
(clean-jconsole- at JAVA_VER@.desktop): Remove generated file.
(install-data-local): Replace hard-coded "1.7.0" with @JAVA_VER at .
Copy desktop files from build directory.
* NEWS: Updated.
* acinclude.m4:
(IT_DETERMINE_VERSION): Set JAVA_VER to 1.7.0 and include in
configure output.
* configure.ac:
Generate jconsole.desktop and policytool.desktop.
Drop AC_PREFIX_DEFAULT invocation, reverting to
/usr/local as default installation directory.
* jconsole.desktop.in: Moved from jconsole.desktop so
that @JAVA_VER@ can be replaced by configure and
_BINDIR_ by the build.
* policytool.desktop.in: Likewise for policytool.desktop.
changeset d4a9d80cb9aa in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d4a9d80cb9aa
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jul 16 20:15:05 2015 +0100
PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2539: Libraries in some subdirectories of
jre/lib/{arch} are not installed
* Makefile.am:
(install-exec-local): Loop over jre/lib/$(INSTALL_ARCH_DIR)
and all subdirectories to ensure all libraries are
installed.
* NEWS: Updated.
changeset cff3873b35b5 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=cff3873b35b5
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 00:06:58 2015 +0100
PR2540: Specify a cacerts file for the OpenJDK build as we do for OpenJDK 8
2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2540: Specify a cacerts file for the OpenJDK
build as we do for OpenJDK 8
* INSTALL: Document --with-cacerts-file.
* Makefile.am:
(ICEDTEA_ENV): Pass ALT_CACERTS_FILE to OpenJDK
build if specified and valid.
(install-data-local): Install the cacerts file.
* NEWS: Updated.
* acinclude.m4:
(IT_WITH_CACERTS_FILE): Allow a cacerts file to
be specified, defaulting to
${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
* configure.ac:
Invoke IT_WITH_CACERTS_FILE.
2015-06-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2540: Specify a cacerts file for the OpenJDK
build as we do for OpenJDK 8
* Makefile.am:
(JDK_CACERTS_FILE): Added to specify the location
of cacerts within the bootstrap JDK.
(CACERTS_FILE): Find the regular cacerts file,
dereferencing any symlinks which point to it.
* configure.ac:
Call IT_FIND_TOOL to locate the readlink tool,
which is part of coreutils.
diffstat:
ChangeLog | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
INSTALL | 2 +
Makefile.am | 86 +++++++++++++++++++++++++++++-------------------
NEWS | 5 ++-
acinclude.m4 | 36 ++++++++++++++++++++-
configure.ac | 8 ++-
jconsole.desktop | 10 -----
jconsole.desktop.in | 10 +++++
policytool.desktop | 10 -----
policytool.desktop.in | 10 +++++
10 files changed, 207 insertions(+), 59 deletions(-)
diffs (478 lines):
diff -r 55507c3956c9 -r cff3873b35b5 ChangeLog
--- a/ChangeLog Wed Jul 15 23:47:41 2015 +0100
+++ b/ChangeLog Fri Jul 17 00:06:58 2015 +0100
@@ -1,3 +1,92 @@
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2540: Specify a cacerts file for the OpenJDK
+ build as we do for OpenJDK 8
+ * INSTALL: Document --with-cacerts-file.
+ * Makefile.am:
+ (ICEDTEA_ENV): Pass ALT_CACERTS_FILE to OpenJDK
+ build if specified and valid.
+ (install-data-local): Install the cacerts file.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_WITH_CACERTS_FILE): Allow a cacerts file to
+ be specified, defaulting to
+ ${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
+ * configure.ac:
+ Invoke IT_WITH_CACERTS_FILE.
+
+2015-06-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2540: Specify a cacerts file for the OpenJDK
+ build as we do for OpenJDK 8
+ * Makefile.am:
+ (JDK_CACERTS_FILE): Added to specify the location
+ of cacerts within the bootstrap JDK.
+ (CACERTS_FILE): Find the regular cacerts file,
+ dereferencing any symlinks which point to it.
+ * configure.ac:
+ Call IT_FIND_TOOL to locate the readlink tool,
+ which is part of coreutils.
+
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2539: Libraries in some subdirectories of
+ jre/lib/{arch} are not installed
+ * Makefile.am:
+ (install-exec-local): Loop over jre/lib/$(INSTALL_ARCH_DIR)
+ and all subdirectories to ensure all libraries are
+ installed.
+ * NEWS: Updated.
+
+2015-07-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2537: Desktop files do not allow installation from
+ multiple versions of IcedTea
+ * jconsole.desktop: Moved to jconsole.desktop.in.
+ * policytool.desktop: Moved to policytool.desktop.in.
+ * Makefile.am:
+ (ICEDTEA_ENV): Use @JAVA_VER@ in JRE_RELEASE_VERSION,
+ rather than hardcoding version.
+ (DESKTOP_FILES): Add Java version to filenames.
+ (EXTRA_DIST): Remove $(DESKTOP_FILES) as they are
+ now handled by autoconf and generated versions shouldn't
+ be packaged.
+ (all-local): Depend on $(DESKTOP_FILES) being created.
+ (clean-local): Add clean-policytool- at JAVA_VER@.desktop
+ and clean-jconsole- at JAVA_VER@.desktop
+ (.PHONY): Likewise.
+ (policytool- at JAVA_VER@.desktop): Generate desktop file
+ by replacing _BINDIR_ with actual make variable $(bindir).
+ (clean-policytool- at JAVA_VER@.desktop): Remove generated file.
+ (jconsole- at JAVA_VER@.desktop): Generate desktop file
+ by replacing _BINDIR_ with actual make variable $(bindir).
+ (clean-jconsole- at JAVA_VER@.desktop): Remove generated file.
+ (install-data-local): Replace hard-coded "1.7.0" with @JAVA_VER at .
+ Copy desktop files from build directory.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_DETERMINE_VERSION): Set JAVA_VER to 1.7.0 and include in
+ configure output.
+ * configure.ac:
+ Generate jconsole.desktop and policytool.desktop.
+ Drop AC_PREFIX_DEFAULT invocation, reverting to
+ /usr/local as default installation directory.
+ * jconsole.desktop.in: Moved from jconsole.desktop so
+ that @JAVA_VER@ can be replaced by configure and
+ _BINDIR_ by the build.
+ * policytool.desktop.in: Likewise for policytool.desktop.
+
+2015-07-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * NEWS: Set 2.6.0 release date.
+
+2015-07-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ (JDK_CHANGESET): Update to icedtea-2.6.0.
+ (JDK_SHA256SUM): Likewise.
+ * configure.ac: Bump to 2.6.0
+
2015-07-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2359: Ensure all stamp targets have aliases
diff -r 55507c3956c9 -r cff3873b35b5 INSTALL
--- a/INSTALL Wed Jul 15 23:47:41 2015 +0100
+++ b/INSTALL Fri Jul 17 00:06:58 2015 +0100
@@ -207,6 +207,8 @@
* --disable-downloading: Don't download tarballs if not available; fail instead.
* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
* --disable-hotspot-test-in-build: Turn off the Queens test. Always turned off for bootstrapping.
+* --with-cacerts-file: Specify the location of a cacerts file, defaulting to
+ ${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
diff -r 55507c3956c9 -r cff3873b35b5 Makefile.am
--- a/Makefile.am Wed Jul 15 23:47:41 2015 +0100
+++ b/Makefile.am Fri Jul 17 00:06:58 2015 +0100
@@ -7,14 +7,14 @@
CORBA_CHANGESET = e3445769412d
JAXP_CHANGESET = e3b08dc13807
JAXWS_CHANGESET = 299588405837
-JDK_CHANGESET = 444d55ffed65
+JDK_CHANGESET = 2db5e90a399b
LANGTOOLS_CHANGESET = bc95d2472055
OPENJDK_CHANGESET = dbfa75121aca
CORBA_SHA256SUM = 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb
JAXP_SHA256SUM = 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07
JAXWS_SHA256SUM = 816a6d7a4bd302871d73f5681f6b35459000d76bfb9fa04b3479ffb630dc39f5
-JDK_SHA256SUM = 34544d1b058158ea57b9fccf1ca7f4c4fcb8dc36bb146371dc87366ccc73e0ef
+JDK_SHA256SUM = 900bba75d68a8d92f58c7b8da1ea141be6d5f01f7cc015f85c2b14573384b62c
LANGTOOLS_SHA256SUM = 63d693b2716302cee97dfb0562710d214cac5e839095235f2b686987cf298661
OPENJDK_SHA256SUM = 20dd3e250ba5ee96546a8a86d5d6c85e6546df97b3a05df7a5a2d99d0e44df6b
@@ -89,6 +89,11 @@
SOURCEPATH_DIRS = $(abs_top_srcdir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
+JDK_CACERTS_FILE = @ALT_CACERTS_FILE@
+
+CACERTS_FILE = \
+ `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
+
# Sources used from OpenJDK.
ICEDTEA_BOOTSTRAP_CLASSES =
@@ -520,7 +525,7 @@
ANT="$(ANT)" \
BUILD_NUMBER="$(BUILD_VERSION)" \
JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
- JRE_RELEASE_VERSION="1.7.0_$(COMBINED_VERSION)" \
+ JRE_RELEASE_VERSION="@JAVA_VER at _$(COMBINED_VERSION)" \
MILESTONE="fcs" \
LANG="C" \
PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
@@ -673,6 +678,11 @@
INFINALITY_SUPPORT="true"
endif
+if USE_ALT_CACERTS_FILE
+ICEDTEA_ENV += \
+ ALT_CACERTS_FILE="${CACERTS_FILE}"
+endif
+
# OpenJDK boot build environment.
ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(CLS_DIR_BOOT):$(RUNTIME)" \
@@ -831,15 +841,14 @@
$(top_srcdir)/test/jtreg/JavaTest.cmdMgrs.lst \
$(top_srcdir)/test/jtreg/excludelist.langtools.jtx
-DESKTOP_FILES = jconsole.desktop policytool.desktop
+DESKTOP_FILES = jconsole- at JAVA_VER@.desktop policytool- at JAVA_VER@.desktop
EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/*.patch \
$(top_srcdir)/patches/boot/*.patch \
$(top_srcdir)/patches/cacao/*.patch \
$(top_srcdir)/patches/jamvm/*.patch \
tools-copy contrib overlays \
- $(JTREG_SRCS) $(DESKTOP_FILES) \
- HACKING autogen.sh \
+ $(JTREG_SRCS) HACKING autogen.sh \
tapset/hotspot.stp.in \
tapset/hotspot_jni.stp.in \
tapset/jstack.stp.in \
@@ -854,7 +863,7 @@
# Top-Level Targets
# =================
-all-local: icedtea-stage2
+all-local: icedtea-stage2 $(DESKTOP_FILES)
check-local: jtregcheck check-tapset
@@ -873,7 +882,8 @@
clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \
clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \
clean-add-systemtap clean-add-systemtap-debug clean-add-nss clean-add-tzdata-support \
- clean-add-tzdata-support-debug clean-cryptocheck
+ clean-add-tzdata-support-debug clean-cryptocheck clean-policytool- at JAVA_VER@.desktop \
+ clean-jconsole- at JAVA_VER@.desktop
if [ -e bootstrap ]; then \
rmdir bootstrap ; \
fi
@@ -911,7 +921,7 @@
clean-download-jaxws clean-download-langtools clean-download-jdk clean-download-openjdk \
clean-extract-corba clean-extract-jaxp clean-extract-jaxws clean-extract-jdk \
clean-extract-langtools clean-split-debuginfo clean-split-debuginfo-debug \
- clean-split-debuginfo-boot
+ clean-split-debuginfo-boot clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop
env:
@echo 'unset JAVA_HOME'
@@ -2844,6 +2854,20 @@
rm -rf $(CRYPTO_CHECK_BUILD_DIR)
rm -f stamps/cryptocheck.stamp
+# File substitution
+
+policytool- at JAVA_VER@.desktop: policytool.desktop
+ cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+
+clean-policytool- at JAVA_VER@.desktop:
+ rm -f policytool- at JAVA_VER@.desktop
+
+jconsole- at JAVA_VER@.desktop: jconsole.desktop
+ cat $< | $(SED) "s#_BINDIR_#$(bindir)#" > $@
+
+clean-jconsole- at JAVA_VER@.desktop:
+ rm -f jconsole- at JAVA_VER@.desktop
+
# Installation Targets
# ====================
@@ -2852,8 +2876,7 @@
${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
- ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
+ ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
${mkinstalldirs} $(DESTDIR)${prefix}/tapset
if SPLIT_DEBUGINFO
@@ -2861,8 +2884,7 @@
${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
- ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
- ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
+ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt}
endif
for files in $(BUILD_SDK_DIR)/bin/*; do \
name=$$(basename $${files}) ; \
@@ -2921,25 +2943,19 @@
else \
$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/jre/lib/jexec $(DESTDIR)${exec_prefix}/jre/lib ; \
fi
- for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*.so; do \
- if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files}; then \
- name=$$(basename $${files}) ; \
- dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \
- $(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${name}; \
- $(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \
- else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \
- fi ; \
- done
- for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
- if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files} ; then \
- name=$$(basename $${files}) ; \
- dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \
- $(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli/$${name}; \
- $(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \
- else \
- $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \
- fi ; \
+ for subdirs in . headless jli xawt ; do \
+ for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}/*.so; do \
+ if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files}; then \
+ name=$$(basename $${files}) ; \
+ dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \
+ $(INSTALL_PROGRAM) $${dir}/$${name}.stripped \
+ $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}/$${name}; \
+ $(INSTALL_PROGRAM) $${dir}/$${name}.debug \
+ $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \
+ else \
+ $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \
+ fi ; \
+ done ; \
done
for vms in client server ; do \
if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
@@ -3017,6 +3033,8 @@
for files in $(BUILD_SDK_DIR)/jre/lib/management/*.template; do \
$(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib/management; \
done
+ $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/cacerts \
+ $(DESTDIR)${prefix}/jre/lib/security
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/java.policy \
$(DESTDIR)${prefix}/jre/lib/security
$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/security/java.security \
@@ -3054,10 +3072,10 @@
for sizes in 16 24 32 48 ; do \
${mkinstalldirs} $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps ; \
${INSTALL_DATA} openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon$${sizes}.png \
- $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java-1.7.0.png ; \
+ $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java- at JAVA_VER@.png ; \
done
for files in $(DESKTOP_FILES) ; do \
- ${INSTALL_DATA} $(srcdir)/$${files} $(DESTDIR)$(datadir)/applications ; \
+ ${INSTALL_DATA} $(builddir)/$${files} $(DESTDIR)$(datadir)/applications ; \
done
touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.system.lock
touch $(DESTDIR)/${prefix}/jre/.systemPrefs/.systemRootModFile
diff -r 55507c3956c9 -r cff3873b35b5 NEWS
--- a/NEWS Wed Jul 15 23:47:41 2015 +0100
+++ b/NEWS Fri Jul 17 00:06:58 2015 +0100
@@ -12,7 +12,7 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.6.0 (2014-XX-XX):
+New in release 2.6.0 (2015-07-15):
* OpenJDK
- S4792059: test/java/io/pathNames/GeneralSolaris.java fails on symbolic links
@@ -334,6 +334,9 @@
- PR2533: Allow greater control of Javadoc installation directory
- PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does
- PR2535: install-data-local needs to check that classes.jsa actually exists
+ - PR2537: Desktop files do not allow installation from multiple versions of IcedTea
+ - PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed
+ - PR2540: Specify a cacerts file for the OpenJDK build as we do for OpenJDK 8
* AArch64 port
- Add copyright to aarch64_ad.m4
- S8069593: Changes to JavaThread::_thread_state must use acquire and release
diff -r 55507c3956c9 -r cff3873b35b5 acinclude.m4
--- a/acinclude.m4 Wed Jul 15 23:47:41 2015 +0100
+++ b/acinclude.m4 Fri Jul 17 00:06:58 2015 +0100
@@ -2850,9 +2850,11 @@
AC_DEFUN_ONCE([IT_DETERMINE_VERSION],
[
AC_MSG_CHECKING([which branch and release of IcedTea is being built])
+ JAVA_VER=1.7.0
ICEDTEA_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's#pre.*##')
ICEDTEA_BRANCH=$(echo ${ICEDTEA_RELEASE}|sed 's|\.[[0-9]]$||')
- AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE}])
+ AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${JAVA_VER}])
+ AC_SUBST([JAVA_VER])
AC_SUBST([ICEDTEA_RELEASE])
AC_SUBST([ICEDTEA_BRANCH])
])
@@ -3319,3 +3321,35 @@
AM_CONDITIONAL(DISABLE_HOTSPOT_CHECKSUM, test x"${ENABLE_HOTSPOT_CHECKSUM}" = "xno")
AC_SUBST(ENABLE_HOTSPOT_CHECKSUM)
])
+
+AC_DEFUN_ONCE([IT_WITH_CACERTS_FILE],
+[
+ CACERTS_DEFAULT=${SYSTEM_JDK_DIR}/jre/lib/security/cacerts
+ AC_MSG_CHECKING([whether to copy a certificate authority certificates (cacerts) file])
+ AC_ARG_WITH([cacerts-file],
+ [AS_HELP_STRING([--with-cacerts-file[[=PATH]]],specify the location of the cacerts file)],
+ [
+ ALT_CACERTS_FILE=${withval}
+ ],
+ [
+ ALT_CACERTS_FILE="yes"
+ ])
+ AC_MSG_RESULT(${ALT_CACERTS_FILE})
+ if test "x${ALT_CACERTS_FILE}" != "xno"; then
+ if test "x${ALT_CACERTS_FILE}" = "xyes"; then
+ AC_MSG_NOTICE([No cacerts file specified; using ${CACERTS_DEFAULT}])
+ ALT_CACERTS_FILE=${CACERTS_DEFAULT} ;
+ fi
+ AC_MSG_CHECKING([if $ALT_CACERTS_FILE is a valid keystore file])
+ if test -f "${ALT_CACERTS_FILE}" && \
+ ${FILE} ${ALT_CACERTS_FILE} | ${GREP} 'Java KeyStore' >&AS_MESSAGE_LOG_FD 2>&1; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([No valid cacerts file found; one won't be passed to the OpenJDK build])
+ ALT_CACERTS_FILE="no"
+ fi
+ fi
+ AM_CONDITIONAL(USE_ALT_CACERTS_FILE, test "x${ALT_CACERTS_FILE}" != "xno")
+ AC_SUBST(ALT_CACERTS_FILE)
+])
diff -r 55507c3956c9 -r cff3873b35b5 configure.ac
--- a/configure.ac Wed Jul 15 23:47:41 2015 +0100
+++ b/configure.ac Fri Jul 17 00:06:58 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.6.0pre24], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.6.0], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -14,11 +14,11 @@
IT_DETERMINE_VERSION
AC_CONFIG_FILES([hotspot.map fsg.sh])
+AC_CONFIG_FILES([jconsole.desktop])
+AC_CONFIG_FILES([policytool.desktop])
AC_CANONICAL_HOST
-AC_PREFIX_DEFAULT([bootstrap])
-
AC_PROG_CC
AC_PROG_CXX
@@ -35,6 +35,7 @@
IT_FIND_TOOL([UNZIP], [unzip])
IT_FIND_TOOL([CPIO], [cpio])
IT_FIND_TOOL([FILE], [file])
+IT_FIND_TOOL([READLINK], [readlink])
IT_FIND_TOOLS([FASTJAR], [fastjar jar])
IT_FIND_TOOLS([SED],[gsed sed])
AC_CHECK_TOOL([LDD], [ldd])
@@ -187,6 +188,7 @@
IT_WITH_VERSION_SUFFIX
IT_ENABLE_HG
IT_WITH_TZDATA_DIR
+IT_WITH_CACERTS_FILE
IT_WITH_PAX
AC_CONFIG_FILES([pax-mark-vm], [chmod +x pax-mark-vm])
diff -r 55507c3956c9 -r cff3873b35b5 jconsole.desktop
--- a/jconsole.desktop Wed Jul 15 23:47:41 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Monitoring & Management Console
-Comment=Monitor and manage OpenJDK applications
-Exec=/usr/bin/jconsole
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-tools-jconsole-JConsole
-Categories=Development;Monitor;Java;
-Version=1.0
diff -r 55507c3956c9 -r cff3873b35b5 jconsole.desktop.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jconsole.desktop.in Fri Jul 17 00:06:58 2015 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+Comment=Monitor and manage OpenJDK applications
+Exec=_BINDIR_/jconsole
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-tools-jconsole-JConsole
+Categories=Development;Monitor;Java;
+Version=1.0
diff -r 55507c3956c9 -r cff3873b35b5 policytool.desktop
--- a/policytool.desktop Wed Jul 15 23:47:41 2015 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=OpenJDK Policy Tool
-Comment=Manage OpenJDK policy files
-Exec=/usr/bin/policytool
-Icon=java
-Terminal=false
-Type=Application
-StartupWMClass=sun-security-tools-PolicyTool
-Categories=Development;Java;
-Version=1.0
diff -r 55507c3956c9 -r cff3873b35b5 policytool.desktop.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/policytool.desktop.in Fri Jul 17 00:06:58 2015 +0100
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=OpenJDK @JAVA_VER@ Policy Tool
+Comment=Manage OpenJDK policy files
+Exec=_BINDIR_/policytool
+Icon=java
+Terminal=false
+Type=Application
+StartupWMClass=sun-security-tools-PolicyTool
+Categories=Development;Java;
+Version=1.0
More information about the distro-pkg-dev
mailing list