# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1471239032 -3600
# Node ID 9057420d85df29543516cfdc61c518f7bfb4a47f
# Parent  8cb3232d660bfa57530963473bd43a73a9ffdc90
PR3129: pax-mark-vm script calls "exit -1" which is invalid in dash

2016-08-04  Andrew John Hughes  <gnu.andrew@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.

diff -r 8cb3232d660b -r 9057420d85df ChangeLog
--- a/ChangeLog	Mon Aug 15 06:26:24 2016 +0100
+++ b/ChangeLog	Mon Aug 15 06:30:32 2016 +0100
@@ -1,3 +1,11 @@
+2016-08-04  Andrew John Hughes  <gnu.andrew@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@member.fsf.org>
 
 	PR3132: PaX marking fails on filesystems which
diff -r 8cb3232d660b -r 9057420d85df NEWS
--- a/NEWS	Mon Aug 15 06:26:24 2016 +0100
+++ b/NEWS	Mon Aug 15 06:30:32 2016 +0100
@@ -27,6 +27,7 @@
   - 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
diff -r 8cb3232d660b -r 9057420d85df pax-mark-vm.in
--- a/pax-mark-vm.in	Mon Aug 15 06:26:24 2016 +0100
+++ b/pax-mark-vm.in	Mon Aug 15 06:30:32 2016 +0100
@@ -5,19 +5,19 @@
 
 # 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 "x@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
+		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;
+	    exit 1;
 	else
 	    echo "WARNING: Could not apply PaX markings to files in ${JDK}";
 	fi