/hg/icedtea6: 3 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Mon Aug 15 05:34:23 UTC 2016 

changeset 7f502d06457c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7f502d06457c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:16:39 2016 +0100

	PR3130: Avoid giving PAX_COMMAND a value if no PaX utility is available

	2016-08-14  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR3130: Avoid giving PAX_COMMAND a value if
		no PaX utility is available
		* NEWS: Updated.

	2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR3130: Avoid giving PAX_COMMAND a value if
		no PaX utility is available
		* acinclude.m4:
		(IT_WITH_PAX): Leave PAX_COMMAND with the empty
		string rather than "not specified" to avoid build
		failures.
		* pax-mark-vm.in: Update PAX_COMMAND check.


changeset bb2bbb3b08d9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bb2bbb3b08d9
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:26:24 2016 +0100

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

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

		PR3132: PaX marking fails on filesystems which
		don't support extended attributes
		* Makefile.am:
		(pax-mark-vm): Pass true to pax-mark-vm to fail
		if PaX marking fails.
		(pax-mark-vm-debug): Likewise.
		(pax-mark-vm-ecj): Likewise.
		* 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 2293a898b34a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2293a898b34a
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Aug 15 06:30:32 2016 +0100

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

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

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


diffstat:

 ChangeLog      |  40 ++++++++++++++++++++++++++++++++++++++++
 Makefile.am    |   6 +++---
 NEWS           |   3 +++
 acinclude.m4   |   7 ++-----
 pax-mark-vm.in |  24 ++++++++++++++++++------
 5 files changed, 66 insertions(+), 14 deletions(-)

diffs (149 lines):

diff -r 15c751726652 -r 2293a898b34a ChangeLog
--- a/ChangeLog	Mon Aug 15 06:09:17 2016 +0100
+++ b/ChangeLog	Mon Aug 15 06:30:32 2016 +0100
@@ -1,3 +1,43 @@
+2016-08-04  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3129: 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>
+
+	PR3132: PaX marking fails on filesystems which
+	don't support extended attributes
+	* Makefile.am:
+	(pax-mark-vm): Pass true to pax-mark-vm to fail
+	if PaX marking fails.
+	(pax-mark-vm-debug): Likewise.
+	(pax-mark-vm-ecj): Likewise.
+	* 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-08-14  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR3130: Avoid giving PAX_COMMAND a value if
+	no PaX utility is available
+	* NEWS: Updated.
+
+2014-02-21  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR3130: Avoid giving PAX_COMMAND a value if
+	no PaX utility is available
+	* acinclude.m4:
+	(IT_WITH_PAX): Leave PAX_COMMAND with the empty
+	string rather than "not specified" to avoid build
+	failures.
+	* pax-mark-vm.in: Update PAX_COMMAND check.
+
 2016-07-28  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR3117: Add tests for Java debug info and
diff -r 15c751726652 -r 2293a898b34a Makefile.am
--- a/Makefile.am	Mon Aug 15 06:09:17 2016 +0100
+++ b/Makefile.am	Mon Aug 15 06:30:32 2016 +0100
@@ -2100,7 +2100,7 @@
 
 stamps/pax-mark-vm.stamp: stamps/icedtea.stamp
 if WITH_PAX
-	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_SDK_DIR) true
 endif
 	touch $@
 
@@ -2109,7 +2109,7 @@
 
 stamps/pax-mark-vm-debug.stamp: stamps/icedtea-debug.stamp
 if WITH_PAX
-	$(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_DEBUG_SDK_DIR) true
 endif
 	touch $@
 
@@ -2339,7 +2339,7 @@
 
 stamps/pax-mark-vm-ecj.stamp: stamps/icedtea-ecj.stamp
 if WITH_PAX
-	$(abs_top_builddir)/pax-mark-vm $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_BOOT_SDK_DIR) true
 endif
 	touch $@
 
diff -r 15c751726652 -r 2293a898b34a NEWS
--- a/NEWS	Mon Aug 15 06:09:17 2016 +0100
+++ b/NEWS	Mon Aug 15 06:30:32 2016 +0100
@@ -42,6 +42,9 @@
   - PR2969: ENABLE_SYSTEM_LCMS is not defined if ENABLE_LCMS2 is not set
   - PR3092: SystemTap is heavily confused by multiple JDKs
   - PR3117: Add tests for Java debug info and source files
+  - PR3129: pax-mark-vm script calls "exit -1" which is invalid in dash
+  - PR3130: Avoid giving PAX_COMMAND a value if no PaX utility is available
+  - PR3132: PaX marking fails on filesystems which don't support extended attributes
   - PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order
   - PR3139: Update documentation
 
diff -r 15c751726652 -r 2293a898b34a acinclude.m4
--- a/acinclude.m4	Mon Aug 15 06:09:17 2016 +0100
+++ b/acinclude.m4	Mon Aug 15 06:30:32 2016 +0100
@@ -2242,10 +2242,7 @@
       AC_MSG_WARN("No PaX utility found.")
     fi
   fi
-  if test -z "${PAX_COMMAND}"; then
-    PAX_COMMAND="not specified"
-    PAX_COMMAND_ARGS="not specified"
-  else
+  if test -n "${PAX_COMMAND}"; then
     AC_MSG_CHECKING([which options to pass to ${PAX_COMMAND}])
     case "${host_cpu}" in
       i?86)
@@ -2257,7 +2254,7 @@
     esac
     AC_MSG_RESULT(${PAX_COMMAND_ARGS})
   fi
-  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "xnot specified")
+  AM_CONDITIONAL(WITH_PAX, test "x${PAX_COMMAND}" != "x")
   AC_SUBST(PAX_COMMAND)
   AC_SUBST(PAX_COMMAND_ARGS)
 ])
diff -r 15c751726652 -r 2293a898b34a pax-mark-vm.in
--- a/pax-mark-vm.in	Mon Aug 15 06:09:17 2016 +0100
+++ b/pax-mark-vm.in	Mon Aug 15 06:30:32 2016 +0100
@@ -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/: .*$//'
+	file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//'
 }
 
-if test "@PAX_COMMAND@" != "not specified"; then
-       for paxable in `list_paxables "${1}"/bin/* "${1}"/jre/bin/*`; do
-               echo "PaX mark @PAX_COMMAND_ARGS@ ${paxable}"
-               @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"
-       done
+if test "x at PAX_COMMAND@" != "x"; then
+    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