!1 opensc: update to 0.20.0

Merge pull request !1 from guoxiaoqi/next

CVE-2019-6502.patch

@@ -1,29 +0,0 @@
-From 0d7967549751b7032f22b437106b41444aff0ba9 Mon Sep 17 00:00:00 2001
-From: Scott Gayou <sgayou@redhat.com>
-Date: Fri, 1 Mar 2019 13:11:06 -0600
-Subject: [PATCH] Small memory leak fix (CVE-2019-6502 in #1586)
-
-CVE-2019-6502 was assigned to what appears to be a very minor
-memory leak that only occurs on an error-case in a CLI tool.
-If util_connect_card fails, we still need to release the sc
-context previously allocated by sc_context_create else memory
-will leak.
----
- src/tools/eidenv.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/tools/eidenv.c b/src/tools/eidenv.c
-index d8a7be6..d96ad4e 100644
---- a/src/tools/eidenv.c
-+++ b/src/tools/eidenv.c
-@@ -403,6 +403,7 @@ int main(int argc, char **argv)
- 	r = util_connect_card(ctx, &card, opt_reader, opt_wait, 0);
- 	if (r) {
- 		fprintf(stderr, "Failed to connect to card: %s\n", sc_strerror(r));
-+		sc_release_context(ctx);
- 		return 1;
- 	}
- 
--- 
-1.7.12.4
-

opensc.module

@@ -1,8 +0,0 @@
-# This file describes how to load the opensc module
-# See: http://p11-glue.freedesktop.org/doc/p11-kit/config.html
-
-# This is a relative path, which means it will be loaded from
-# the p11-kit default path which is usually $(libdir)/pkcs11.
-# Doing it this way allows for packagers to package opensc for
-# 32-bit and 64-bit and make them parallel installable
-module: opensc-pkcs11.so

opensc.spec

@@ -2,15 +2,12 @@
 %define nssdb %{_sysconfdir}/pki/nssdb
 
 Name:            opensc
-Version:         0.19.0
+Version:         0.20.0
-Release:         4
+Release:         1
 License:         LGPLv2.1+
 Summary:         Smart card library and applications
 URL:             https://github.com/OpenSC/OpenSC/wiki
 Source0:         https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
-Source1:         opensc.module
-Patch0:          opensc-0.19.0-rsa-pss.patch
-Patch6000:       CVE-2019-6502.patch
 
 BuildRequires:   openssl-devel pcsc-lite-devel bash-completion docbook-style-xsl readline-devel
 BuildRequires:   desktop-file-utils /usr/bin/xsltproc autoconf automake libtool gcc
@@ -51,7 +48,6 @@ make %{?_smp_mflags} V=1
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/opensc.conf
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/modules/opensc.module
 install -Dpm 644 etc/opensc.conf $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
 touch -r NEWS $RPM_BUILD_ROOT%{_sysconfdir}/opensc-%{_arch}.conf
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
@@ -103,6 +99,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.opensc.notify.de
 %{_bindir}/eidenv
 %{_bindir}/iasecc-tool
 %{_bindir}/gids-tool
+%{_bindir}/goid-tool
 %{_bindir}/netkey-tool
 %{_bindir}/openpgp-tool
 %{_bindir}/opensc-explorer
@@ -111,6 +108,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.opensc.notify.de
 %{_bindir}/opensc-notify
 %{_bindir}/piv-tool
 %{_bindir}/pkcs11-tool
+%{_bindir}/pkcs11-register
 %{_bindir}/pkcs15-crypt
 %{_bindir}/pkcs15-init
 %{_bindir}/pkcs15-tool
@@ -124,12 +122,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.opensc.notify.de
 %{_libdir}/pkcs11/opensc-pkcs11.so
 %{_libdir}/pkcs11/onepin-opensc-pkcs11.so
 %{_libdir}/pkcs11/pkcs11-spy.so
-%%dir %{_libdir}/pkcs11
+%dir %{_libdir}/pkcs11
 %{_datadir}/applications/org.opensc.notify.desktop
 %{_datadir}/opensc/
-%{_datadir}/p11-kit/modules/opensc.module
+%{_sysconfdir}/xdg/autostart/pkcs11-register.desktop
 
 %changelog
+* Sat Jan 11 2020 openEuler Buildteam <buildteam@openeuler.org> - 0.20.0-1
+- Update to 0.20.0
+
 * Mon Dec 16 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.19.0-4
 - Fix CVE-2019-6502