Updated to 0.23.12

3 files changed, 39 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51b49ecb474f..1a0e385d517f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-p11-kit
-	pkgdesc = Provides a way to load and enumerate PKCS#11modules (mingw-w64)
-	pkgver = 0.23.10+14+gba6ebb0
+	pkgdesc = Provides a way to load and enumerate PKCS#11 modules (mingw-w64)
+	pkgver = 0.23.12
 	pkgrel = 1
 	url = https://p11-glue.freedesktop.org
 	arch = any
@@ -10,10 +10,10 @@ pkgbase = mingw-w64-p11-kit
 	depends = mingw-w64-crt
 	depends = mingw-w64-libtasn1
 	depends = mingw-w64-libffi
+	options = !strip
 	options = staticlibs
 	options = !buildflags
-	options = !strip
-	source = git+https://github.com/p11-glue/p11-kit#commit=ba6ebb05fc0c8010d8510984ce3c5f908edf13b6
+	source = git+https://github.com/p11-glue/p11-kit#commit=3dd5810143e51dabdc58069e55b09a950349fa08
 	source = 0001-Build-and-install-libnssckbi-p11-kit.so.patch
 	sha256sums = SKIP
 	sha256sums = 0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..97589fb4de69
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!*.install
+!*.patch
+!*.diff
diff --git a/PKGBUILD b/PKGBUILD
index dfb1ce62208e..0674751b15e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,47 @@
+# Maintainer: pingplug <pingplug@foxmail.com>
+# Contributor: xantares <xantares09@hotmail.com>
+
+_commit=3dd5810143e51dabdc58069e55b09a950349fa08  # tags/0.23.12^0
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 pkgname=mingw-w64-p11-kit
-pkgver=0.23.10+14+gba6ebb0
+pkgver=0.23.12
 pkgrel=1
-pkgdesc="Provides a way to load and enumerate PKCS#11modules (mingw-w64)"
-arch=(any)
+pkgdesc="Provides a way to load and enumerate PKCS#11 modules (mingw-w64)"
+arch=('any')
 url="https://p11-glue.freedesktop.org"
 license=('BSD')
-depends=('mingw-w64-crt' 'mingw-w64-libtasn1' 'mingw-w64-libffi')
-makedepends=('mingw-w64-configure' 'git')
-options=('staticlibs' '!buildflags' '!strip')
-_commit=ba6ebb05fc0c8010d8510984ce3c5f908edf13b6  # after MinGW fix
-source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit"
-        0001-Build-and-install-libnssckbi-p11-kit.so.patch)
+depends=('mingw-w64-crt'
+         'mingw-w64-libtasn1'
+         'mingw-w64-libffi')
+makedepends=('mingw-w64-configure'
+             'git')
+options=('!strip' 'staticlibs' '!buildflags')
+source=("git+https://github.com/p11-glue/p11-kit#commit=${_commit}"
+        "0001-Build-and-install-libnssckbi-p11-kit.so.patch")
 sha256sums=('SKIP'
             '0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798')
 
-_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
-
 pkgver() {
-  cd "$srcdir"/p11-kit
+  cd "${srcdir}"/p11-kit
   git describe --tags | sed 's/-/+/g'
 }
 
 prepare() {
-  cd "$srcdir"/p11-kit
-
+  cd "${srcdir}"/p11-kit
   # 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
   # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
   # https://bugs.freedesktop.org/show_bug.cgi?id=66161
   patch -Np1 -i ../0001-Build-and-install-libnssckbi-p11-kit.so.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "$srcdir"/p11-kit
+  cd "${srcdir}"/p11-kit
   for _arch in ${_architectures}; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ${_arch}-configure --disable-static --disable-silent-rules --disable-trust-module 
+    ${_arch}-configure --disable-static --disable-silent-rules --disable-trust-module
     make
     popd
   done
@@ -46,13 +49,14 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "$srcdir"/p11-kit/build-${_arch}
-    make install DESTDIR="$pkgdir"
-    rm "$pkgdir"/usr/${_arch}/bin/*.exe
-    rm -r "$pkgdir"/usr/${_arch}/libexec
-    rm -r "$pkgdir"/usr/${_arch}/etc
-    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
-    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
+    cd "${srcdir}"/p11-kit/build-${_arch}
+    make install DESTDIR="${pkgdir}"
+    rm "${pkgdir}"/usr/${_arch}/bin/*.exe
+    rm -r "${pkgdir}"/usr/${_arch}/libexec
+    rm -r "${pkgdir}"/usr/${_arch}/etc
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
   done
 }
 
+# vim:set ts=2 sw=2 et: