opensc: update to 0.23.0.

This commit is contained in:
Martin Dimov 2022-12-04 16:51:02 +02:00 committed by classabbyamp
parent 52e8a8cf81
commit 1411a02d39
2 changed files with 18 additions and 40 deletions

View File

@ -1,30 +0,0 @@
From 0f7082ea46562b15221f428860b993e0519c6cbd Mon Sep 17 00:00:00 2001
From: Veronika Hanulikova <vhanulik@redhat.com>
Date: Wed, 16 Feb 2022 11:59:27 +0100
Subject: [PATCH] Fix usage of pointer after realloc
---
src/sm/sm-iso.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sm/sm-iso.c b/src/sm/sm-iso.c
index 5baded77c6..2c3f6bcabd 100644
--- a/src/sm/sm-iso.c
+++ b/src/sm/sm-iso.c
@@ -181,13 +181,14 @@ static int format_le(size_t le, struct sc_asn1_entry *le_entry,
static int prefix_buf(u8 prefix, u8 *buf, size_t buflen, u8 **cat)
{
- u8 *p;
+ u8 *p = NULL;
+ int ptr_same = *cat == buf;
p = realloc(*cat, buflen + 1);
if (!p)
return SC_ERROR_OUT_OF_MEMORY;
- if (*cat == buf) {
+ if (ptr_same) {
memmove(p + 1, p, buflen);
} else {
/* Flawfinder: ignore */

View File

@ -1,10 +1,11 @@
# Template file for 'opensc'
pkgname=opensc
version=0.22.0
revision=2
version=0.23.0
revision=1
build_style=gnu-configure
configure_args="--enable-man --enable-sm --enable-static=no --enable-doc
--with-xsl-stylesheetsdir=/usr/share/xsl/docbook"
configure_args="--enable-static=no --enable-doc --enable-man
--with-xsl-stylesheetsdir=/usr/share/xsl/docbook
--with-completiondir=/usr/share/bash-completion/completions"
hostmakedepends="automake docbook-xsl libtool libxslt pkg-config"
makedepends="openssl-devel pcsclite-devel readline-devel zlib-devel"
short_desc="Tools and libraries for smart cards"
@ -12,25 +13,32 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/OpenSC/OpenSC/wiki"
distfiles="https://github.com/OpenSC/OpenSC/archive/${version}.tar.gz"
checksum=138acf5724573d68bdfaf988bb05c00391edbfe262e69835813ed6bd00748c7a
checksum=a08b475834e3c3b0efd9bfc46adfcc3440d3975c2fb3ab2ef29342b879d41370
conf_files="/etc/opensc.conf"
CFLAGS="-Wno-error=format-overflow"
pre_configure() {
autoreconf -fi
}
post_install() {
vmkdir usr/share/bash-completion/completions
mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions
# we don't build npa-tool (missing OpenPACE)
rm ${DESTDIR}/usr/share/man/man1/npa-tool.1
# we don't build opensc-notify
rm ${DESTDIR}/usr/share/applications/org.opensc.notify.desktop
rm ${DESTDIR}/usr/share/bash-completion/completions/opensc-notify
}
opensc-pkcs11_package() {
short_desc+=" - pkcs11 library"
pkg_install() {
vmove usr/lib/pkcs11
vmove "usr/lib/opensc-pkcs11*"
vmove usr/lib/opensc-pkcs11.so
vmove usr/lib/onepin-opensc-pkcs11.so
vmove usr/lib/pkcs11-spy.so
vmove usr/lib/pkcs11
vmove usr/lib/pkgconfig/opensc-pkcs11.pc
}
}