[arch-commits] Commit in lib32-p11-kit/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, May 26, 2017 @ 13:18:35
  Author: heftig
Revision: 230468

0.23.5-1

Modified:
  lib32-p11-kit/trunk/PKGBUILD

----------+
 PKGBUILD |   49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-26 13:06:58 UTC (rev 230467)
+++ PKGBUILD	2017-05-26 13:18:35 UTC (rev 230468)
@@ -4,23 +4,28 @@
 
 _pkgbasename=p11-kit
 pkgname=lib32-$_pkgbasename
-pkgver=0.23.2
+pkgver=0.23.5
 pkgrel=1
-pkgdesc="Library to work with PKCS#11 modules (32-bit)"
+pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
 arch=(x86_64)
-url="http://p11-glue.freedesktop.org"
-license=('BSD')
+url="https://p11-glue.freedesktop.org"
+license=(BSD)
 depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
-options=(!libtool)
-source=($url/releases/$_pkgbasename-$pkgver.tar.gz{,.sig}
+makedepends=(git)
+_commit=817a1c67c407850ab1756fdacb1c38e4bded5509  # tags/0.23.5^0
+source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit"
         libnssckbi-compat.patch)
-validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF)
-sha256sums=('ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0'
-            'SKIP'
+sha256sums=('SKIP'
             '8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
+validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
 
+pkgver() {
+  cd ${_pkgbasename}
+  git describe --tags | sed 's/-/+/g'
+}
+
 prepare() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd ${_pkgbasename}
 
   # Build and install an additional library (libnssckbi-p11-kit.so) which
   # is a copy of p11-kit-trust.so but uses the same label for root certs as
@@ -28,16 +33,22 @@
   # https://bugs.freedesktop.org/show_bug.cgi?id=66161
   patch -Np1 -i ../libnssckbi-compat.patch
 
-  autoreconf -vi
+  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
+  cd ${_pkgbasename}
+
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  cd "$srcdir/$_pkgbasename-$pkgver"
 
-  ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \
+  ./configure --prefix=/usr \
+    --libdir=/usr/lib32 \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --libexecdir=/usr/lib \
+    --disable-doc \
     --with-module-path=/usr/lib32/pkcs11 \
     --with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
   make
@@ -44,18 +55,18 @@
 }
 
 check() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd ${_pkgbasename}
   make check
 }
 
 package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
+  cd ${_pkgbasename}
   make DESTDIR="$pkgdir" install
-  rm -rf "${pkgdir}"/etc
-  rm -rf "${pkgdir}"/usr/{bin,include,share}
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
 
-  ln -srf "$pkgdir/usr/bin/update-ca-trust" "$pkgdir/usr/lib32/p11-kit/trust-extract-compat"
+  rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share}
+
+  install -d "$pkgdir/usr/share/licenses"
+  ln -s ${_pkgbasename} "$pkgdir/usr/share/licenses/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et: