Mercurial > hg > release > icedtea6-1.13
changeset 3262:f0018499e963
PR3130: Avoid giving PAX_COMMAND a value if no PaX utility is available
2016-08-14 Andrew John Hughes <gnu.andrew@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@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.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Mon, 15 Aug 2016 06:16:39 +0100 |
| parents | 25a95cf50cc8 |
| children | 8cb3232d660b |
| files | ChangeLog NEWS acinclude.m4 pax-mark-vm.in |
| diffstat | 4 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Aug 17 04:00:23 2016 +0100 +++ b/ChangeLog Mon Aug 15 06:16:39 2016 +0100 @@ -1,3 +1,19 @@ +2016-08-14 Andrew John Hughes <gnu.andrew@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@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@member.fsf.org> PR3117: Add tests for Java debug info and
--- a/NEWS Wed Aug 17 04:00:23 2016 +0100 +++ b/NEWS Mon Aug 15 06:16:39 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 + - PR3130: Avoid giving PAX_COMMAND a value if no PaX utility is available - PR3137: GTKLookAndFeel does not honor gtk-alternative-button-order New in release 1.13.11 (2016-05-05):
--- a/acinclude.m4 Wed Aug 17 04:00:23 2016 +0100 +++ b/acinclude.m4 Mon Aug 15 06:16:39 2016 +0100 @@ -2239,10 +2239,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) @@ -2254,7 +2251,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) ])
--- a/pax-mark-vm.in Wed Aug 17 04:00:23 2016 +0100 +++ b/pax-mark-vm.in Mon Aug 15 06:16:39 2016 +0100 @@ -5,7 +5,7 @@ file "$@" 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//' } -if test "@PAX_COMMAND@" != "not specified"; then +if test "x@PAX_COMMAND@" != "x"; 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}"