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 =================================================================== --- PKGBUILD 2017-05-26 13:54:04 UTC (rev 230470) +++ PKGBUILD 2017-05-26 13:54:19 UTC (rev 230471) @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer: Florian Pritz <bluew...@xinu.at> -# Contributor: Christoph Vigano <m...@cvigano.de> - -_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) +++ PKGBUILD 2017-05-26 13:54:19 UTC (rev 230471) @@ -0,0 +1,72 @@ +# $Id$ +# Maintainer: Florian Pritz <bluew...@xinu.at> +# Contributor: Christoph Vigano <m...@cvigano.de> + +_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} + + install -d "$pkgdir/usr/share/licenses" + ln -s ${_pkgbasename} "$pkgdir/usr/share/licenses/$pkgname" +} + +# vim:set ts=2 sw=2 et: Deleted: libnssckbi-compat.patch =================================================================== --- libnssckbi-compat.patch 2017-05-26 13:54:04 UTC (rev 230470) +++ libnssckbi-compat.patch 2017-05-26 13:54:19 UTC (rev 230471) @@ -1,57 +0,0 @@ -diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am ---- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200 -+++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300 -@@ -61,6 +61,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 -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c ---- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200 -+++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300 -@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens, - const char *label; - } labels[] = { - { "~/", "User Trust" }, -+#ifdef LIBNSSCKBI_COMPAT -+ { DATA_DIR, "Builtin Object Token" }, -+#else - { DATA_DIR, "Default Trust" }, -+#endif - { SYSCONFDIR, "System Trust" }, - { NULL }, - }; -@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, - info->flags = CKF_TOKEN_PRESENT; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - -- /* If too long, copy the first 64 characters into buffer */ -- path = p11_token_get_path (token); -+#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); - length = strlen (path); -+ /* If too long, copy the first 64 characters into buffer */ - if (length > sizeof (info->slotDescription)) - length = sizeof (info->slotDescription); - memset (info->slotDescription, ' ', sizeof (info->slotDescription)); Copied: lib32-p11-kit/repos/multilib-x86_64/libnssckbi-compat.patch (from rev 230470, lib32-p11-kit/trunk/libnssckbi-compat.patch) =================================================================== --- libnssckbi-compat.patch (rev 0) +++ libnssckbi-compat.patch 2017-05-26 13:54:19 UTC (rev 230471) @@ -0,0 +1,57 @@ +diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am +--- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200 ++++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300 +@@ -61,6 +61,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 -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c +--- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200 ++++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300 +@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens, + const char *label; + } labels[] = { + { "~/", "User Trust" }, ++#ifdef LIBNSSCKBI_COMPAT ++ { DATA_DIR, "Builtin Object Token" }, ++#else + { DATA_DIR, "Default Trust" }, ++#endif + { SYSCONFDIR, "System Trust" }, + { NULL }, + }; +@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, + info->flags = CKF_TOKEN_PRESENT; + strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); + +- /* If too long, copy the first 64 characters into buffer */ +- path = p11_token_get_path (token); ++#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); + length = strlen (path); ++ /* If too long, copy the first 64 characters into buffer */ + if (length > sizeof (info->slotDescription)) + length = sizeof (info->slotDescription); + memset (info->slotDescription, ' ', sizeof (info->slotDescription));