diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-07-19 08:40:35 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-07-19 08:40:35 +0300 |
| commit | 046e4f557e22832b7c3c813155f0f17fb284f696 (patch) | |
| tree | c9a6204a3f2f2c772034f26d7593d01d526c37ca | |
| parent | d6c4d7452f4460587d45d92bdd698554def6a20a (diff) | |
| download | aports-046e4f557e22832b7c3c813155f0f17fb284f696.tar.bz2 aports-046e4f557e22832b7c3c813155f0f17fb284f696.tar.xz | |
community/opensc: upgrade to 0.17.0
| -rw-r--r-- | community/opensc/APKBUILD | 27 | ||||
| -rw-r--r-- | community/opensc/libressl.patch | 22 |
2 files changed, 10 insertions, 39 deletions
diff --git a/community/opensc/APKBUILD b/community/opensc/APKBUILD index 501c6502f7..8d18ab5c9d 100644 --- a/community/opensc/APKBUILD +++ b/community/opensc/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> -# Maintainer: +# Maintainer: Timo Teräs <timo.teras@iki.fi> pkgname=opensc _realname=OpenSC -pkgver=0.16.0 -pkgrel=2 +pkgver=0.17.0 +pkgrel=0 pkgdesc="Open source smart card tools and middleware" url="https://github.com/OpenSC/OpenSC" arch="all" @@ -13,14 +13,13 @@ depends_dev="zlib-dev pcsc-lite-dev libressl-dev readline-dev" makedepends="$depends_dev automake autoconf m4 gettext libtool" install="" subpackages="$pkgname-dev $pkgname-doc" -source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz - libressl.patch" +source="$_realname-${pkgver}.tar.gz::https://github.com/OpenSC/OpenSC/archive/${pkgver}.tar.gz" builddir="$srcdir/$_realname-$pkgver" build() { cd "$builddir" - ./bootstrap || return 1 + ./bootstrap ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -33,21 +32,15 @@ build() { --enable-readline \ --enable-openssl \ --enable-pcsc \ - --enable-sm \ - || return 1 - make || return 1 + --enable-sm + make } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -D -m644 etc/opensc.conf \ - "$pkgdir/etc/opensc.conf" || return 1 + "$pkgdir/etc/opensc.conf" } -md5sums="4148305139a80ec3d5db8bcccc89217f OpenSC-0.16.0.tar.gz -2af60aeea860dccc07a368546bec24c3 libressl.patch" -sha256sums="4969627f0eab48bef6a5d9e162facc3a49ba8e675fadb8a9a446391fcfa19bc6 OpenSC-0.16.0.tar.gz -1685e2da7d5c2c3e6a7e8e831c812ee1592baadf7321b4dcb41f56cc6fff5d65 libressl.patch" -sha512sums="87fb163eafa6a09b9f5495d8f00ec7abb914ab957282b0e03839afafb73484c8e9fdb2e8295c2a968b80d9f15b26edc358068d796fb1e29f532962552637f2b6 OpenSC-0.16.0.tar.gz -6405ee573202112283ae7c1a7d667c523d3401e7d4b66109fa8ef8127d2da15b6cfd127e355679c7ea20a8cb93af3923c8560745915612b5df12da57781c2fb0 libressl.patch" +sha512sums="1576a9ca58e80c95b23bf53fba03b14b174361c054a3e836bcfbe96765308a2ba807b819e0d617707fdef32ce2e3ae1ab74766bc1e82eeaf218d48a18ec8e67f OpenSC-0.17.0.tar.gz" diff --git a/community/opensc/libressl.patch b/community/opensc/libressl.patch deleted file mode 100644 index 003328e000..0000000000 --- a/community/opensc/libressl.patch +++ /dev/null @@ -1,22 +0,0 @@ -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); |