Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id E9BC3781A7D for <~alpine/aports@lists.alpinelinux.org>; Wed, 18 Sep 2019 22:48:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A28BE28883 for <~alpine/aports@lists.alpinelinux.org>; Thu, 19 Sep 2019 00:48:23 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ILlWo-U9ydnJ; Thu, 19 Sep 2019 00:48:22 +0200 (CEST) From: Bart Ribbers DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1568846902; bh=0l5ezxT0XOhjDe24cCCZSSsg1npIacAlkwJ9z2Fifhk=; h=From:To:Cc:Subject:Date; b=f2AAGvJliPp/LYN/HCFxyKswbkpq8d+SoAeACnWZtg0/+2m8i9JYHWaGvsM55exZq ZBI/oaBk7IhVdao5XBEg/CccXl8/jCtq7RPJS8/h3c60SfKPnYPYcDa2jTPIRQE+Dc VLQ6EkTgWowgMATp77itzCtjV2ENZtGFdNm5og+RY7TxYxIaOOMU1X7YPjxyW1ewpL 7c45OciC6tOBFlecmSmSA16iXHqOzXBGrNSldb9o21gr7WwGgAaVGsCN8S8VY+k4Ow k2DuDn3RVDUw6RqMWStNAAI7v+6x2uGP2asMKx4ohPhwjRvWc/pJKVJn8RtBKP5aHQ vV9Fd60XpNyQQ== To: ~alpine/aports@lists.alpinelinux.org Cc: Bart Ribbers Subject: [PATCH] testing/apache2-mod-authnz-external: modernize Date: Thu, 19 Sep 2019 00:48:20 +0200 Message-Id: <20190918224820.31200-1-bribbers@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit --- testing/apache2-mod-authnz-external/APKBUILD | 32 ++++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/testing/apache2-mod-authnz-external/APKBUILD b/testing/apache2-mod-authnz-external/APKBUILD index 0299abadda..7cfe781d8b 100644 --- a/testing/apache2-mod-authnz-external/APKBUILD +++ b/testing/apache2-mod-authnz-external/APKBUILD @@ -1,42 +1,34 @@ # Contributor: Nathan Rennie-Waldock # Maintainer: Nathan Rennie-Waldock pkgname=apache2-mod-authnz-external -_realname=mod_authnz_external pkgver=3.3.2 -pkgrel=0 +pkgrel=1 pkgdesc="Apache module for external authentication" -url="https://code.google.com/p/mod-auth-external/" +url="https://github.com/phokz/mod-auth-external" arch="all" license="Apache-2.0" depends="apache2" makedepends="apache2-dev" -install="" subpackages="$pkgname-doc" -source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mod-auth-external/$_realname-$pkgver.tar.gz - $pkgname.apache2.conf" -builddir="$srcdir/$_realname-$pkgver" +source="https://github.com/phokz/mod-auth-external/archive/mod_authnz_external-$pkgver.tar.gz + apache2-mod-authnz-external.apache2.conf" +options="!check" # No tests +builddir="$srcdir/mod-auth-external-mod_authnz_external-$pkgver" build() { - cd "$builddir" - make || return 1 - + make } package() { - cd "$builddir" - install -Dm755 ".libs/$_realname.so" "$pkgdir/usr/lib/apache2/$_realname.so" - install -Dm644 "$srcdir/$pkgname.apache2.conf" \ - "$pkgdir/etc/apache2/conf.d/authnz-external-module.conf" || return 1 + install -Dm755 ".libs/mod_authnz_external.so" "$pkgdir/usr/lib/apache2/mod_authnz_external.so" + install -Dm644 "$srcdir"/apache2-mod-authnz-external.apache2.conf \ + "$pkgdir/etc/apache2/conf.d/authnz-external-module.conf" local f for f in AUTHENTICATORS README; do install -Dm644 "$f" \ - "$pkgdir/usr/share/doc/$pkgname/$f" || return 1 + "$pkgdir/usr/share/doc/$pkgname/$f" done } -md5sums="34981f7f26abfc8d71c93391e15d679c mod_authnz_external-3.3.2.tar.gz -86f27d2072039fb1f8f37e8e8981343e apache2-mod-authnz-external.apache2.conf" -sha256sums="a16b31d81c20e024e7efe480fe98b48d5ce40d520b0a13ff38ab003cc527f1e8 mod_authnz_external-3.3.2.tar.gz -c43a8f06c96eee433f96e00c52961f60e9c4b1db3ac62f1c815f9142629c5861 apache2-mod-authnz-external.apache2.conf" -sha512sums="8216744dbaed8dbde0d33658e38594463409e613412bd94f3e5f5a816f5e793a395ddda7c582ff1d1e69e48efdd1efb48c168d4cbc37cc7807a0dcb92eace0be mod_authnz_external-3.3.2.tar.gz +sha512sums="c7ae50f2f3eebc9a4cf62d13a7db362b044d98046a0571bb6918638c57b0319417d02c42fc1f5213560c96215ec3498193b78f2a1380466a9a4c3c7e5a7f8329 mod_authnz_external-3.3.2.tar.gz aad10cd570ae77b24a658898f1edb0ee08501e98ef76b68efd101037f53b7de123aecc87e535957b401925c665f952b381c4d4bf874c946ba0caeb979b222c35 apache2-mod-authnz-external.apache2.conf" -- 2.21.0