diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-01-27 15:29:53 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-01-27 15:30:56 +0200 |
| commit | 3ceb54f76cc7bbbe5c8d041534afd0c3ef7555b8 (patch) | |
| tree | a3373b6f830e22d322977e86fd4d2d2b0f2dd05d /main/paxmark | |
| parent | 4c448bd1ed2b774da96e6014a1f011e3dda05987 (diff) | |
| download | aports-3ceb54f76cc7bbbe5c8d041534afd0c3ef7555b8.tar.bz2 aports-3ceb54f76cc7bbbe5c8d041534afd0c3ef7555b8.tar.xz | |
main/paxmark: add paxmark also to disk inside fakeroot
Diffstat (limited to 'main/paxmark')
| -rw-r--r-- | main/paxmark/APKBUILD | 8 | ||||
| -rw-r--r-- | main/paxmark/paxmark | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/main/paxmark/APKBUILD b/main/paxmark/APKBUILD index da12023e20..f3c35d2f22 100644 --- a/main/paxmark/APKBUILD +++ b/main/paxmark/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=paxmark -pkgver=0.9 +pkgver=0.10 pkgrel=0 pkgdesc="Manage PaX marking of executables" url="http://alpinelinux.org" @@ -22,6 +22,6 @@ package() { ln -s paxmark "$pkgdir"/usr/sbin/paxmark.sh || return 1 } -md5sums="ab0e016ce553bf409d2aeb437f790d35 paxmark" -sha256sums="e7ebf89ebeab2a9a16b2bfd884a1cfda3172b37c3716a991279a511b19196c09 paxmark" -sha512sums="ea8e2d030aaef3b1b32cd313791d3f70006356ff9c28084cc5324fe686a2a0aa860c2b337c6a56da69580f74c9631cb5fa4cf9701e931c34772216f1cdf77268 paxmark" +md5sums="b8ccb3b5d6e40213e83d38d9cc62c639 paxmark" +sha256sums="43983aec547bfd805e64457f37f58ccb55081b4d21bf8d3763b7005c6ae2d1b4 paxmark" +sha512sums="2701ce00dba7e21b397443063bd4218a9f733b3d2a419ad2a2cab62d099a0997cc7f06952d7d57828bda2cb95d74fe1f067c5f585f529ae2613e49ddfdf7fc53 paxmark" diff --git a/main/paxmark/paxmark b/main/paxmark/paxmark index f8486c767b..a279ed98d9 100644 --- a/main/paxmark/paxmark +++ b/main/paxmark/paxmark @@ -20,8 +20,13 @@ xval="" [ "${flags//[!s]}" -a -z "${flags//[!S]}" ] && xval="${xval}s" for f in "$@"; do - attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null && continue - ret=1 + if [ -n "FAKEROOTKEY" ]; then + # fakeroot does not set xattr's on disk. + # explicitly do that, because the marked binary might + # be executed next during install. + LD_PRELOAD="" FAKEROOTKEY="" attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null || ret=1 + fi + attr -q -s pax.flags -V "${xval}" "${f}" >/dev/null || ret=1 done return $ret |