Accepting request 621916 from security:chipcard

- Update to version 0.18.0:
  * Further improvements of PIN support.
  * Large number of improvements and fixes
    (boo#1097951, boo#1100501).
  * See /usr/share/doc/packages/opensc/NEWS for complete list.
- Add opensc-desktop.patch, opensc-desktop2.patch and
  opensc-bash-completions.patch.

OBS-URL: https://build.opensuse.org/request/show/621916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opensc?expand=0&rev=42

opensc-0.17.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be73c6816867ab4721e6a9ae7dba8e890c5f169f0a2cbb4bf354e0f30a948300
-size 1950547

opensc-0.18.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bc0ff030dd1c10f646d54415eae1bb2b1c72dda710378343f027e17cd8c3757
+size 2037073

opensc-bash-completions.patch

@@ -0,0 +1,45 @@
+From b0a20fa7ca30dc6c6198954fadc5a7fe812834dc Mon Sep 17 00:00:00 2001
+From: Stanislav Brabec <sbrabec@suse.com>
+Date: Fri, 22 Jun 2018 16:38:38 +0200
+Subject: [PATCH] Use correct bash-completion path
+
+Recent versions of bash is leaving /etc/bash_completion.d. The correct
+directory is specified by pkg-config --variable completionsdir
+bash-completion.
+
+Fixes https://github.com/OpenSC/OpenSC/issues/1403
+---
+ configure.ac          | 4 ++++
+ doc/tools/Makefile.am | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 700b14dc..6abad0b7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -839,6 +839,10 @@ if test "${enable_cryptotokenkit}" = "yes"; then
+ 	fi
+ 	AC_DEFINE([ENABLE_CRYPTOTOKENKIT], [1], [Define if CryptoTokenKit is to be enabled])
+ fi
++PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
++	[completiondir="`pkg-config --variable=completionsdir bash-completion`"],
++	[completiondir="${sysconfdir}/bash_completion.d"])
++AC_SUBST([completiondir])
+ 
+ 
+ AC_SUBST(DYN_LIB_EXT)
+diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
+index 17e4fbf1..4e2d941c 100644
+--- a/doc/tools/Makefile.am
++++ b/doc/tools/Makefile.am
+@@ -15,7 +15,6 @@ man5_MANS = $(patsubst $(srcdir)/%.xml, %, $(wildcard $(srcdir)/*.5.xml))
+ endif
+ 
+ completion_DATA = $(patsubst $(srcdir)/%.1.xml, %, $(wildcard $(srcdir)/*.1.xml))
+-completiondir = $(sysconfdir)/bash_completion.d
+ 
+ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml) $(wildcard $(srcdir)/*.5.xml)
+ 	$(XSLTPROC) --nonet --path "$(srcdir)/..:$(xslstylesheetsdir)/html" --xinclude -o $@ html.xsl $<
+-- 
+2.18.0
+

opensc-desktop.patch

@@ -0,0 +1,22 @@
+Backport.
+From d831076974f02dc7714f92526e6352ab18aee748 Mon Sep 17 00:00:00 2001
+From: Frank Morgner <frankmorgner@gmail.com>
+Date: Fri, 22 Jun 2018 08:47:06 +0200
+Subject: [PATCH] opensc-notify: use generic icon
+
+fixes https://github.com/OpenSC/OpenSC/issues/1402
+---
+ src/tools/org.opensc.notify.desktop.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: opensc-0.18.0/src/tools/org.opensc.notify.desktop.in
+===================================================================
+--- opensc-0.18.0.orig/src/tools/org.opensc.notify.desktop.in
++++ opensc-0.18.0/src/tools/org.opensc.notify.desktop.in
+@@ -3,5 +3,5 @@ Name=OpenSC Notify
+ Type=Application
+ Comment=Monitor smart card events to send notifications.
+ Exec=@bindir@/opensc-notify
+-Icon=preferences-system-notifications
++Icon=utilities-system-monitor
+ Categories=Security;System;

opensc-desktop2.patch

@@ -0,0 +1,25 @@
+From 4db9db7403cd5c49efc97ce6eac4ab5b4cd46e66 Mon Sep 17 00:00:00 2001
+From: Stanislav Brabec <sbrabec@suse.com>
+Date: Wed, 27 Jun 2018 21:20:04 +0200
+Subject: [PATCH] Add GenericName to the desktop file
+
+Add optional GenericName to org.opensc.notify.desktop. GenericName is
+recently widely used for menu rendering in desktop environments.
+---
+ src/tools/org.opensc.notify.desktop.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/tools/org.opensc.notify.desktop.in b/src/tools/org.opensc.notify.desktop.in
+index 20e217d6..1c8755c4 100644
+--- a/src/tools/org.opensc.notify.desktop.in
++++ b/src/tools/org.opensc.notify.desktop.in
+@@ -1,5 +1,6 @@
+ [Desktop Entry]
+ Name=OpenSC Notify
++GenericName=Smard card notification
+ Type=Application
+ Comment=Monitor smart card events to send notifications.
+ Exec=@bindir@/opensc-notify
+-- 
+2.18.0
+

opensc.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jul 10 16:56:28 CEST 2018 - sbrabec@suse.com
+
+- Update to version 0.18.0:
+  * Further improvements of PIN support.
+  * Large number of improvements and fixes
+    (boo#1097951, boo#1100501).
+  * See /usr/share/doc/packages/opensc/NEWS for complete list.
+- Add opensc-desktop.patch, opensc-desktop2.patch and
+  opensc-bash-completions.patch.
+
 -------------------------------------------------------------------
 Mon Jan  1 16:16:13 UTC 2018 - michael@stroeder.com
 

opensc.spec

@@ -17,29 +17,36 @@
 
 
 Name:           opensc
-Version:        0.17.0
+Version:        0.18.0
 Release:        0
 Summary:        Smart Card Utilities
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          Productivity/Security
 Url:            https://github.com/OpenSC/OpenSC/wiki
 Source:         https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
 Source2:        %{name}-rpmlintrc
 # Register with p11-kit
-# https://www.opensc-project.org/opensc/ticket/390
+# https://web.archive.org/web/20111225073733/http://www.opensc-project.org/opensc/ticket/390
 Source3:        opensc.module
+# PATCH-FIX-UPSTREAM opensc-desktop.patch https://github.com/OpenSC/OpenSC/issues/1402 sbrabec@suse.com -- Fix desktop file.
+Patch1:         opensc-desktop.patch
+# PATCH-FIX-UPSTREAM opensc-bash-completions.patch sbrabec@suse.com https://github.com/OpenSC/OpenSC/issues/1403 -- Use correct bash-completion path.
+Patch2:         opensc-bash-completions.patch
+# PATCH-FEATURE-OPENSUSE opensc-desktop2.patch https://github.com/OpenSC/OpenSC/issues/1402 sbrabec@suse.com -- Add GenericName to the desktop file.
+Patch3:         opensc-desktop2.patch
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  libtool
 BuildRequires:  libxslt
 BuildRequires:  pkgconfig
 BuildRequires:  readline-devel
+BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  pkgconfig(libpcsclite)
 BuildRequires:  pkgconfig(openssl)
-
 Requires:       pcsc-lite
 # There is no more devel package.
 Obsoletes:      opensc-devel < %{version}
+%define completionsdir %(pkg-config --variable completionsdir bash-completion)
 
 %description
 OpenSC provides a set of utilities to access smart cards. It mainly
@@ -58,6 +65,9 @@ may require third party proprietary software.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 autoreconf -fvi
@@ -85,6 +95,7 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pkcs11/modules/opensc.mo
 %doc %{_docdir}/%{name}/README
 %doc %{_docdir}/%{name}/tools.html
 %{_bindir}/*
+%{_datadir}/applications/*.desktop
 %{_datadir}/opensc
 # Note: .la and .so must be in the main package, required by ltdl:
 %{_libdir}/*.la
@@ -96,8 +107,8 @@ install -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pkcs11/modules/opensc.mo
 %config %{_sysconfdir}/opensc.conf
 %dir %{_sysconfdir}/pkcs11
 %config %{_sysconfdir}/pkcs11/modules/
-%{_sysconfdir}/bash_completion.d/*
 # This is a private library. There is no reason to split it to libopensc* package.
 %{_libdir}/libopensc.so.*
+%{completionsdir}/*
 
 %changelog