[arch-commits] Commit in lib32-p11-kit/repos/multilib-x86_64 (4 files)

2018-06-17 Thread Jan Steffens via arch-commits 
Date: Sunday, June 17, 2018 @ 21:20:12
  Author: heftig
Revision: 343494

archrelease: copy trunk to multilib-x86_64

Added:
  
lib32-p11-kit/repos/multilib-x86_64/0001-Build-and-install-libnssckbi-p11-kit.so.patch
(from rev 343493, 
lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch)
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
(from rev 343493, lib32-p11-kit/trunk/PKGBUILD)
Deleted:
  
lib32-p11-kit/repos/multilib-x86_64/0001-Build-and-install-libnssckbi-p11-kit.so.patch
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD

+
 0001-Build-and-install-libnssckbi-p11-kit.so.patch |  152 +--
 PKGBUILD   |  142 -
 2 files changed, 147 insertions(+), 147 deletions(-)

Deleted: 0001-Build-and-install-libnssckbi-p11-kit.so.patch
===
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch  2018-06-17 21:19:47 UTC 
(rev 343493)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch  2018-06-17 21:20:12 UTC 
(rev 343494)
@@ -1,76 +0,0 @@
-From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
-Message-Id: 

-From: "Jan Alexander Steffens (heftig)" 
-Date: Thu, 1 Mar 2018 16:20:59 +0100
-Subject: [PATCH] Build and install libnssckbi-p11-kit.so
-
-Create an additional library 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

- trust/Makefile.am | 14 ++
- trust/module.c| 12 +++-
- 2 files changed, 25 insertions(+), 1 deletion(-)
-
-diff --git a/trust/Makefile.am b/trust/Makefile.am
-index 6e52c4d..157a1d9 100644
 a/trust/Makefile.am
-+++ b/trust/Makefile.am
-@@ -66,6 +66,20 @@ p11_kit_trust_la_LDFLAGS = \
- 
- p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
- 
-+libnssckbi_compatdir = $(libdir)
-+libnssckbi_compat_LTLIBRARIES = \
-+  libnssckbi-p11-kit.la
-+
-+libnssckbi_p11_kit_la_CFLAGS = \
-+  -DLIBNSSCKBI_COMPAT \
-+  $(p11_kit_trust_la_CFLAGS)
-+
-+libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD)
-+
-+libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS)
-+
-+libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES)
-+
- libtrust_testable_la_LDFLAGS = \
-   -no-undefined
- 
-diff --git a/trust/module.c b/trust/module.c
-index e8b7256..d578a90 100644
 a/trust/module.c
-+++ b/trust/module.c
-@@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens,
-   int flags;
-   } labels[] = {
-   { "~/", "User Trust", P11_TOKEN_FLAG_NONE },
-+#ifdef LIBNSSCKBI_COMPAT
-+  { P11_DEFAULT_TRUST_PREFIX, "Builtin Object Token", 
P11_TOKEN_FLAG_WRITE_PROTECTED },
-+#else
-   { P11_DEFAULT_TRUST_PREFIX, "Default Trust", 
P11_TOKEN_FLAG_WRITE_PROTECTED },
-+#endif
-   { P11_SYSTEM_TRUST_PREFIX, "System Trust", P11_TOKEN_FLAG_NONE 
},
-   { NULL },
-   };
-@@ -529,8 +533,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
-   info->flags = CKF_TOKEN_PRESENT;
-   strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
- 
-+#ifdef LIBNSSCKBI_COMPAT
-+  /* Change description to match libnssckbi so HPKP works in 
Chromium */
-+  if (strcmp (p11_token_get_label (token), "Builtin Object 
Token") == 0)
-+  path = "NSS Builtin Objects";
-+  else
-+#endif
-+  path = p11_token_get_path (token);
-   /* If too long, copy the first 64 characters into buffer */
--  path = p11_token_get_path (token);
-   length = strlen (path);
-   if (length > sizeof (info->slotDescription))
-   length = sizeof (info->slotDescription);
--- 
-2.16.1
-

Copied: 
lib32-p11-kit/repos/multilib-x86_64/0001-Build-and-install-libnssckbi-p11-kit.so.patch
 (from rev 343493, 
lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch)
===
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch  
(rev 0)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch  2018-06-17 21:20:12 UTC 
(rev 343494)
@@ -0,0 +1,76 @@
+From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
+Message-Id: 

+From: "Jan Alexander Steffens (heftig)" 
+Date: Thu, 1 Mar 2018 16:20:59 +0100
+Subject: [PATCH] Build and install libnssckbi-p11-kit.so
+
+Create an additional library 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
+---
+ trust/Makefile.am | 14 ++
+ trust/module.c| 12 +++-
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff

[arch-commits] Commit in lib32-p11-kit/repos/multilib-x86_64 (4 files)

2018-03-24 Thread Jan Steffens via arch-commits 
Date: Saturday, March 24, 2018 @ 15:01:06
  Author: heftig
Revision: 311954

archrelease: copy trunk to multilib-x86_64

Added:
  
lib32-p11-kit/repos/multilib-x86_64/0001-Build-and-install-libnssckbi-p11-kit.so.patch
(from rev 311953, 
lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch)
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
(from rev 311953, lib32-p11-kit/trunk/PKGBUILD)
Deleted:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch

+
 0001-Build-and-install-libnssckbi-p11-kit.so.patch |   76 ++
 PKGBUILD   |  143 +--
 libnssckbi-compat.patch|   57 ---
 3 files changed, 147 insertions(+), 129 deletions(-)

Copied: 
lib32-p11-kit/repos/multilib-x86_64/0001-Build-and-install-libnssckbi-p11-kit.so.patch
 (from rev 311953, 
lib32-p11-kit/trunk/0001-Build-and-install-libnssckbi-p11-kit.so.patch)
===
--- 0001-Build-and-install-libnssckbi-p11-kit.so.patch  
(rev 0)
+++ 0001-Build-and-install-libnssckbi-p11-kit.so.patch  2018-03-24 15:01:06 UTC 
(rev 311954)
@@ -0,0 +1,76 @@
+From ec8bb05e15640b1857b94ded128bc33ca7ec7fe0 Mon Sep 17 00:00:00 2001
+Message-Id: 

+From: "Jan Alexander Steffens (heftig)" 
+Date: Thu, 1 Mar 2018 16:20:59 +0100
+Subject: [PATCH] Build and install libnssckbi-p11-kit.so
+
+Create an additional library 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
+---
+ trust/Makefile.am | 14 ++
+ trust/module.c| 12 +++-
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/trust/Makefile.am b/trust/Makefile.am
+index 6e52c4d..157a1d9 100644
+--- a/trust/Makefile.am
 b/trust/Makefile.am
+@@ -66,6 +66,20 @@ p11_kit_trust_la_LDFLAGS = \
+ 
+ p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
+ 
++libnssckbi_compatdir = $(libdir)
++libnssckbi_compat_LTLIBRARIES = \
++  libnssckbi-p11-kit.la
++
++libnssckbi_p11_kit_la_CFLAGS = \
++  -DLIBNSSCKBI_COMPAT \
++  $(p11_kit_trust_la_CFLAGS)
++
++libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD)
++
++libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS)
++
++libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES)
++
+ libtrust_testable_la_LDFLAGS = \
+   -no-undefined
+ 
+diff --git a/trust/module.c b/trust/module.c
+index e8b7256..d578a90 100644
+--- a/trust/module.c
 b/trust/module.c
+@@ -201,7 +201,11 @@ create_tokens_inlock (p11_array *tokens,
+   int flags;
+   } labels[] = {
+   { "~/", "User Trust", P11_TOKEN_FLAG_NONE },
++#ifdef LIBNSSCKBI_COMPAT
++  { P11_DEFAULT_TRUST_PREFIX, "Builtin Object Token", 
P11_TOKEN_FLAG_WRITE_PROTECTED },
++#else
+   { P11_DEFAULT_TRUST_PREFIX, "Default Trust", 
P11_TOKEN_FLAG_WRITE_PROTECTED },
++#endif
+   { P11_SYSTEM_TRUST_PREFIX, "System Trust", P11_TOKEN_FLAG_NONE 
},
+   { NULL },
+   };
+@@ -529,8 +533,14 @@ sys_C_GetSlotInfo (CK_SLOT_ID id,
+   info->flags = CKF_TOKEN_PRESENT;
+   strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32);
+ 
++#ifdef LIBNSSCKBI_COMPAT
++  /* Change description to match libnssckbi so HPKP works in 
Chromium */
++  if (strcmp (p11_token_get_label (token), "Builtin Object 
Token") == 0)
++  path = "NSS Builtin Objects";
++  else
++#endif
++  path = p11_token_get_path (token);
+   /* If too long, copy the first 64 characters into buffer */
+-  path = p11_token_get_path (token);
+   length = strlen (path);
+   if (length > sizeof (info->slotDescription))
+   length = sizeof (info->slotDescription);
+-- 
+2.16.1
+

Deleted: PKGBUILD
===
--- PKGBUILD2018-03-24 15:00:34 UTC (rev 311953)
+++ PKGBUILD2018-03-24 15:01:06 UTC (rev 311954)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz 
-# Contributor: Christoph Vigano 
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.23.9
-pkgrel=1
-pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
-arch=(x86_64)
-url="https://p11-glue.freedesktop.org;
-license=(BSD)
-depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
-makedepends=(git)
-_commit=34cb047e20af02ef3d820a295e9e29f618b83bab  # tags/0.23.9^0
-source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit;
-libnssckbi-compat.patch)

[arch-commits] Commit in lib32-p11-kit/repos/multilib-x86_64 (4 files)

2017-10-01 Thread Jan Steffens 
Date: Sunday, October 1, 2017 @ 09:45:17
  Author: heftig
Revision: 261159

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
(from rev 261158, lib32-p11-kit/trunk/PKGBUILD)
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch
(from rev 261158, lib32-p11-kit/trunk/libnssckbi-compat.patch)
Deleted:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch

-+
 PKGBUILD|  144 +++---
 libnssckbi-compat.patch |  114 ++--
 2 files changed, 129 insertions(+), 129 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-10-01 09:44:42 UTC (rev 261158)
+++ PKGBUILD2017-10-01 09:45:17 UTC (rev 261159)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz 
-# Contributor: Christoph Vigano 
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.23.7
-pkgrel=1
-pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
-arch=(x86_64)
-url="https://p11-glue.freedesktop.org;
-license=(BSD)
-depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
-makedepends=(git)
-_commit=bf168f00e64a0291f5a718eb451915768659c160  # tags/0.23.7^0
-source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit;
-libnssckbi-compat.patch)
-sha256sums=('SKIP'
-'8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
-validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
-
-pkgver() {
-  cd ${_pkgbasename}
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  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
-  # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
-  # https://bugs.freedesktop.org/show_bug.cgi?id=66161
-  patch -Np1 -i ../libnssckbi-compat.patch
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd ${_pkgbasename}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./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
-}
-
-check() {
-  cd ${_pkgbasename}
-  make check
-}
-
-package() {
-  cd ${_pkgbasename}
-  make DESTDIR="$pkgdir" install
-
-  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:

Copied: lib32-p11-kit/repos/multilib-x86_64/PKGBUILD (from rev 261158, 
lib32-p11-kit/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-10-01 09:45:17 UTC (rev 261159)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Florian Pritz 
+# Contributor: Christoph Vigano 
+
+_pkgbasename=p11-kit
+pkgname=lib32-$_pkgbasename
+pkgver=0.23.8
+pkgrel=1
+pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
+arch=(x86_64)
+url="https://p11-glue.freedesktop.org;
+license=(BSD)
+depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
+makedepends=(git)
+_commit=25474901cf9c1fb39ae5dc73a2f2b4dd34e81fdc  # tags/0.23.8^0
+source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit;
+libnssckbi-compat.patch)
+sha256sums=('SKIP'
+'8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
+validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
+
+pkgver() {
+  cd ${_pkgbasename}
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  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
+  # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
+  # https://bugs.freedesktop.org/show_bug.cgi?id=66161
+  patch -Np1 -i ../libnssckbi-compat.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd ${_pkgbasename}
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./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
+}
+
+check() {
+  cd ${_pkgbasename}
+  make check
+}
+
+package() {
+  cd ${_pkgbasename}
+  make DESTDIR="$pkgdir" install
+
+

[arch-commits] Commit in lib32-p11-kit/repos/multilib-x86_64 (4 files)

2017-05-26 Thread Jan Steffens 
Date: Friday, May 26, 2017 @ 13:54:19
  Author: heftig
Revision: 230471

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
(from rev 230470, lib32-p11-kit/trunk/PKGBUILD)
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch
(from rev 230470, lib32-p11-kit/trunk/libnssckbi-compat.patch)
Deleted:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch

-+
 PKGBUILD|  133 --
 libnssckbi-compat.patch |  114 +++
 2 files changed, 129 insertions(+), 118 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2017-05-26 13:54:04 UTC (rev 230470)
+++ PKGBUILD2017-05-26 13:54:19 UTC (rev 230471)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz 
-# Contributor: Christoph Vigano 
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.23.2
-pkgrel=1
-pkgdesc="Library to work with PKCS#11 modules (32-bit)"
-arch=(x86_64)
-url="http://p11-glue.freedesktop.org;
-license=('BSD')
-depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
-options=(!libtool)
-source=($url/releases/$_pkgbasename-$pkgver.tar.gz{,.sig}
-libnssckbi-compat.patch)
-validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF)
-sha256sums=('ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0'
-'SKIP'
-'8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
-
-prepare() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  # 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 ../libnssckbi-compat.patch
-
-  autoreconf -vi
-}
-
-build() {
-  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 \
---with-module-path=/usr/lib32/pkcs11 \
-
--with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
-  make
-}
-
-check() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  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"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lib32-p11-kit/repos/multilib-x86_64/PKGBUILD (from rev 230470, 
lib32-p11-kit/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2017-05-26 13:54:19 UTC (rev 230471)
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer: Florian Pritz 
+# Contributor: Christoph Vigano 
+
+_pkgbasename=p11-kit
+pkgname=lib32-$_pkgbasename
+pkgver=0.23.5
+pkgrel=1
+pkgdesc="Provides a way to load and enumerate PKCS#11 modules (32-bit)"
+arch=(x86_64)
+url="https://p11-glue.freedesktop.org;
+license=(BSD)
+depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
+makedepends=(git)
+_commit=817a1c67c407850ab1756fdacb1c38e4bded5509  # tags/0.23.5^0
+source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit;
+libnssckbi-compat.patch)
+sha256sums=('SKIP'
+'8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
+validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
+
+pkgver() {
+  cd ${_pkgbasename}
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  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
+  # libnssckbi.so ("Builtin Object Token" instead of "Default Trust")
+  # https://bugs.freedesktop.org/show_bug.cgi?id=66161
+  patch -Np1 -i ../libnssckbi-compat.patch
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd ${_pkgbasename}
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./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
+}
+
+check() {
+  cd ${_pkgbasename}
+  make check
+}
+
+package() {
+  cd ${_pkgbasename}
+  make DESTDIR="$pkgdir" install
+
+  rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share}
+
+

[arch-commits] Commit in lib32-p11-kit/repos/multilib-x86_64 (4 files)

2016-01-03 Thread Felix Yan 
Date: Monday, January 4, 2016 @ 04:17:36
  Author: fyan
Revision: 155247

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
(from rev 155246, lib32-p11-kit/trunk/PKGBUILD)
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch
(from rev 155246, lib32-p11-kit/trunk/libnssckbi-compat.patch)
Deleted:
  lib32-p11-kit/repos/multilib-x86_64/PKGBUILD
  lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch

-+
 PKGBUILD|  122 +++---
 libnssckbi-compat.patch |  114 +-
 2 files changed, 118 insertions(+), 118 deletions(-)

Deleted: PKGBUILD
===
--- PKGBUILD2016-01-04 03:17:14 UTC (rev 155246)
+++ PKGBUILD2016-01-04 03:17:36 UTC (rev 155247)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz 
-# Contributor: Christoph Vigano 
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.23.1
-pkgrel=2
-pkgdesc="Library to work with PKCS#11 modules (32-bit)"
-arch=(x86_64)
-url="http://p11-glue.freedesktop.org;
-license=('BSD')
-depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
-options=(!libtool)
-source=($url/releases/$_pkgbasename-$pkgver.tar.gz{,.sig}
-libnssckbi-compat.patch)
-validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF)
-md5sums=('96f073270c489c9a594e1c9413f42db8'
- 'SKIP'
- '8c3f119005908cf4a3e0ef0a0a310f14')
-
-prepare() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  # 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 ../libnssckbi-compat.patch
-
-  autoreconf -vi
-}
-
-build() {
-  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 \
---with-module-path=/usr/lib32/pkcs11 \
-
--with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
-  make
-}
-
-check() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-  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"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lib32-p11-kit/repos/multilib-x86_64/PKGBUILD (from rev 155246, 
lib32-p11-kit/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2016-01-04 03:17:36 UTC (rev 155247)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Florian Pritz 
+# Contributor: Christoph Vigano 
+
+_pkgbasename=p11-kit
+pkgname=lib32-$_pkgbasename
+pkgver=0.23.2
+pkgrel=1
+pkgdesc="Library to work with PKCS#11 modules (32-bit)"
+arch=(x86_64)
+url="http://p11-glue.freedesktop.org;
+license=('BSD')
+depends=(lib32-glibc lib32-libtasn1 lib32-libffi $_pkgbasename)
+options=(!libtool)
+source=($url/releases/$_pkgbasename-$pkgver.tar.gz{,.sig}
+libnssckbi-compat.patch)
+validpgpkeys=(C0F67099B808FB063E2C81117BFB1108D92765AF)
+sha256sums=('ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0'
+'SKIP'
+'8f763cdbc6c0ca6c5a7898f9fd6f3018b7ac5b1aca36f67c6c813343c2962962')
+
+prepare() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+
+  # 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 ../libnssckbi-compat.patch
+
+  autoreconf -vi
+}
+
+build() {
+  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 \
+--with-module-path=/usr/lib32/pkcs11 \
+
--with-trust-paths=/etc/ca-certificates/trust-source:/usr/share/ca-certificates/trust-source
+  make
+}
+
+check() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  make check
+}
+
+package() {
+  cd "$srcdir/$_pkgbasename-$pkgver"
+  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"
+}
+
+# vim:set ts=2 sw=2 et: