aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-01-31 13:16:42 -0600
committerWilliam Pitcock <nenolod@dereferenced.org>2018-02-07 04:31:47 +0000
commitf99b9fd679d2745aed2a1e70888943b710bdfae0 (patch)
tree40f07dc082c32448448c3c81486f644f1455832b
parent5cd3df11953a4cc797f21b0fd5bd54960b7c768e (diff)
main/acl: disable check, modernise, fix license
Package has some GPL-2.0+ sources, and is LGPL-2.1+ not 2.0. Test suite depends on the ordering of nftw(3), which is not consistent between glibc and musl, so it always fails.
-rw-r--r--main/acl/APKBUILD29
1 files changed, 13 insertions, 16 deletions
diff --git a/main/acl/APKBUILD b/main/acl/APKBUILD
index e0b2879bf87..9aa00802f2d 100644
--- a/main/acl/APKBUILD
+++ b/main/acl/APKBUILD
@@ -1,35 +1,35 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=acl
pkgver=2.2.52
-pkgrel=3
+pkgrel=4
pkgdesc="Access control list utilities"
url="https://savannah.nongnu.org/projects/acl"
arch="all"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later AND GPL-2.0-or-later"
depends=""
makedepends_build="gzip"
makedepends_host="attr-dev"
makedepends="$makedepends_build $makedepends_host"
subpackages="$pkgname-dev $pkgname-doc libacl"
+# depends on order of nftw, and requires test machine to have ACLs enabled on FS
+options="!check"
source="http://download.savannah.nongnu.org/releases/acl/acl-$pkgver.src.tar.gz"
-_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- cd "$_builddir"
- update_config_sub || return 1
- #libtoolize --force && aclocal -I m4 && autoconf && autoheader
+ cd "$builddir"
+ default_prepare
+ update_config_sub
sed -i \
-e '/^as_dummy=/s:=":="$PATH$PATH_SEPARATOR:' \
configure # hack PATH with AC_PATH_PROG
sed -i \
-e "/^PKG_DOC_DIR/s:@pkg_name@:$pkgname:" \
-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
- include/builddefs.in \
- || return 1
+ include/builddefs.in
}
build() {
- cd "$_builddir"
+ cd "$builddir"
unset PLATFORM
export OPTIMIZER="${CFLAGS}"
export DEBUG=-DNDEBUG
@@ -39,14 +39,13 @@ build() {
--prefix=/usr \
--libdir=/lib \
--libexecdir=/usr/lib \
- --disable-gettext \
- || return 1
- make || return 1
+ --disable-gettext
+ make
}
package() {
- cd "$_builddir"
- make DIST_ROOT="$pkgdir" install install-lib install-dev || return 1
+ cd "$builddir"
+ make DIST_ROOT="$pkgdir" install install-lib install-dev
chown -R root:root "$pkgdir"/*
}
@@ -56,6 +55,4 @@ libacl() {
mv "$pkgdir"/lib/libacl.so.* "$subpkgdir"/lib/
}
-md5sums="a61415312426e9c2212bd7dc7929abda acl-2.2.52.src.tar.gz"
-sha256sums="179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 acl-2.2.52.src.tar.gz"
sha512sums="59973199d371cd0b2368e95bc829a1b47f04e808a174fefba4c6854e766158bd19a71d9dbcc8d6fdc1573a1f971cdda39c453f7fa243bce02c1ab97c6e7c72e7 acl-2.2.52.src.tar.gz"