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

Jan Steffens heftig at archlinux.org
Sun Jun 17 21:20:13 UTC 2018


    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: <ec8bb05e15640b1857b94ded128bc33ca7ec7fe0.1519917784.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-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: <ec8bb05e15640b1857b94ded128bc33ca7ec7fe0.1519917784.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+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
===================================================================
--- PKGBUILD	2018-06-17 21:19:47 UTC (rev 343493)
+++ PKGBUILD	2018-06-17 21:20:12 UTC (rev 343494)
@@ -1,71 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Christoph Vigano <mail at cvigano.de>
-
-pkgname=lib32-p11-kit
-pkgver=0.23.11
-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 p11-kit)
-makedepends=(git)
-_commit=e4c5d3b34941bdc433072a492a0a7fdbddba0cc2  # tags/0.23.11^0
-source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit"
-        0001-Build-and-install-libnssckbi-p11-kit.so.patch)
-sha256sums=('SKIP'
-            '0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798')
-validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
-
-pkgver() {
-  cd p11-kit
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  cd 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 p11-kit
-
-  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 p11-kit
-  make check
-}
-
-package() {
-  cd p11-kit
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share}
-
-  install -d "$pkgdir/usr/share/licenses"
-  ln -s p11-kit "$pkgdir/usr/share/licenses/$pkgname"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: lib32-p11-kit/repos/multilib-x86_64/PKGBUILD (from rev 343493, lib32-p11-kit/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-17 21:20:12 UTC (rev 343494)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Christoph Vigano <mail at cvigano.de>
+
+pkgname=lib32-p11-kit
+pkgver=0.23.12
+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 p11-kit)
+makedepends=(git)
+_commit=3dd5810143e51dabdc58069e55b09a950349fa08  # tags/0.23.12^0
+source=("git+https://github.com/p11-glue/p11-kit#commit=$_commit"
+        0001-Build-and-install-libnssckbi-p11-kit.so.patch)
+sha256sums=('SKIP'
+            '0736f74cec5ca49d91afa47cd84f9ac0404947bf0064358e22c3e53b69e82798')
+validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
+
+pkgver() {
+  cd p11-kit
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd 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 p11-kit
+
+  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 p11-kit
+  make check
+}
+
+package() {
+  cd p11-kit
+  make DESTDIR="$pkgdir" install
+
+  rm -rf "${pkgdir}"/etc "${pkgdir}"/usr/{bin,include,lib,share}
+
+  install -d "$pkgdir/usr/share/licenses"
+  ln -s p11-kit "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list