From d1e475661fa736ad2725a837c516251395e0ec0f Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Tue, 24 Jan 2017 20:24:08 +0000
Subject: [PATCH] main/paxmark: remove paxctl usage
---
main/paxmark/APKBUILD | 6 +++---
main/paxmark/paxmark | 8 --------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/main/paxmark/APKBUILD b/main/paxmark/APKBUILD
index c93698201c86..7dfd6f8511a8 100644
--- a/main/paxmark/APKBUILD
+++ b/main/paxmark/APKBUILD
@@ -1,12 +1,12 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=paxmark
-pkgver=0.8
-pkgrel=2
+pkgver=0.9
+pkgrel=0
pkgdesc="Manage PaX marking of executables"
url="http://alpinelinux.org"
arch="noarch"
license="GPL"
-depends="paxctl attr"
+depends="attr"
makedepends=""
install=""
subpackages=""
diff --git a/main/paxmark/paxmark b/main/paxmark/paxmark
index decaa115bc6b..f8486c767b65 100644
--- a/main/paxmark/paxmark
+++ b/main/paxmark/paxmark
@@ -5,14 +5,6 @@ flags="${1//[!zPpEeMmRrSs]}"
[ -n "${flags}" ] || return 0
shift
-# Create PT_PAX marking (remove after migration)
-for f in "$@"; do
- paxctl -q${flags} "${f}" >/dev/null 2>&1 && continue
- paxctl -qC${flags} "${f}" >/dev/null 2>&1 && continue
- paxctl -qc${flags} "${f}" >/dev/null 2>&1 && continue
- ret=1
-done
-
# Create XATTR_PAX marking using attr
xval=""
[ "${flags//[!P]}" ] && xval="${xval}P"
--
GitLab