/hg/release/icedtea7-2.6: 3 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sun Dec 30 08:43:14 UTC 2018


changeset 37dfd50c0b6c in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=37dfd50c0b6c
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Dec 30 06:39:01 2018 +0000

	PR3657: Sync desktop files with Fedora/RHEL versions again

	2018-09-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3657: Sync desktop files with Fedora/RHEL
		versions again
		* Makefile.am:
		(JDK_UPDATE_VERSION): Moved to acinclude.m4.
		(BUILD_VERSION): Likewise.
		(COMBINED_VERSION): Likewise.
		(ICEDTEA_ENV): Use substitution for
		JRE_RELEASE_VERSION, JDK_UPDATE_VERSION
		and BUILD_VERSION.
		(dist-openjdk): Use substitution for
		COMBINED_VERSION.
		(dist-openjdk-fsg): Likewise.
		(dist-openjdk-fsg-xz): Likewise.
		(install-data-local): Include JAVA_VENDOR
		in icon name.
		* NEWS: Updated.
		* acinclude.m4:
		(IT_DETERMINE_VERSION): Define JAVA_VENDOR,
		JDK_UPDATE_VERSION, BUILD_VERSION, COMBINED_VERSION
		and OPENJDK_VER here. Include OPENJDK_VER in output.
		* jconsole.desktop.in:
		Add full version and target architecture to name
		to distinguish between multiple installations for the
		same major Java version.  Add JAVA_VENDOR ('openjdk')
		to the icon name.
		* policytool.desktop.in: Likewise.

	2013-12-26  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR3657: Sync desktop files with Fedora/RHEL
		versions again
		* configure.ac:
		Add AC_CANONICAL_TARGET after AC_CANONICAL_HOST
		and move earlier in file, before Automake
		initialisation.


changeset 921453c54e82 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=921453c54e82
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Dec 30 06:45:50 2018 +0000

	PR3633: arc_priority representation creates an implicit limit on character sequence within regexp

	2018-11-20  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3633: arc_priority representation creates an
		implicit limit on character sequence within regexp
		* NEWS: Updated.

	2018-09-12  Severin Gehwolf  <sgehwolf at redhat.com>

		PR3633: arc_priority representation creates an
		implicit limit on character sequence within regexp
		* tapset/jstack.stp.in: Workaround limit on regexp
		length with SystemTap >= 3.2.


changeset 4d6159cbb6bd in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=4d6159cbb6bd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Dec 30 08:20:24 2018 +0000

	PR3631: Use ${datadir} when specifying default tz.properties location

	2018-09-24  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3631: Use ${datadir} when specifying default
		tz.properties location
		* Makefile.am:
		(EXTRA_DIST): Remove stp.in files which are already
		handled by configure. Add tz.properties.in which no
		longer is.
		(clean-local): Add clean-tz.properties.
		(.PHONY): Likewise.
		(add-tzdata-support): Depend on tz.properties.
		(add-tzdata-support-debug): Likewise.
		(add-tzdata-support-boot): Likewise.
		(tz.properties): Generate tz.properties from
		tz.properties.in by substituting the value of
		TZDATA_DIR determined by configure.
		(clean-tz.properties): Remove generated
		tz.properties.
		* NEWS: Updated.
		* acinclude.m4:
		(IT_WITH_TZDATA_DIR): Use ${datadir}/javazi
		as default. Sync macro with improvements in
		similiar IT_WITH_TAPSET_DIR.
		* tz.properties.in: Use _TZDATA_DIR_ instead
		of @TZDATA_DIR@ to distinguish it from
		configure-based substitution.


diffstat:

 ChangeLog             |  78 +++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am           |  39 ++++++++++++-------------
 NEWS                  |   7 +++-
 acinclude.m4          |  40 +++++++++++++++-----------
 configure.ac          |   4 +-
 jconsole.desktop.in   |   4 +-
 policytool.desktop.in |   4 +-
 tapset/jstack.stp.in  |   3 +-
 tz.properties.in      |   2 +-
 9 files changed, 134 insertions(+), 47 deletions(-)

diffs (379 lines):

diff -r d3a9b945a1d1 -r 4d6159cbb6bd ChangeLog
--- a/ChangeLog	Sat Dec 29 06:06:32 2018 +0000
+++ b/ChangeLog	Sun Dec 30 08:20:24 2018 +0000
@@ -1,3 +1,81 @@
+2018-09-24  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3631: Use ${datadir} when specifying default
+	tz.properties location
+	* Makefile.am:
+	(EXTRA_DIST): Remove stp.in files which are already
+	handled by configure. Add tz.properties.in which no
+	longer is.
+	(clean-local): Add clean-tz.properties.
+	(.PHONY): Likewise.
+	(add-tzdata-support): Depend on tz.properties.
+	(add-tzdata-support-debug): Likewise.
+	(add-tzdata-support-boot): Likewise.
+	(tz.properties): Generate tz.properties from
+	tz.properties.in by substituting the value of
+	TZDATA_DIR determined by configure.
+	(clean-tz.properties): Remove generated
+	tz.properties.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_WITH_TZDATA_DIR): Use ${datadir}/javazi
+	as default. Sync macro with improvements in
+	similiar IT_WITH_TAPSET_DIR.
+	* tz.properties.in: Use _TZDATA_DIR_ instead
+	of @TZDATA_DIR@ to distinguish it from
+	configure-based substitution.
+
+2018-11-20  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3633: arc_priority representation creates an
+	implicit limit on character sequence within regexp
+	* NEWS: Updated.
+
+2018-09-12  Severin Gehwolf  <sgehwolf at redhat.com>
+
+	PR3633: arc_priority representation creates an
+	implicit limit on character sequence within regexp
+	* tapset/jstack.stp.in: Workaround limit on regexp
+	length with SystemTap >= 3.2.
+
+2018-09-13  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3657: Sync desktop files with Fedora/RHEL
+	versions again
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Moved to acinclude.m4.
+	(BUILD_VERSION): Likewise.
+	(COMBINED_VERSION): Likewise.
+	(ICEDTEA_ENV): Use substitution for
+	JRE_RELEASE_VERSION, JDK_UPDATE_VERSION
+	and BUILD_VERSION.
+	(dist-openjdk): Use substitution for
+	COMBINED_VERSION.
+	(dist-openjdk-fsg): Likewise.
+	(dist-openjdk-fsg-xz): Likewise.
+	(install-data-local): Include JAVA_VENDOR
+	in icon name.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_DETERMINE_VERSION): Define JAVA_VENDOR,
+	JDK_UPDATE_VERSION, BUILD_VERSION, COMBINED_VERSION
+	and OPENJDK_VER here. Include OPENJDK_VER in output.
+	* jconsole.desktop.in:
+	Add full version and target architecture to name
+	to distinguish between multiple installations for the
+	same major Java version.  Add JAVA_VENDOR ('openjdk')
+	to the icon name.
+	* policytool.desktop.in: Likewise.
+
+2013-12-26  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR3657: Sync desktop files with Fedora/RHEL
+	versions again
+	* configure.ac:
+	Add AC_CANONICAL_TARGET after AC_CANONICAL_HOST
+	and move earlier in file, before Automake
+	initialisation.
+
 2018-12-28  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	Bump to 2.6.15.
diff -r d3a9b945a1d1 -r 4d6159cbb6bd Makefile.am
--- a/Makefile.am	Sat Dec 29 06:06:32 2018 +0000
+++ b/Makefile.am	Sun Dec 30 08:20:24 2018 +0000
@@ -1,9 +1,5 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 191
-BUILD_VERSION = b02
-COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-
 CORBA_CHANGESET = 9b8ff44cf2c6
 JAXP_CHANGESET = 5dc90bd920db
 JAXWS_CHANGESET = a88988c07020
@@ -591,9 +587,9 @@
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
 	ANT="$(ANT)" \
-        BUILD_NUMBER="$(BUILD_VERSION)" \
-	JDK_UPDATE_VERSION="$(JDK_UPDATE_VERSION)" \
-        JRE_RELEASE_VERSION="@JAVA_VER at _$(COMBINED_VERSION)" \
+        BUILD_NUMBER="@BUILD_VERSION@" \
+	JDK_UPDATE_VERSION="@JDK_UPDATE_VERSION@" \
+        JRE_RELEASE_VERSION="@JAVA_VER at _@COMBINED_VERSION@" \
 	MILESTONE="fcs" \
 	LANG="C" \
 	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
@@ -921,10 +917,7 @@
 	$(top_srcdir)/patches/jamvm/*.patch \
 	tools-copy contrib overlays \
 	$(JTREG_SRCS) HACKING autogen.sh \
-	tapset/hotspot.stp.in \
-	tapset/hotspot_jni.stp.in \
-	tapset/jstack.stp.in \
-	tapset/hotspot_gc.stp.in \
+	tz.properties.in \
 	scripts/jni_create_stap.c \
 	scripts/jni_desc \
 	agpl-3.0.txt \
@@ -960,7 +953,7 @@
  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-policytool- at JAVA_VER@.desktop \
- clean-jconsole- at JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck
+ clean-jconsole- at JAVA_VER@.desktop clean-ecccheck clean-mimetypecheck clean-tz.properties
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -1000,7 +993,7 @@
 	clean-extract-langtools clean-split-debuginfo clean-split-debuginfo-debug \
 	clean-split-debuginfo-boot clean-policytool- at JAVA_VER@.desktop clean-jconsole- at JAVA_VER@.desktop \
 	clean-fonts clean-add-mime-types-file clean-add-mime-types-file-debug clean-add-mime-types-file-boot \
-	clean-tests clean-tapset-report clean-ecccheck clean-check-ecc \
+	clean-tests clean-tapset-report clean-ecccheck clean-check-ecc clean-tz.properties \
 	check-jdk check-hotspot check-langtools jtregcheck check-tapset check-tapset-probes \
 	check-tapset-jstack clean-check-java-debug
 
@@ -1019,15 +1012,15 @@
 # Creates archive of openjdk.
 dist-openjdk: stamps/extract-cacao.stamp
 	find openjdk/ -name \\.hg* | xargs rm -rf	
-	$(ZIP) -r openjdk-$(COMBINED_VERSION) openjdk/
+	$(ZIP) -r openjdk- at COMBINED_VERSION@ openjdk/
 
 # Creates archive of openjdk that is compliant with Free Software guidelines.
 dist-openjdk-fsg: stamps/patch-fsg.stamp
-	$(ZIP) -r openjdk-fsg-$(COMBINED_VERSION) openjdk/
+	$(ZIP) -r openjdk-fsg- at COMBINED_VERSION@ openjdk/
 
 dist-openjdk-fsg-xz: stamps/patch-fsg.stamp
 	tardir=openjdk/ && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c \
-	  >openjdk-fsg-$(COMBINED_VERSION).tar.xz
+	  >openjdk-fsg- at COMBINED_VERSION@.tar.xz
 
 # OpenJDK Source Preparation Targets
 # ==================================
@@ -2108,7 +2101,7 @@
 	rm -f openjdk/jdk/src/share/lib/security/nss.cfg
 	rm -f stamps/add-nss.stamp
 
-stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
+stamps/add-tzdata-support.stamp: stamps/icedtea.stamp tz.properties
 if WITH_TZDATA_DIR
 	if [ -e $(BUILD_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
@@ -2256,7 +2249,7 @@
 	rm -rf $(BUILD_DEBUG_SDK_DIR)/tapset
 	rm -f stamps/add-systemtap-debug.stamp
 
-stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
+stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp tz.properties
 if WITH_TZDATA_DIR
 	if [ -e $(BUILD_DEBUG_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
@@ -2414,7 +2407,7 @@
 	rm -rf $(BUILD_BOOT_SDK_DIR)/tapset
 	rm -f stamps/add-systemtap-boot.stamp
 
-stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp
+stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp tz.properties
 if WITH_TZDATA_DIR
 	if [ -e $(BUILD_BOOT_SDK_DIR)/jre/lib ] ; then \
 	  cp -v $(abs_top_builddir)/tz.properties \
@@ -3117,6 +3110,12 @@
 clean-jconsole- at JAVA_VER@.desktop:
 	rm -f jconsole- at JAVA_VER@.desktop
 
+tz.properties: $(top_srcdir)/tz.properties.in
+	cat $< | $(SED) "s#_TZDATA_DIR_#$(TZDATA_DIR)#" > $@
+
+clean-tz.properties:
+	rm -f tz.properties
+
 # ECC Availability Check
 
 stamps/ecccheck.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
@@ -3373,7 +3372,7 @@
 	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- at JAVA_VER@.png ; \
+	    $(DESTDIR)$(datadir)/icons/hicolor/$${sizes}x$${sizes}/apps/java- at JAVA_VER@- at JAVA_VENDOR@.png ; \
 	done
 	for files in $(DESKTOP_FILES) ; do \
 	  ${INSTALL_DATA} $(builddir)/$${files} $(DESTDIR)$(datadir)/applications ; \
diff -r d3a9b945a1d1 -r 4d6159cbb6bd NEWS
--- a/NEWS	Sat Dec 29 06:06:32 2018 +0000
+++ b/NEWS	Sun Dec 30 08:20:24 2018 +0000
@@ -23,6 +23,8 @@
   - S8200666, CVE-2018-2973: Improve LDAP support
   - PR3608, CVE-2018-3639 hw: cpu: speculative store bypass mitigation
 * New features
+  - PR3629: Install symlinks to tapsets in SystemTap directory
+  - PR3657: Sync desktop files with Fedora/RHEL versions again
   - PR3659: Support RHEL multilib installations which use the /usr/lib/jvm/java-1.x.0-openjdk.${arch} naming
 * Import of OpenJDK 7 u191 build 2
   - S8005661: [parfait] Possible buffer overrun in jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
@@ -55,8 +57,11 @@
   - S8075942, PR3605: ArrayIndexOutOfBoundsException in sun.java2d.pisces.Dasher.goTo
 * Bug fixes
   - PR3616: Don't include timestamps in generated documentation
+  - PR3631: Use ${datadir} when specifying default tz.properties location
   - PR3652: Detect whether -Xprefer:source and -J-Xmx<limit> can be used, rather than assuming
   - PR3663: IcedTea installing symlinks to SystemTap directory rather than individual tapsets
+* SystemTap
+  - PR3633: arc_priority representation creates an implicit limit on character sequence within regexp
 * AArch64 port
   - S8207345, PR3614: Trampoline generation code reads from uninitialized memory
   - PR3615: Fix whitespace in hotspot/src/cpu/aarch64
@@ -2072,8 +2077,6 @@
 
 New in release 2.5.2 (2014-08-29):
 
-* New features
-  - PR3629: Install symlinks to tapsets in SystemTap directory
 * Backports
   - S8049480: Current versions of Java can't verify jars signed and timestamped with Java 9
   - S8051012, LP1360392: Regression in verifier for <init> method call from inside of a branch
diff -r d3a9b945a1d1 -r 4d6159cbb6bd acinclude.m4
--- a/acinclude.m4	Sat Dec 29 06:06:32 2018 +0000
+++ b/acinclude.m4	Sun Dec 30 08:20:24 2018 +0000
@@ -1489,33 +1489,29 @@
 
 AC_DEFUN([IT_WITH_TZDATA_DIR],
 [
-  DEFAULT="/usr/share/javazi"
+  TZDATA_DEFAULT="${datadir}/javazi"
   AC_MSG_CHECKING([which Java timezone data directory to use])
   AC_ARG_WITH([tzdata-dir],
-	      [AS_HELP_STRING([--with-tzdata-dir[[=DIR]]],set the Java timezone data directory [[DIR=/usr/share/javazi]])],
+	      [AS_HELP_STRING([--with-tzdata-dir[[=DIR]]],set the Java timezone data directory [[default=DATAROOTDIR/javazi]])],
   [
     if test "x${withval}" = x || test "x${withval}" = xyes; then
-      TZDATA_DIR_SET=yes
-      TZDATA_DIR="${DEFAULT}"
+      TZDATA_DIR="${TZDATA_DEFAULT}"
     else
-      if test "x${withval}" = xno; then
-        TZDATA_DIR_SET=no
-        AC_MSG_RESULT([no])
-      else
-        TZDATA_DIR_SET=yes
-        TZDATA_DIR="${withval}"
-      fi
+      TZDATA_DIR="${withval}"
     fi
   ],
   [ 
-    TZDATA_DIR="${DEFAULT}"
+    TZDATA_DIR="${TZDATA_DEFAULT}"
   ])
-  if test "x${TZDATA_DIR}" != "x"; then
-    AC_MSG_RESULT([${TZDATA_DIR}])
+  if test "x${TZDATA_DIR}" = "xno"; then
+    TZDATA_DIR=none
+    TZDATA_DIR_SET=no
+  else
+    TZDATA_DIR_SET=yes
   fi
+  AC_MSG_RESULT([${TZDATA_DIR}])
   AC_SUBST([TZDATA_DIR])
-  AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR}" != "x")
-  AC_CONFIG_FILES([tz.properties])
+  AM_CONDITIONAL(WITH_TZDATA_DIR, test "x${TZDATA_DIR_SET}" = "xyes")
 ])
 
 dnl check that javac and java work
@@ -2951,10 +2947,20 @@
 [
   AC_MSG_CHECKING([which branch and release of IcedTea is being built])
   JAVA_VER=1.7.0
+  JAVA_VENDOR=openjdk
+  JDK_UPDATE_VERSION=191
+  BUILD_VERSION=b02
+  COMBINED_VERSION=${JDK_UPDATE_VERSION}-${BUILD_VERSION}
+  OPENJDK_VER=${JAVA_VER}_${COMBINED_VERSION}
   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} for OpenJDK ${JAVA_VER}])
+  AC_MSG_RESULT([branch ${ICEDTEA_BRANCH}, release ${ICEDTEA_RELEASE} for OpenJDK ${OPENJDK_VER}])
   AC_SUBST([JAVA_VER])
+  AC_SUBST([JAVA_VENDOR])
+  AC_SUBST([JDK_UPDATE_VERSION])
+  AC_SUBST([BUILD_VERSION])
+  AC_SUBST([COMBINED_VERSION])
+  AC_SUBST([OPENJDK_VER])
   AC_SUBST([ICEDTEA_RELEASE])
   AC_SUBST([ICEDTEA_BRANCH])
 ])
diff -r d3a9b945a1d1 -r 4d6159cbb6bd configure.ac
--- a/configure.ac	Sat Dec 29 06:06:32 2018 +0000
+++ b/configure.ac	Sun Dec 30 08:20:24 2018 +0000
@@ -1,4 +1,6 @@
 AC_INIT([icedtea], [2.6.15], [distro-pkg-dev at openjdk.java.net])
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_FILES([Makefile])
@@ -17,8 +19,6 @@
 AC_CONFIG_FILES([jconsole.desktop])
 AC_CONFIG_FILES([policytool.desktop])
 
-AC_CANONICAL_HOST
-
 AC_PROG_CC
 AC_PROG_CXX
 
diff -r d3a9b945a1d1 -r 4d6159cbb6bd jconsole.desktop.in
--- a/jconsole.desktop.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/jconsole.desktop.in	Sun Dec 30 08:20:24 2018 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Monitoring & Management Console
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Monitoring & Management Console
 Comment=Monitor and manage OpenJDK applications
 Exec=_BINDIR_/jconsole
-Icon=java- at JAVA_VER@
+Icon=java- at JAVA_VER@- at JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-tools-jconsole-JConsole
diff -r d3a9b945a1d1 -r 4d6159cbb6bd policytool.desktop.in
--- a/policytool.desktop.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/policytool.desktop.in	Sun Dec 30 08:20:24 2018 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=OpenJDK @JAVA_VER@ Policy Tool
+Name=OpenJDK @OPENJDK_VER@ for @target_cpu@ Policy Tool
 Comment=Manage OpenJDK policy files
 Exec=_BINDIR_/policytool
-Icon=java- at JAVA_VER@
+Icon=java- at JAVA_VER@- at JAVA_VENDOR@
 Terminal=false
 Type=Application
 StartupWMClass=sun-security-tools-PolicyTool
diff -r d3a9b945a1d1 -r 4d6159cbb6bd tapset/jstack.stp.in
--- a/tapset/jstack.stp.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/tapset/jstack.stp.in	Sun Dec 30 08:20:24 2018 +0000
@@ -48,7 +48,8 @@
 /* Resolve multiple installed java versions conflict. */
 @define _private %( %( systemtap_v >= "3.0" %? private %) %)
 @define _check_match %(
-  %( systemtap_v >= "3.0" %? if (pp() !~ "@prefix@") next %)
+  %( systemtap_v >= "3.2" %? if (strpos(pp(), "@prefix@") < 0) next %)
+  %( systemtap_v < "3.2" && systemtap_v >= "3.0" %? if (pp() !~ "@prefix@") next %)
 %)
 
 @_private global Universe_methodKlassObj;
diff -r d3a9b945a1d1 -r 4d6159cbb6bd tz.properties.in
--- a/tz.properties.in	Sat Dec 29 06:06:32 2018 +0000
+++ b/tz.properties.in	Sun Dec 30 08:20:24 2018 +0000
@@ -1,1 +1,1 @@
-sun.zoneinfo.dir=@TZDATA_DIR@
+sun.zoneinfo.dir=_TZDATA_DIR_


More information about the distro-pkg-dev mailing list