/hg/release/icedtea7-2.5: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 17 22:35:03 UTC 2015
changeset de1a34f4a1a0 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=de1a34f4a1a0
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 19:49:37 2015 +0100
PR2390: Make elliptic curve removal optional
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2390: Make elliptic curve removal
optional
* INSTALL:
Document --enable-non-nss-curves.
* Makefile.am:
(ICEDTEA_PATCHES): Only apply
the RH1022017 patch when non-NSS
curves are not enabled.
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_NON_NSS_CURVES): New
macro to allow non-NSS curves to
be turned on.
* configure.ac:
Invoke IT_ENABLE_NON_NSS_CURVES.
* fsg.sh.in:
Don't alter the curve list when
non-NSS curves are enabled.
changeset c931536f194a in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=c931536f194a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 19:59:09 2015 +0100
PR2499: Update remove-intree-libraries.sh script
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2499: Update remove-intree-libraries.sh script
* NEWS: Updated.
* acinclude.m4:
(IT_ENABLE_SUNEC): Rename enable_sunec to
ENABLE_SUNEC and substitute into autoconf
generated files.
* remove-intree-libraries.sh.in:
Update enablement tests following PR1661. Check
that system library code exists first before deleting
and fail if not.
changeset ce634deafc12 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=ce634deafc12
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 20:01:27 2015 +0100
PR2500: Add executable stack markings to callNative.S on JamVM
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2500: Add executable stack markings
to callNative.S on JamVM
* Makefile.am:
(ICEDTEA_PATCHES): Add patch.
(jamvm): Drop setting -noexecstack in
LDFLAGS; replaced by code fix in JamVM.
* NEWS: Updated.
* patches/jamvm/noexecstack.patch:
Add notes to assembly files in order to
turn off executable stack.
changeset 8251173ab7e3 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=8251173ab7e3
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 20:03:15 2015 +0100
PR2507, G541462: Only apply PaX markings by default on running PaX kernels
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2507, G541462: Only apply PaX markings by default
on running PaX kernels
* NEWS: Updated.
* acinclude.m4:
(IT_HAS_PAX): Use grep directly rather
than piping from cat.
(IT_WITH_PAX): Use ${pax_active} as the
default value. Handle --with-pax and
--without-pax options (i.e. without arguments)
better.
changeset 5f20cc5a384a in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=5f20cc5a384a
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Jul 17 21:58:53 2015 +0100
Bump to icedtea-2.5.6pre02.
Upstream changes:
- PR2458: Policy JAR files should be timestamped with the date of the policy file they hold
- PR2482, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
- S8039921, PR2421: SHA1WithDSA with key > 1024 bits not working
- S8065238, PR2478: javax.naming.NamingException after upgrade to JDK 8
- S8074761, PR2470: Empty optional parameters of LDAP query are not interpreted as empty
- S8081315, PR2405: Avoid giflib interlacing workaround with giflib 5.0.0 on
- S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5
2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am,
(CORBA_CHANGESET): Update to icedtea-2.5.6pre02.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
* NEWS: Updated
* configure.ac: Bump to 2.5.6pre02.
* hotspot.map.in: Update to icedtea-2.5.6pre02.
diffstat:
ChangeLog | 79 +++++++++++++++++++++++++++++++++++
INSTALL | 1 +
Makefile.am | 35 +++++++--------
NEWS | 12 +++++
acinclude.m4 | 90 +++++++++++++++++++++++++---------------
configure.ac | 3 +-
fsg.sh.in | 7 +-
hotspot.map.in | 2 +-
patches/jamvm/noexecstack.patch | 48 +++++++++++++++++++++
remove-intree-libraries.sh.in | 36 +++++++++++++--
10 files changed, 248 insertions(+), 65 deletions(-)
diffs (498 lines):
diff -r 95e61307e07c -r 5f20cc5a384a ChangeLog
--- a/ChangeLog Thu Jul 16 00:38:16 2015 +0100
+++ b/ChangeLog Fri Jul 17 21:58:53 2015 +0100
@@ -1,3 +1,82 @@
+2015-07-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am,
+ (CORBA_CHANGESET): Update to icedtea-2.5.6pre02.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+ * NEWS: Updated
+ * configure.ac: Bump to 2.5.6pre02.
+ * hotspot.map.in: Update to icedtea-2.5.6pre02.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2507, G541462: Only apply PaX markings by default
+ on running PaX kernels
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_HAS_PAX): Use grep directly rather
+ than piping from cat.
+ (IT_WITH_PAX): Use ${pax_active} as the
+ default value. Handle --with-pax and
+ --without-pax options (i.e. without arguments)
+ better.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2500: Add executable stack markings
+ to callNative.S on JamVM
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add patch.
+ (jamvm): Drop setting -noexecstack in
+ LDFLAGS; replaced by code fix in JamVM.
+ * NEWS: Updated.
+ * patches/jamvm/noexecstack.patch:
+ Add notes to assembly files in order to
+ turn off executable stack.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2499: Update remove-intree-libraries.sh script
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_SUNEC): Rename enable_sunec to
+ ENABLE_SUNEC and substitute into autoconf
+ generated files.
+ * remove-intree-libraries.sh.in:
+ Update enablement tests following PR1661. Check
+ that system library code exists first before deleting
+ and fail if not.
+
+2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2390: Make elliptic curve removal
+ optional
+ * INSTALL:
+ Document --enable-non-nss-curves.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Only apply
+ the RH1022017 patch when non-NSS
+ curves are not enabled.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_ENABLE_NON_NSS_CURVES): New
+ macro to allow non-NSS curves to
+ be turned on.
+ * configure.ac:
+ Invoke IT_ENABLE_NON_NSS_CURVES.
+ * fsg.sh.in:
+ Don't alter the curve list when
+ non-NSS curves are enabled.
+
2015-07-13 Andrew John Hughes <gnu_andrew at member.fsf.org>
* AUTHORS: Add James.
diff -r 95e61307e07c -r 5f20cc5a384a INSTALL
--- a/INSTALL Thu Jul 16 00:38:16 2015 +0100
+++ b/INSTALL Fri Jul 17 21:58:53 2015 +0100
@@ -194,6 +194,7 @@
* --enable-native-debuginfo: Include debuginfo in native binaries.
* --enable-java-debuginfo: Include debuginfo in Java class files.
* --enable-infinality: Use fontconfig for better font rendering
+* --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521})
Testing
=======
diff -r 95e61307e07c -r 5f20cc5a384a Makefile.am
--- a/Makefile.am Thu Jul 16 00:38:16 2015 +0100
+++ b/Makefile.am Fri Jul 17 21:58:53 2015 +0100
@@ -4,19 +4,19 @@
BUILD_VERSION = b14
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = d4586b6d7058
-JAXP_CHANGESET = 9f1c230ad1c0
-JAXWS_CHANGESET = 7a5610512bad
-JDK_CHANGESET = c9edd4f4aee1
-LANGTOOLS_CHANGESET = 2d42dbec0a46
-OPENJDK_CHANGESET = abd83c9a9b6a
+CORBA_CHANGESET = 85c15dd40753
+JAXP_CHANGESET = 1ec4219703e9
+JAXWS_CHANGESET = 9ccf5a20c8c3
+JDK_CHANGESET = cb913465f11d
+LANGTOOLS_CHANGESET = 786c463e408a
+OPENJDK_CHANGESET = 0aa744125281
-CORBA_SHA256SUM = 36ba60f4e079acf3e1b5730d2f6d677c80f54aa1bf17d4ed572cf12bf2b44266
-JAXP_SHA256SUM = 9f8aa3b6038574909c601df025cb0c539e3eea3edc3cc95baea671d8f6065070
-JAXWS_SHA256SUM = eff217999552bc888ff8c6591dae097b8b3d04691d0ffddba31b6285436feefd
-JDK_SHA256SUM = 588b9a76818b7d5f023a4c170bd9455fb401320046ced6ff6472e9d2b8a4664f
-LANGTOOLS_SHA256SUM = c33d1d8bc25659059efde036e4d2255e3a837dc4d7d89616843c648cadba7b3f
-OPENJDK_SHA256SUM = 0c07d3c11345d56d49c260e442345acf438d6452fae172e40a9794179abadbaf
+CORBA_SHA256SUM = f629f9c2dfb476ebc254ce719fff710949a53b9a0314ecfc66f2244c4daef463
+JAXP_SHA256SUM = 460596c598071e7f3dc5f73f0eab2d8cd334d3f76120be1786c07286bb8f9733
+JAXWS_SHA256SUM = 01c645b31bf64e1f5d2430f3eb24098935550f0f929049e5b3035e37bdb81212
+JDK_SHA256SUM = 75fa5cc197c19b5757d4271966c6138c032b7b27204d98a52557e5c96b2709b3
+LANGTOOLS_SHA256SUM = d006a5dbda6461e6816f238de99f5f4c5b08d966f7ecaac6cf550ad2d9fdec41
+OPENJDK_SHA256SUM = a146f8ddc8ac0d899b3ad00a3a9999f85ed69a2cb67c02daef0f0be2b80f0ee7
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -281,19 +281,17 @@
if BUILD_JAMVM
ICEDTEA_PATCHES += \
- patches/jamvm/pr2050-find_class_from_caller.patch
+ patches/jamvm/pr2050-find_class_from_caller.patch \
+ patches/jamvm/noexecstack.patch
endif
if ENABLE_NSS
-ICEDTEA_PATCHES += patches/nss-config.patch \
- patches/rh1022017.patch
+ICEDTEA_PATCHES += patches/nss-config.patch
endif
-if ENABLE_SUNEC
-if !ENABLE_NSS
+if !USE_NON_NSS_CURVES
ICEDTEA_PATCHES += patches/rh1022017.patch
endif
-endif
ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -2140,7 +2138,6 @@
stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
if BUILD_JAMVM
cd jamvm/jamvm && \
- LDFLAGS="-Xlinker -z -Xlinker noexecstack" \
./autogen.sh --with-java-runtime-library=openjdk7 \
--prefix=$(abs_top_builddir)/jamvm/install ; \
$(MAKE) ; \
diff -r 95e61307e07c -r 5f20cc5a384a NEWS
--- a/NEWS Thu Jul 16 00:38:16 2015 +0100
+++ b/NEWS Fri Jul 17 21:58:53 2015 +0100
@@ -19,19 +19,31 @@
- S6991580, PR2308: IPv6 Nameservers in resolv.conf throws NumberFormatException
- S8021120, PR2301: TieredCompilation can be enabled even if TIERED is undefined
- S8029607, PR2418: Type of Service (TOS) cannot be set in IPv6 header
+ - S8039921, PR2421: SHA1WithDSA with key > 1024 bits not working
- S8043129, PR2338: JAF initialisation in SAAJ clashing with the one in javax.mail
- S8048212, PR2418: Two tests failed with "java.net.SocketException: Bad protocol option" on Windows after 8029607
- S8048214, PR2357: Linker error when compiling G1SATBCardTableModRefBS after include order changes
+ - S8065238, PR2478: javax.naming.NamingException after upgrade to JDK 8
- S8072385, PR2387: Only the first DNSName entry is checked for endpoint identification
+ - S8074761, PR2470: Empty optional parameters of LDAP query are not interpreted as empty
- S8078654, PR2333: CloseTTFontFileFunc callback should be removed
- S8078666, PR2326: JVM fastdebug build compiled with GCC 5 asserts with "widen increases"
+ - S8081315, PR2405: Avoid giflib interlacing workaround with giflib 5.0.0 on
+ - S8081475, PR2494: SystemTap does not work when JDK is compiled with GCC 5
* Bug fixes
- PR2328: GCJ uses ppc64el named libarch directory on ppc64le
- PR2341: Update README & INSTALL files
- PR2367: 7 no longer builds with 6 - Util is not public in sun.management
+ - PR2390: Make elliptic curve removal optional
- PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
+ - PR2458: Policy JAR files should be timestamped with the date of the policy file they hold
+ - PR2482, RH489586, RH1236619: OpenJDK can't handle spaces in zone names in /etc/sysconfig/clock
+ - PR2499: Update remove-intree-libraries.sh script
+ - PR2507, G541462: Only apply PaX markings by default on running PaX kernels
* CACAO
- PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO
+* JamVM
+ - PR2500: Add executable stack markings to callNative.S on JamVM
* PPC & AIX port
- S8069590: AIX port of "8050807: Better performing performance data handling"
- S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError
diff -r 95e61307e07c -r 5f20cc5a384a acinclude.m4
--- a/acinclude.m4 Thu Jul 16 00:38:16 2015 +0100
+++ b/acinclude.m4 Fri Jul 17 21:58:53 2015 +0100
@@ -2337,7 +2337,7 @@
AC_DEFUN_ONCE([IT_HAS_PAX],
[
AC_MSG_CHECKING([if a PaX kernel is in use])
- if cat /proc/self/status | grep '^PaX' >&AS_MESSAGE_LOG_FD 2>&1; then
+ if grep '^PaX' /proc/self/status >&AS_MESSAGE_LOG_FD 2>&1; then
pax_active=yes;
else
pax_active=no;
@@ -2354,41 +2354,44 @@
AC_ARG_WITH([pax],
[AS_HELP_STRING(--with-pax=COMMAND,the command used for pax marking)],
[
- if test "x${withval}" = "xyes"; then
- PAX_COMMAND=no
- else
- PAX_COMMAND="${withval}"
- fi
+ PAX_COMMAND="${withval}"
],
[
- PAX_COMMAND=no
+ PAX_COMMAND=${pax_active}
])
- AC_MSG_RESULT(${PAX_COMMAND})
- if test "x${PAX_COMMAND}" == "xno"; then
+ if test "x${PAX_COMMAND}" == "xyes"; then
+ AC_MSG_RESULT([no])
PAX_COMMAND=${PAX_DEFAULT}
+ AC_MSG_NOTICE([PaX enabled but no tool specified; using ${PAX_DEFAULT}])
+ else
+ AC_MSG_RESULT(${PAX_COMMAND})
fi
- AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
- if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
- AC_MSG_RESULT([yes])
+ if test "x${PAX_COMMAND}" != "xno"; then
+ AC_MSG_CHECKING([if $PAX_COMMAND is a valid executable file])
+ if test -x "${PAX_COMMAND}" && test -f "${PAX_COMMAND}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PAX_COMMAND=""
+ AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "chpax")
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ AC_PATH_PROG(PAX_COMMAND, "paxctl")
+ fi
+ fi
else
- AC_MSG_RESULT([no])
PAX_COMMAND=""
- AC_PATH_PROG(PAX_COMMAND, "paxmark.sh")
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "paxctl-ng")
- fi
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "chpax")
- fi
- if test -z "${PAX_COMMAND}"; then
- AC_PATH_PROG(PAX_COMMAND, "paxctl")
- fi
- if test -z "${PAX_COMMAND}"; then
- if test "x${pax_active}" = "xyes"; then
- AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
- else
- AC_MSG_WARN("No PaX utility found.")
- fi
+ fi
+ if test -z "${PAX_COMMAND}"; then
+ if test "x${pax_active}" = "xyes"; then
+ AC_MSG_ERROR("No PaX utility found and running on a PaX kernel.")
+ else
+ AC_MSG_WARN("No PaX utility found.")
fi
fi
if test -n "${PAX_COMMAND}"; then
@@ -2688,19 +2691,18 @@
[
case "${enableval}" in
yes)
- enable_sunec=yes
+ ENABLE_SUNEC=yes
;;
*)
- enable_sunec=no
+ ENABLE_SUNEC=no
;;
esac
],
[
- enable_sunec=no
+ ENABLE_SUNEC=no
])
- AC_MSG_RESULT([$enable_sunec])
- AM_CONDITIONAL([ENABLE_SUNEC], test x"${enable_sunec}" = "xyes")
- if test x"${enable_sunec}" = "xyes"; then
+ AC_MSG_RESULT([$ENABLE_SUNEC])
+ if test x"${ENABLE_SUNEC}" = "xyes"; then
PKG_CHECK_MODULES(NSS_SOFTOKN, nss-softokn >= 3.16.1, [NSS_SOFTOKN_FOUND=yes], [NSS_SOFTOKN_FOUND=no])
PKG_CHECK_MODULES(NSS_JAVA, nss-java, [NSS_JAVA_FOUND=yes], [NSS_JAVA_FOUND=no])
if test "x${NSS_SOFTOKN_FOUND}" = "xyes"; then
@@ -2715,6 +2717,8 @@
AC_SUBST(SUNEC_CFLAGS)
AC_SUBST(SUNEC_LIBS)
fi
+ AM_CONDITIONAL([ENABLE_SUNEC], test x"${ENABLE_SUNEC}" = "xyes")
+ AC_SUBST(ENABLE_SUNEC)
])
AC_DEFUN_ONCE([IT_CHECK_TOOLS_JAR_EXISTS],
@@ -2957,3 +2961,19 @@
AM_CONDITIONAL([JAVAC_LACKS_UNDERSCORED_LITERALS], test x"${it_cv_underscore}" = "xyes")
AC_PROVIDE([$0])dnl
])
+
+AC_DEFUN_ONCE([IT_ENABLE_NON_NSS_CURVES],
+[
+ AC_MSG_CHECKING([whether to enable elliptic curves beyond those supported by NSS])
+ AC_ARG_ENABLE([non-nss-curves],
+ [AS_HELP_STRING(--enable-non-nss-curves,register curves beyond the 3 NSS defines [[default=no]])],
+ [
+ ENABLE_NON_NSS_CURVES="${enableval}"
+ ],
+ [
+ ENABLE_NON_NSS_CURVES="no"
+ ])
+ AC_MSG_RESULT(${ENABLE_NON_NSS_CURVES})
+ AM_CONDITIONAL(USE_NON_NSS_CURVES, test x"${ENABLE_NON_NSS_CURVES}" = "xyes")
+ AC_SUBST(ENABLE_NON_NSS_CURVES)
+])
diff -r 95e61307e07c -r 5f20cc5a384a configure.ac
--- a/configure.ac Thu Jul 16 00:38:16 2015 +0100
+++ b/configure.ac Fri Jul 17 21:58:53 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.6pre01], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5.6pre02], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -185,6 +185,7 @@
IT_ENABLE_JAR_COMPRESSION
IT_CHECK_ADDITIONAL_VMS
IT_ENABLE_ARM32JIT
+IT_ENABLE_NON_NSS_CURVES
IT_WITH_VERSION_SUFFIX
IT_ENABLE_HG
diff -r 95e61307e07c -r 5f20cc5a384a fsg.sh.in
--- a/fsg.sh.in Thu Jul 16 00:38:16 2015 +0100
+++ b/fsg.sh.in Fri Jul 17 21:58:53 2015 +0100
@@ -108,6 +108,7 @@
echo "Removing EC source code we don't build"
rm -rvf openjdk/jdk/src/share/native/sun/security/ec/impl
-echo "Syncing EC list with NSS"
-patch -Np0 < @abs_top_srcdir@/patches/pr2124.patch
-
+if test "x at ENABLE_NON_NSS_CURVES@" = "xno"; then
+ echo "Syncing EC list with NSS"
+ patch -Np0 < @abs_top_srcdir@/patches/pr2124.patch
+fi
diff -r 95e61307e07c -r 5f20cc5a384a hotspot.map.in
--- a/hotspot.map.in Thu Jul 16 00:38:16 2015 +0100
+++ b/hotspot.map.in Fri Jul 17 21:58:53 2015 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 9b1de9bff274 27bcbf916cc7650807d22fa6ab759f81c6469682d9b868909b0481eccbc79b64
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ a694d681dba7 0d2aa5f164b9e95e0abda29c21d540c421d363c2c54f48fec4d0272b98258639
aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1939c010fd37 ac35bd6620553478700aaf8c825e373a7329d66473899f7184eb5a317f3db97f
diff -r 95e61307e07c -r 5f20cc5a384a patches/jamvm/noexecstack.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jamvm/noexecstack.patch Fri Jul 17 21:58:53 2015 +0100
@@ -0,0 +1,48 @@
+diff --git a/src/os/linux/arm/callNative.S jamvm/jamvm/src/os/linux/arm/callNative.S
+index 245afd1..1583023 100644
+--- jamvm.orig/jamvm/src/os/linux/arm/callNative.S
++++ jamvm/jamvm/src/os/linux/arm/callNative.S
+@@ -36,3 +36,7 @@
+ #include "callNativeOABI.S"
+ #endif
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/mips/callNative.S jamvm/jamvm/src/os/linux/mips/callNative.S
+index cede343..90d9163 100644
+--- jamvm.orig/jamvm/src/os/linux/mips/callNative.S
++++ jamvm/jamvm/src/os/linux/mips/callNative.S
+@@ -184,3 +184,7 @@ return:
+ j $31
+ .end callJNIMethod
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S jamvm/jamvm/src/os/linux/powerpc/callNative.S
+index aa47f6a..763dc0a 100644
+--- jamvm.orig/jamvm/src/os/linux/powerpc/callNative.S
++++ jamvm/jamvm/src/os/linux/powerpc/callNative.S
+@@ -281,3 +281,7 @@ return:
+ mr 1,11
+ blr
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff --git jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S jamvm/jamvm/src/os/linux/x86_64/callNative.S
+index 26404e6..9fb5cdf 100644
+--- jamvm.orig/jamvm/src/os/linux/x86_64/callNative.S
++++ jamvm/jamvm/src/os/linux/x86_64/callNative.S
+@@ -267,3 +267,7 @@ float_ret:
+ addq $8, %rcx
+ jmp return
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff -r 95e61307e07c -r 5f20cc5a384a remove-intree-libraries.sh.in
--- a/remove-intree-libraries.sh.in Thu Jul 16 00:38:16 2015 +0100
+++ b/remove-intree-libraries.sh.in Fri Jul 17 21:58:53 2015 +0100
@@ -8,27 +8,47 @@
LCMS_SRC=openjdk/jdk/src/share/native/sun/java2d/cmm/lcms
PCSC_SRC=openjdk/jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-if test "x at ENABLE_SYSTEM_ZLIB@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_ZLIB@" = "xtrue"; then
+ if [ ! -d ${ZIP_SRC} ]; then
+ echo "${ZIP_SRC} does not exist. Refusing to proceed."
+ exit -1;
+ fi
echo "Removing zlib"
rm -rvf ${ZIP_SRC}
fi
-if test "x at ENABLE_SYSTEM_JPEG@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_JPEG@" = "xtrue"; then
+ if [ ! -d ${JPEG_SRC} ]; then
+ echo "${JPEG_SRC} does not exist. Refusing to proceed."
+ exit -2;
+ fi
echo "Removing libjpeg"
rm -rvf ${JPEG_SRC}
fi
-if test "x at ENABLE_SYSTEM_GIF@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_GIF@" = "xtrue"; then
+ if [ ! -d ${GIF_SRC} ]; then
+ echo "${GIF_SRC} does not exist. Refusing to proceed."
+ exit -3;
+ fi
echo "Removing giflib"
rm -rvf ${GIF_SRC}
fi
-if test "x at ENABLE_SYSTEM_PNG@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_PNG@" = "xtrue"; then
+ if [ ! -d ${PNG_SRC} ]; then
+ echo "${PNG_SRC} does not exist. Refusing to proceed."
+ exit -4;
+ fi
echo "Removing libpng"
rm -rvf ${PNG_SRC}
fi
-if test "x at ENABLE_SYSTEM_LCMS@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_LCMS@" = "xtrue"; then
+ if [ ! -f ${LCMS_SRC}/cmscam02.c ]; then
+ echo "${LCMS_SRC}/cmscam02.c does not exist. Refusing to proceed."
+ exit -5;
+ fi
echo "Removing lcms"
rm -vf ${LCMS_SRC}/cmscam02.c
rm -vf ${LCMS_SRC}/cmscgats.c
@@ -59,7 +79,11 @@
rm -vf ${LCMS_SRC}/lcms2_plugin.h
fi
-if test "x at ENABLE_SYSTEM_PCSC@" = "xyes"; then
+if test "x at ENABLE_SYSTEM_PCSC@" = "xtrue"; then
+ if [ ! -d ${PCSC_SRC} ]; then
+ echo "${PCSC_SRC} does not exist. Refusing to proceed."
+ exit -6;
+ fi
echo "Removing libpcsc headers"
rm -rvf ${PCSC_SRC}
fi
More information about the distro-pkg-dev
mailing list