From: dmarto <dmarto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] opensc: update to 0.23.0.
Date: Sun, 04 Dec 2022 16:03:17 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40908@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
There is a new pull request by dmarto against master on the void-packages repository
https://github.com/dmarto/void-packages opensc
https://github.com/void-linux/void-packages/pull/40908
opensc: update to 0.23.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, **x86_64-glibc**
Supersedes & Closes https://github.com/void-linux/void-packages/pull/36846 _(opensc: revbump, move onepin-opensc-pkcs11.so to opensc-pkcs11)_
A patch file from https://github.com/void-linux/void-packages/pull/40908.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-opensc-40908.patch --]
[-- Type: text/x-diff, Size: 3672 bytes --]
From 934a9a0b5b92cbbc6613770793eb79737d8d191c Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Sun, 4 Dec 2022 16:51:02 +0200
Subject: [PATCH] opensc: update to 0.23.0.
---
...82ea46562b15221f428860b993e0519c6cbd.patch | 30 -------------------
srcpkgs/opensc/template | 28 ++++++++++-------
2 files changed, 18 insertions(+), 40 deletions(-)
delete mode 100644 srcpkgs/opensc/patches/0f7082ea46562b15221f428860b993e0519c6cbd.patch
diff --git a/srcpkgs/opensc/patches/0f7082ea46562b15221f428860b993e0519c6cbd.patch b/srcpkgs/opensc/patches/0f7082ea46562b15221f428860b993e0519c6cbd.patch
deleted file mode 100644
index d6d9aa1c329c..000000000000
--- a/srcpkgs/opensc/patches/0f7082ea46562b15221f428860b993e0519c6cbd.patch
+++ /dev/null
@@ -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 */
diff --git a/srcpkgs/opensc/template b/srcpkgs/opensc/template
index cadccca0839e..1687dae4471f 100644
--- a/srcpkgs/opensc/template
+++ b/srcpkgs/opensc/template
@@ -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
}
}
next reply other threads:[~2022-12-04 15:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-04 15:03 dmarto [this message]
2022-12-12 8:04 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40908@inbox.vuxu.org \
--to=dmarto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).