Skip to content
Snippets Groups Projects
Commit eead0b60 authored by Timo Teräs's avatar Timo Teräs
Browse files

testing/opensc: upgrade to 0.16.0, fix libressl issue

- libressl fix from void linux patches
parent 3678eef2
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Maintainer: # Maintainer:
pkgname=opensc pkgname=opensc
_realname=OpenSC _realname=OpenSC
pkgver=0.15.0 pkgver=0.16.0
pkgrel=1 pkgrel=0
pkgdesc="Open source smart card tools and middleware" pkgdesc="Open source smart card tools and middleware"
url="https://github.com/OpenSC/OpenSC" url="https://github.com/OpenSC/OpenSC"
arch="all" arch="all"
...@@ -13,22 +13,13 @@ depends_dev="zlib-dev pcsc-lite-dev libressl-dev readline-dev" ...@@ -13,22 +13,13 @@ depends_dev="zlib-dev pcsc-lite-dev libressl-dev readline-dev"
makedepends="$depends_dev automake autoconf m4 gettext libtool" makedepends="$depends_dev automake autoconf m4 gettext libtool"
install="" install=""
subpackages="$pkgname-dev $pkgname-doc" subpackages="$pkgname-dev $pkgname-doc"
source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz" source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz
libressl.patch"
_builddir="$srcdir/$_realname-$pkgver" builddir="$srcdir/$_realname-$pkgver"
prepare() {
local i
cd "$_builddir"
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
}
build() { build() {
cd "$_builddir" cd "$builddir"
./bootstrap || return 1 ./bootstrap || return 1
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
...@@ -48,12 +39,15 @@ build() { ...@@ -48,12 +39,15 @@ build() {
} }
package() { package() {
cd "$_builddir" cd "$builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install || return 1
install -D -m644 etc/opensc.conf \ install -D -m644 etc/opensc.conf \
"$pkgdir/etc/opensc.conf" || return 1 "$pkgdir/etc/opensc.conf" || return 1
} }
md5sums="f266024e5a9630821ffa0ac14f72e369 OpenSC-0.15.0.tar.gz" md5sums="4148305139a80ec3d5db8bcccc89217f OpenSC-0.16.0.tar.gz
sha256sums="8f8f8cf52e0252334e4dfdccca829b876a3de6340deb772aa0bfe0c0cc10eaf5 OpenSC-0.15.0.tar.gz" 2af60aeea860dccc07a368546bec24c3 libressl.patch"
sha512sums="35bfab19ada7bf8f65eb2bb28788f732c831bf02faeb4e1520e1bdfe77754c35c1f1b5785c542bb924a327caa47de044a17a53570e4e7fad677330ab1e1bf5f1 OpenSC-0.15.0.tar.gz" sha256sums="4969627f0eab48bef6a5d9e162facc3a49ba8e675fadb8a9a446391fcfa19bc6 OpenSC-0.16.0.tar.gz
1685e2da7d5c2c3e6a7e8e831c812ee1592baadf7321b4dcb41f56cc6fff5d65 libressl.patch"
sha512sums="87fb163eafa6a09b9f5495d8f00ec7abb914ab957282b0e03839afafb73484c8e9fdb2e8295c2a968b80d9f15b26edc358068d796fb1e29f532962552637f2b6 OpenSC-0.16.0.tar.gz
6405ee573202112283ae7c1a7d667c523d3401e7d4b66109fa8ef8127d2da15b6cfd127e355679c7ea20a8cb93af3923c8560745915612b5df12da57781c2fb0 libressl.patch"
https://raw.githubusercontent.com/voidlinux/void-packages/4b22d402a290a6192853dd3994e24128023a3b7e/srcpkgs/opensc/patches/libressl.patch
--- a/src/pkcs11/openssl.c.orig 2016-06-05 18:51:11.947157265 +0200
+++ b/src/pkcs11/openssl.c 2016-06-05 18:55:21.067170117 +0200
@@ -180,7 +180,7 @@
e = ENGINE_by_id("gost");
if (!e)
{
-#if !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
+#if !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST)
ENGINE_load_gost();
e = ENGINE_by_id("gost");
#else
@@ -195,7 +195,7 @@
ENGINE_free(e);
e = NULL;
}
-#endif /* !OPENSSL_NO_STATIC_ENGINE && !OPENSSL_NO_GOST */
+#endif /* !defined(LIBRESSL_VERSION_NUMBER) && !defined(OPENSSL_NO_STATIC_ENGINE) && !defined(OPENSSL_NO_GOST) */
}
if (e) {
ENGINE_set_default(e, ENGINE_METHOD_ALL);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment