Accepting request 58191 from security:chipcard

Accepted submit request 58191 from user sbrabec

OBS-URL: https://build.opensuse.org/request/show/58191
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcsc-ccid?expand=0&rev=17

ccid-1.3.11.tar.bz2

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

ccid-1.4.1.tar.bz2

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

pcsc-ccid-rpmlintrc

@@ -0,0 +1,4 @@
+# These links are needed. We should probably use unversioned libraries.
+addFilter("devel-file-in-non-devel-package")
+# This is not an error. rpmlint cannot handle %() properly.
+addFilter("specfile-error")

pcsc-ccid.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan  5 17:13:38 CET 2011 - sbrabec@suse.cz
+
+- Updated to version 1.4.1:
+  * Security fix (bnc#661000, CVE-2010-4530).
+  * Migrated to libusb-1_0.
+  * udev support.
+  * Compatible with pcsc-lite-1.6.
+  * See ChangeLog for details.
+
 -------------------------------------------------------------------
 Wed Aug  5 16:59:22 CEST 2009 - sbrabec@suse.cz
 

pcsc-ccid.spec

@@ -19,31 +19,25 @@
 
 
 Name:           pcsc-ccid
-# pcsc-ccid can use libusb-1.0 interrupt transfers over libusb-0.1 API:
-%define USE_LIBUSB1 0
 %define _name ccid
-BuildRequires:  pcsc-lite-devel pkg-config
-%if %USE_LIBUSB1
-BuildRequires:  libusb-compat-devel
-Requires:       libusb-1_0-features-in-0_1-api
-%else
-BuildRequires:  libusb-devel
-%endif
-Version:        1.3.11
-Release:        1
+BuildRequires:  libusb-1_0-devel pcsc-lite-devel pkg-config udev
+Version:        1.4.1
+Release:        0
 Group:          Productivity/Security
 License:        LGPL v2.1 or later
 Url:            http://pcsclite.alioth.debian.org/ccid.html
 Summary:        PCSC Driver for CCID Based Smart Card Readers and GemPC Twin Serial Reader
 Source:         %{_name}-%{version}.tar.bz2
+Source1:        %{name}-rpmlintrc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires:       pcsc-lite
+# openSUSE package pcsc-lite 1.6.6 is the first one which creates the scard UID and GID:
+Requires:       pcsc-lite >= 1.6.6
 %define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
 %define LBRACE (
 %define RBRACE )
 %define QUOTE "
 %define BACKSLASH \\
-%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^SUBSYSTEMS=="USB", ATTRS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTRS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*$/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
+%define USBDRIVERS %(set -x ; bunzip2 <%{S:0} | tr a-z A-Z | sed -n 's/^ATTRS{IDVENDOR}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}, ATTRS{IDPRODUCT}==%{QUOTE}%{BACKSLASH}%{LBRACE}[^%{QUOTE}]*%{BACKSLASH}%{RBRACE}%{QUOTE}.*$/modalias%{LBRACE}usb:v%{BACKSLASH}1p%{BACKSLASH}2d*dc*dsc*dp*ic*isc*ip*%{RBRACE}/p' | tr '%{BACKSLASH}n' ' ')
 # We are not using Supplements here. User may want to choose between pcsc-lite and openct:
 # Generic CCID devices:
 Enhances:       modalias(usb:*ic0Bisc00d*dc*dsc*dp*ic*isc*ip*)
@@ -59,8 +53,6 @@ Devices) driver.
 This driver is meant to be used with the PCSC-Lite daemon from the
 pcsc-lite package.
 
-
-
 Authors:
 --------
     Ludovic Rousseau <ludovic.rousseau@free.fr>
@@ -82,12 +74,13 @@ make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
-mkdir $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
-mv $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/ccidtwin.conf
 # Copied elsewhere:
 rm $RPM_BUILD_ROOT%{_datadir}/doc/ccid/README_Kobil_mIDentity_switch.txt
 rmdir $RPM_BUILD_ROOT%{_datadir}/doc/ccid
 rmdir $RPM_BUILD_ROOT%{_datadir}/doc
+mkdir -p $RPM_BUILD_ROOT/lib/udev
+mkdir $RPM_BUILD_ROOT/lib/udev/rules.d
+sed 's:GROUP="pcscd":GROUP="scard":' <src/92_pcscd_ccid.rules >$RPM_BUILD_ROOT/lib/udev/rules.d/92_pcscd_ccid.rules
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -99,7 +92,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %doc %{_mandir}/man?/*.*
 %{_sbindir}/*
-%config (noreplace) %{_sysconfdir}/reader.conf.d/*.conf
+%config (noreplace) %{_sysconfdir}/reader.conf.d/*
 %{ifddir}/*
+/lib/udev/rules.d/*.rules
 
 %changelog