aboutsummaryrefslogtreecommitdiffstats
path: root/main/abuild
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-09 08:53:44 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-04-09 08:53:44 +0300
commitdb1c4c43a2071de30f255d44c8ad4b0c157c6663 (patch)
treeb51d63b6a44c839f8e68ee2fdc1484f2b32e70a0 /main/abuild
parentcf3484ae75dddf7cd555d8594fdf613a89cff3fd (diff)
downloadaports-db1c4c43a2071de30f255d44c8ad4b0c157c6663.tar.bz2
aports-db1c4c43a2071de30f255d44c8ad4b0c157c6663.tar.xz
main/abuild: preseve all xattrs
Diffstat (limited to 'main/abuild')
-rw-r--r--main/abuild/0001-abuild-preserve-all-xattrs.patch26
-rw-r--r--main/abuild/APKBUILD12
2 files changed, 34 insertions, 4 deletions
diff --git a/main/abuild/0001-abuild-preserve-all-xattrs.patch b/main/abuild/0001-abuild-preserve-all-xattrs.patch
new file mode 100644
index 0000000000..297c4f61b1
--- /dev/null
+++ b/main/abuild/0001-abuild-preserve-all-xattrs.patch
@@ -0,0 +1,26 @@
+From a6641817147c5fd379245cc080af8bec77315890 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Thu, 9 Apr 2015 08:47:56 +0300
+Subject: [PATCH] abuild: preserve all xattrs
+
+by default getfattr omits system xattrs like security.capability
+---
+ abuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/abuild.in b/abuild.in
+index 3e7ffaf..3ed5417 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1679,7 +1679,7 @@ stripbin() {
+ scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" . \
+ | sed -e 's:^ET_DYN ::' -e 's:^ET_EXEC ::' \
+ | while read filename; do
+- XATTR=$(getfattr -d "${filename}")
++ XATTR=$(getfattr --match="*" --dump "${filename}")
+ ${CROSS_COMPILE}strip "${filename}"
+ [ -n "$XATTR" ] && (echo "$XATTR" | setfattr --restore=-)
+ done
+--
+2.3.5
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 906f8fa9ef..8d598de3c8 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
pkgname=abuild
pkgver=2.21.0_git20150408
_ver=${pkgver%_git*}
-pkgrel=0
+pkgrel=1
pkgdesc="Script to build Alpine Packages"
url="http://git.alpinelinux.org/cgit/abuild/"
arch="all"
@@ -21,6 +21,7 @@ options="suid"
pkggroups="abuild"
source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
git.patch
+ 0001-abuild-preserve-all-xattrs.patch
"
_builddir="$srcdir/$pkgname-$_ver"
@@ -60,8 +61,11 @@ cpan() {
}
md5sums="126cbde6e4fdf537571a03a97d01d348 abuild-2.21.0.tar.xz
-453ee698af510fc0cf10a33020e37e73 git.patch"
+453ee698af510fc0cf10a33020e37e73 git.patch
+79ad3d35bab42098add7fa8bcb7d759b 0001-abuild-preserve-all-xattrs.patch"
sha256sums="08689cbf8818c81d9e52e3397529adcb0e279a21d33dfe4f0678d0ef778767f3 abuild-2.21.0.tar.xz
-7e7f9a837c2c6a2bddb2db80f86b2cad212cbb0cc8f2a8b63534dd5a3bc52318 git.patch"
+7e7f9a837c2c6a2bddb2db80f86b2cad212cbb0cc8f2a8b63534dd5a3bc52318 git.patch
+4b7102a82a4f12ee3344c027352868a0bc1d9c1af4ac8f66c11a2986cd4d6d11 0001-abuild-preserve-all-xattrs.patch"
sha512sums="b304dbb82563ec8ae23376c17ee27b3d49e9c1b74bd14b7a912ca88239ed3c7b2fabeb6209a6d4485c6dbab8491abb8b42f801f5fd9310691da60e630061646b abuild-2.21.0.tar.xz
-6ab114cd383d29244124e5cf440ef17f292e01a683d21c153f808d7757e38e1b575384d5d4b2a3314c17a5656c64361703c3f746577266ae4403edcf353cc5e8 git.patch"
+6ab114cd383d29244124e5cf440ef17f292e01a683d21c153f808d7757e38e1b575384d5d4b2a3314c17a5656c64361703c3f746577266ae4403edcf353cc5e8 git.patch
+c995d2874d9a54c68efa51a8b7e7185748f2369b62011f3998d906aa8118c0944594a258062cb46bfb75b89d78cae13b59cf84de2cf6630f4d2bdb8c0282972b 0001-abuild-preserve-all-xattrs.patch"