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

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Fri Nov 4 03:28:10 UTC 2016


changeset 91e6210635fe in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=91e6210635fe
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Nov 04 02:47:21 2016 +0000

	PR3131: PaX marking fails on filesystems which don't support extended attributes

	2016-04-07  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR3131: PaX marking fails on filesystems which
		don't support extended attributes
		* Makefile.am:
		(icedtea): Pass true to pax-mark-vm to fail
		if PaX marking fails.
		(icedtea-debug): Likewise.
		(icedtea-boot): Likewise.
		(install-exec-local): Pass false to pax-mark-vm
		so that only a warning is produced if PaX marking
		fails on the installed version.
		* NEWS: Updated.
		* pax-mark-vm.in:
		Add a second option, FAIL_ON_ERROR, which will
		cause the script to exit if it can't PaX mark
		when set to true, but just issue a warning when
		set to false.


changeset 7e526b0afd43 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=7e526b0afd43
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Nov 04 03:04:30 2016 +0000

	PR3128: pax-mark-vm script calls "exit -1" which is invalid in dash

	2016-08-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3128: pax-mark-vm script calls "exit -1" which
		is invalid in dash
		* NEWS: Updated.
		* pax-mark-vm.in:
		Use POSIX-compliant exit value.


changeset ef0e3aaf18a9 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=ef0e3aaf18a9
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Nov 04 03:29:32 2016 +0000

	PR3135: Makefile.am rule stamps/add/tzdata-support-debug.stamp has a typo in add-tzdata dependency

	2016-08-19  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3135: Makefile.am rule
		stamps/add/tzdata-support-debug.stamp has a typo in
		add-tzdata dependency
		* NEWS: Updated.

	2016-08-10  Tiago Sturmer Daitx  <tdaitx at linux.vnet.ibm.com>

		PR3135: Makefile.am rule
		stamps/add/tzdata-support-debug.stamp has a typo in
		add-tzdata dependency
		* Makefile.am:
		(icedtea-debug-stage2): Fix typo in
		add-tzdata-support-debug dependency.


changeset 90f705f8f2be in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=90f705f8f2be
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Nov 04 03:30:52 2016 +0000

	PR3141: Pass $(CC) and $(CXX) to OpenJDK build

	2016-08-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3141: Pass $(CC) and $(CXX) to OpenJDK build
		* Makefile.am:
		(ICEDTEA_ENV): Set CC and CXX instead
		of BUILD_GCC and BUILD_CXX.
		* NEWS: Updated.


changeset 8f4966ca9467 in /hg/release/icedtea7-2.6
details: http://icedtea.classpath.org/hg/release/icedtea7-2.6?cmd=changeset;node=8f4966ca9467
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Fri Nov 04 03:32:27 2016 +0000

	PR3166: invalid zip timestamp handling leads to error building bootstrap-javac

	2016-08-19  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3166: invalid zip timestamp handling leads to
		error building bootstrap-javac
		* AUTHORS: Add Ricardo Ribalda.
		* NEWS: Updated.

	2016-08-19  Ricardo Ribalda  <ricardo.ribalda at gmail.com>

		PR3166: invalid zip timestamp handling leads to
		error building bootstrap-javac
		* Makefile.am:
		(rt): Don't use -u so files are always overwritten,
		regardless of timestamps.


diffstat:

 AUTHORS        |   1 +
 ChangeLog      |  66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile.am    |  16 +++++++-------
 NEWS           |   5 ++++
 pax-mark-vm.in |  14 +++++++++++-
 5 files changed, 93 insertions(+), 9 deletions(-)

diffs (197 lines):

diff -r 749a80f8d0f4 -r 8f4966ca9467 AUTHORS
--- a/AUTHORS	Fri Oct 28 07:49:21 2016 +0100
+++ b/AUTHORS	Fri Nov 04 03:32:27 2016 +0000
@@ -35,6 +35,7 @@
 Xerxes RÃ¥nby <xerxes at zafena.se>
 Damien Raude-Morvan <drazzib at drazzib.com>
 Mark Reinhold <mr at sun.com>
+Ricardo Ribalda <ricardo.ribalda at gmail.com>
 Bernhard Rosenkränzer <bero at arklinux.org>
 Marc Schoenefeld <mschoene at redhat.com>
 Keith Seitz <keiths at redhat.com>
diff -r 749a80f8d0f4 -r 8f4966ca9467 ChangeLog
--- a/ChangeLog	Fri Oct 28 07:49:21 2016 +0100
+++ b/ChangeLog	Fri Nov 04 03:32:27 2016 +0000
@@ -1,3 +1,69 @@
+2016-08-19  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3166: invalid zip timestamp handling leads to
+	error building bootstrap-javac
+	* AUTHORS: Add Ricardo Ribalda.
+	* NEWS: Updated.
+
+2016-08-19  Ricardo Ribalda  <ricardo.ribalda at gmail.com>
+
+	PR3166: invalid zip timestamp handling leads to
+	error building bootstrap-javac
+	* Makefile.am:
+	(rt): Don't use -u so files are always overwritten,
+	regardless of timestamps.
+
+2016-08-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3141: Pass $(CC) and $(CXX) to OpenJDK build
+	* Makefile.am:
+	(ICEDTEA_ENV): Set CC and CXX instead
+	of BUILD_GCC and BUILD_CXX.
+	* NEWS: Updated.
+
+2016-08-19  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3135: Makefile.am rule
+	stamps/add/tzdata-support-debug.stamp has a typo in
+	add-tzdata dependency
+	* NEWS: Updated.
+
+2016-08-10  Tiago Sturmer Daitx  <tdaitx at linux.vnet.ibm.com>
+
+	PR3135: Makefile.am rule
+	stamps/add/tzdata-support-debug.stamp has a typo in
+	add-tzdata dependency
+	* Makefile.am:
+	(icedtea-debug-stage2): Fix typo in
+	add-tzdata-support-debug dependency.
+
+2016-08-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3128: pax-mark-vm script calls "exit -1" which
+	is invalid in dash
+	* NEWS: Updated.
+	* pax-mark-vm.in:
+	Use POSIX-compliant exit value.
+
+2016-04-07  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR3131: PaX marking fails on filesystems which
+	don't support extended attributes
+	* Makefile.am:
+	(icedtea): Pass true to pax-mark-vm to fail
+	if PaX marking fails.
+	(icedtea-debug): Likewise.
+	(icedtea-boot): Likewise.
+	(install-exec-local): Pass false to pax-mark-vm
+	so that only a warning is produced if PaX marking
+	fails on the installed version.
+	* NEWS: Updated.
+	* pax-mark-vm.in:
+	Add a second option, FAIL_ON_ERROR, which will
+	cause the script to exit if it can't PaX mark
+	when set to true, but just issue a warning when
+	set to false.
+
 2016-10-27  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am,
diff -r 749a80f8d0f4 -r 8f4966ca9467 Makefile.am
--- a/Makefile.am	Fri Oct 28 07:49:21 2016 +0100
+++ b/Makefile.am	Fri Nov 04 03:32:27 2016 +0000
@@ -619,8 +619,8 @@
 	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
 	VERBOSE="$(VERBOSE)" \
 	STATIC_CXX="false" \
-	BUILD_GCC="$(CC)" \
-	BUILD_CXX="$(CXX)" \
+	CC="$(CC)" \
+	CXX="$(CXX)" \
 	SYSTEM_CUPS="${ENABLE_SYSTEM_CUPS}" \
 	CUPS_LIBS="${CUPS_LIBS}" \
 	CUPS_CFLAGS="${CUPS_CFLAGS}" \
@@ -2033,7 +2033,7 @@
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR)
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR) true
 	mkdir -p $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_SDK_DIR)/jre/lib/ext
@@ -2185,7 +2185,7 @@
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR)
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR) true
 	mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_DEBUG_JRE_DIR)/lib/$(INSTALL_ARCH_DIR)
 	mkdir -p $(BUILD_DEBUG_SDK_DIR)/jre/lib/ext
@@ -2339,7 +2339,7 @@
 
 stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
  stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \
- stamps/add-systemtap-debug.stamp stamps/add/tzdata-support-debug.stamp \
+ stamps/add-systemtap-debug.stamp stamps/add-tzdata-support-debug.stamp \
  stamps/check-crypto-debug.stamp stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp \
  stamps/add-mime-types-file-debug.stamp
 	mkdir -p stamps
@@ -2359,7 +2359,7 @@
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C openjdk-boot \
 	  $(ICEDTEA_BUILD_TARGET)
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR)
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR) true
 # Fix permissions on JARs updated during build if PR1437 bug is present
 if PR1437_PRESENT
 	if [ -e $(BUILD_BOOT_SDK_DIR)/lib/sa-jdi.jar ] ; then \
@@ -3026,7 +3026,7 @@
 	     cp -a ../../$$dirs $$destpath ; \
 	   done ; \
 	   if [ -w $(STAGE1_BOOT_RUNTIME) ] ; then \
-	     $(ZIP) -qur $(STAGE1_BOOT_RUNTIME) com java javax sun ; \
+	     $(ZIP) -qr $(STAGE1_BOOT_RUNTIME) com java javax sun ; \
 	   fi ; ) \
 	fi
 	mkdir -p stamps
@@ -3257,7 +3257,7 @@
 	for files in $(BUILD_SDK_DIR)/tapset/*.stp; do \
 	  $(call install_file,$${files},$(DESTDIR)${prefix}/tapset,$(INSTALL_DATA));\
 	done
-	$(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix}
+	$(abs_top_builddir)/pax-mark-vm $(DESTDIR)${prefix} false
 
 install-data-local:
 	${mkinstalldirs} $(DESTDIR)${prefix}
diff -r 749a80f8d0f4 -r 8f4966ca9467 NEWS
--- a/NEWS	Fri Oct 28 07:49:21 2016 +0100
+++ b/NEWS	Fri Nov 04 03:32:27 2016 +0000
@@ -50,6 +50,11 @@
   - S8149611, PR3160, G592292: Add tests for Unsafe.copySwapMemory
 * Bug fixes
   - S8078628, PR3151: Zero build fails with pre-compiled headers disabled
+  - PR3128: pax-mark-vm script calls "exit -1" which is invalid in dash
+  - PR3131: PaX marking fails on filesystems which don't support extended attributes
+  - PR3135: Makefile.am rule stamps/add/tzdata-support-debug.stamp has a typo in add-tzdata dependency
+  - PR3141: Pass $(CC) and $(CXX) to OpenJDK build
+  - PR3166: invalid zip timestamp handling leads to error building bootstrap-javac
 * AArch64 port
   - S8167200, PR3204: AArch64: Broken stack pointer adjustment in interpreter
   - PR3211: AArch64 build fails with pre-compiled headers disabled
diff -r 749a80f8d0f4 -r 8f4966ca9467 pax-mark-vm.in
--- a/pax-mark-vm.in	Fri Oct 28 07:49:21 2016 +0100
+++ b/pax-mark-vm.in	Fri Nov 04 03:32:27 2016 +0000
@@ -1,13 +1,25 @@
 #!/bin/sh
 
+JDK=${1}
+FAIL_ON_ERROR=${2}
+
 # Taken from Gentoo's pax-utils.eclass
 list_paxables() {
 	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
 }
 
 if test "x at PAX_COMMAND@" != "x"; then
-	for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
+    if @PAX_COMMAND@ -m "${JDK}"/bin/java; then
+	for paxable in `list_paxables "${JDK}"/bin/* "${JDK}"/jre/bin/*`; do
 		echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
 		@PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
 	done
+    else
+	if test "x${FAIL_ON_ERROR}" = "xtrue"; then
+	    echo "ERROR: Could not apply PaX markings to files in ${JDK}";
+	    exit 1;
+	else
+	    echo "WARNING: Could not apply PaX markings to files in ${JDK}";
+	fi
+    fi
 fi


More information about the distro-pkg-dev mailing list