diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-02-09 11:41:23 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-09 11:41:23 +0000 |
| commit | 8fddb2b8636b0d7c158df067bc26dea13df4ff09 (patch) | |
| tree | 16d08945044329670f31075f95a2d794892dc643 /community/openjdk8/fix-paxmark.patch | |
| parent | b1f3e812d7ad4e21c3c109a2d5e44a8cf3d70add (diff) | |
| download | aports-8fddb2b8636b0d7c158df067bc26dea13df4ff09.tar.bz2 aports-8fddb2b8636b0d7c158df067bc26dea13df4ff09.tar.xz | |
community/openjdk8: fix paxmarking
- fix the script to work with split subpkg directory layout
- make apkbuild abort on marking error
- rebuild with new abuild that has xattr issue fixed
Diffstat (limited to 'community/openjdk8/fix-paxmark.patch')
| -rw-r--r-- | community/openjdk8/fix-paxmark.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/community/openjdk8/fix-paxmark.patch b/community/openjdk8/fix-paxmark.patch new file mode 100644 index 0000000000..2c43014322 --- /dev/null +++ b/community/openjdk8/fix-paxmark.patch @@ -0,0 +1,28 @@ +--- icedtea-3.3.0/pax-mark-vm.in.orig 2017-02-09 09:42:32.652307034 +0000 ++++ icedtea-3.3.0/pax-mark-vm.in 2017-02-09 09:43:46.043633914 +0000 +@@ -9,17 +9,15 @@ + } + + 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}" ++ if ! @PAX_COMMAND@ @PAX_COMMAND_ARGS@ "${paxable}"; then ++ 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 + 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 |