mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 05:17:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/p11-kit: upgrade to 0.23.10

Browse Source
This commit is contained in:
Natanael Copa 2018-04-27 07:38:25 +00:00
parent a95494eedf
commit 474e675ebf
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
main/p11-kit/APKBUILD
View File

@ -1,8 +1,8 @@
# Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
# Maintainer: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
pkgname=p11-kit pkgname=p11-kit
pkgver=0.23.2 pkgver=0.23.10
pkgrel=2 pkgrel=0
pkgdesc="Library for loading and sharing PKCS#11 modules" pkgdesc="Library for loading and sharing PKCS#11 modules"
url="https://p11-glue.freedesktop.org/" url="https://p11-glue.freedesktop.org/"
arch="all" arch="all"
@ -11,8 +11,9 @@ depends=""
depends_dev="" depends_dev=""
makedepends="libtasn1-dev libffi-dev" makedepends="libtasn1-dev libffi-dev"
install="" install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-trust" subpackages="$pkgname-dev $pkgname-doc $pkgname-trust $pkgname-server"
source="https://p11-glue.freedesktop.org/releases/$pkgname-$pkgver.tar.gz" source="https://github.com/p11-glue/p11-kit/releases/download/$pkgver/p11-kit-$pkgver.tar.gz
strerror_l.patch"
builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
build() { build() {
@ -35,20 +36,36 @@ check() {
package() { package() {
cd "$builddir" cd "$builddir"
make DESTDIR="$pkgdir" install make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc/$pkgname
mv "${pkgdir}"/etc/pkcs11/pkcs11.conf.example "$pkgdir"/usr/share/doc/$pkgname/
} }
trust() { trust() {
pkgdesc="System trust module from $pkgname" pkgdesc="System trust module from $pkgname"
mkdir -p "$subpkgdir"/usr/share/p11-kit/modules \ mkdir -p "$subpkgdir"/usr/share/p11-kit/modules \
"$subpkgdir"/usr/lib/p11-kit \ "$subpkgdir"/usr/libexec/p11-kit \
"$subpkgdir"/usr/lib/pkcs11 "$subpkgdir"/usr/lib/pkcs11 \
"$subpkgdir"/usr/bin
mv "$pkgdir"/usr/lib/p11-kit/trust-extract-compat \ mv "$pkgdir"/usr/libexec/p11-kit/trust-extract-compat \
"$subpkgdir"/usr/lib/p11-kit/ "$subpkgdir"/usr/libexec/p11-kit/
mv "$pkgdir"/usr/share/p11-kit/modules/p11-kit-trust.module \ mv "$pkgdir"/usr/share/p11-kit/modules/p11-kit-trust.module \
"$subpkgdir"/usr/share/p11-kit/modules/ "$subpkgdir"/usr/share/p11-kit/modules/
mv "$pkgdir"/usr/lib/pkcs11/p11-kit-trust.so \ mv "$pkgdir"/usr/lib/pkcs11/p11-kit-trust.so \
"$subpkgdir"/usr/lib/pkcs11/ "$subpkgdir"/usr/lib/pkcs11/
mv "$pkgdir"/usr/bin/trust "$subpkgdir"/usr/bin/
} }
sha512sums="b665d89f0d752a41b01ec53e29c801c4fdcaf3f21fce524984b10acef0477ad5dbac085edd35ffb747423d0e1e09660b8d29501c979cf54937d3b9d2561cf18f p11-kit-0.23.2.tar.gz" server() {
pkgdesc="Server and client commands for $pkgname"
mkdir -p "$subpkgdir"/usr/lib/pkcs11 \
"$subpkgdir"/usr/libexec/p11-kit \
"$subpkgdir"/etc/init.d
mv "$pkgdir"/usr/lib/pkcs11/p11-kit-client.so \
"$subpkgdir"/usr/lib/pkcs11
mv "$pkgdir"/usr/libexec/p11-kit/p11-kit-server \
"$subpkgdir"/usr/libexec/p11-kit
}
sha512sums="42a004613f951e4e18c10cd204bcba348267cc7b3ae0d9f26d69012b086af446947660575d5751539b8d4dd77fa9b684054ad5ac978119e0a2e94fcdf9842178 p11-kit-0.23.10.tar.gz
9b27fa8a38fac7ea6a3370f6a985a01cf5db5c2ac763acd0e6741dcf1269fdfd2222dccb6281a0f2d1f8553d0da8b5bd17bc0a31477ac49c189d43f1827ce473 strerror_l.patch"

14
main/p11-kit/strerror_l.patch Normal file
View File

@ -0,0 +1,14 @@
reported upstream:
https://github.com/p11-glue/p11-kit/issues/147
--- ./common/message.c.orig
+++ ./common/message.c
@@ -118,7 +118,7 @@
buffer[length] = 0;
snprintf (strerr, sizeof (strerr), "Unknown error %d", errnum);
-#ifdef HAVE_STRERROR_L
+#if defined(HAVE_STRERROR_L) && defined(__GLIBC__)
loc = uselocale ((locale_t) 0);
if (loc != NULL)
strncpy (strerr, strerror_l (errnum, loc), sizeof (strerr));