Accepting request 92724 from home:wrosenauer:devel

OBS-URL: https://build.opensuse.org/request/show/92724
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=60
This commit is contained in:
Wolfgang Rosenauer 2011-11-20 12:27:01 +00:00 committed by Git OBS Bridge
parent f4505c9de0
commit 0b9ecbab8c
5 changed files with 69 additions and 42 deletions

View File

@ -1,26 +0,0 @@
Index: src/pcscd.h
===================================================================
--- src/pcscd.h.orig
+++ src/pcscd.h
@@ -63,7 +63,7 @@ enum
#define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */
/* Uncomment the next line if you do NOT want to use auto power off */
-/* #define DISABLE_ON_DEMAND_POWER_ON */
+#define DISABLE_ON_DEMAND_POWER_ON
/* Uncomment the next line if you do not want the card to be powered on
* when inserted */
Index: src/pcscd.h.in
===================================================================
--- src/pcscd.h.in.orig
+++ src/pcscd.h.in
@@ -63,7 +63,7 @@ enum
#define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */
/* Uncomment the next line if you do NOT want to use auto power off */
-/* #define DISABLE_ON_DEMAND_POWER_ON */
+#define DISABLE_ON_DEMAND_POWER_ON
/* Uncomment the next line if you do not want the card to be powered on
* when inserted */

View File

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

3
pcsc-lite-1.8.0.tar.bz2 Normal file
View File

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

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sat Nov 19 18:25:31 UTC 2011 - wr@rosenauer.org
- Updated to version 1.8.0:
* PC/SC spy tool
* Support systemd socket activation (the auto start of pcscd
from the library has been removed. Use systemd instead)
* SCardGetStatusChange(): check all the readers are already known
and return SCARD_E_UNKNOWN_READER if a reader name is not
present.
* SCardEstablishContext(): Invalidate all the handles in the son
after a fork
* Add define of FEATURE_EXECUTE_PACE from PCSC v2 Part 10
Amendment 1 2011-06-03
* Fix some memory leaks repoted by Coverity
* Some other minor improvements and bug corrections
- enabled usage of systemd init for 12.1 and newer
- add libtool as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Mon Aug 22 08:27:55 UTC 2011 - bruno@ioda-net.ch

View File

@ -21,7 +21,7 @@
Name: pcsc-lite
# FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do:
%define ifddir %{_libdir}/readers
BuildRequires: pkg-config readline-devel
BuildRequires: libtool pkg-config readline-devel
%if %suse_version >= 1120
#shouldn't be found automagically ?
BuildRequires: libudev-devel
@ -29,13 +29,13 @@ BuildRequires: libudev-devel
%if %suse_version == 1110
BuildRequires: libusb-1_0-devel
%endif
%if %suse_version < 1110
BuildRequires: hal-devel
%if %suse_version > 1140
BuildRequires: systemd
%{?systemd_requires}
%endif
Version: 1.7.4
Version: 1.8.0
Release: 1
Requires(pre): pwdutils
Requires(post): %insserv_prereq %fillup_prereq
Group: Productivity/Security
License: BSD3c(or similar)
Url: http://pcsclite.alioth.debian.org/
@ -47,8 +47,7 @@ Source3: pre_checkin.sh
Source4: baselibs.conf
Source5: pcsc-lite-init
Source6: pcsc-lite-reader-conf
#Is not really used just keep in case off
Patch0: disable-power-off.diff
Requires(post): %insserv_prereq %fillup_prereq
%if %suse_version > 1130
PreReq: sysvinit(syslog)
%endif
@ -98,12 +97,22 @@ an APDU like manner sent normally through the SCardTransmit() function.
This functionality is exercised in the driver.
%package -n libpcscspy0
License: BSD3c(or similar)
Group: System/Libraries
Summary: PCSC Smart Card Library
%description -n libpcscspy0
Supporting library for the PC/SC spy tool.
%package devel
License: BSD3c(or similar)
Group: Development/Libraries/C and C++
Summary: Development package for the MUSCLE project SmartCards library
Requires: %{name} = %{version}-%{release}
Requires: libpcsclite1 = %{version}-%{release}
Requires: libpcscspy0 = %{version}-%{release}
%description devel
This package contains the development files for pcsc-lite. It allows to
@ -112,8 +121,6 @@ compile plugins for the pcsc-lite package.
%prep
%setup -q
# do not disable power off but keep it if it causes issues
#%patch0
cp -a %{S:1} %{S:2} %{S:5} %{S:6} .
%build
@ -123,11 +130,12 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
%configure\
--docdir=%{_docdir}/%{name} \
--enable-usbdropdir=%{ifddir} \
%if %suse_version >= 1110
--disable-libhal \
%endif
%if %suse_version == 1110
--disable-libudev \
%endif
%if %suse_version > 1140
--with-systemdsystemunitdir=%_unitdir \
%endif
--disable-static
make %{?jobs:-j%jobs}
@ -152,22 +160,41 @@ rm -rf $RPM_BUILD_ROOT
%pre
getent group %{GROUP} >/dev/null || groupadd -r -o %{GROUP}
getent passwd %{USER} >/dev/null || useradd -r -o -g %{GROUP} -s /bin/nologin -c "Smart Card Reader" -d /var/run/pcscd %{USER}
%if %suse_version > 1140
%service_add_pre pcscd.service pcscd.socket
%endif
exit 0
%post
%if %suse_version > 1140
%service_add_post pcscd.service pcscd.socket
%else
%fillup_and_insserv -y -n pcscd pcscd
%restart_on_update pcscd
%endif
%preun
%if %suse_version > 1140
%service_del_preun pcscd.service pcscd.socket
%else
%stop_on_removal pcscd
%endif
%postun
%if %suse_version > 1140
%service_del_postun pcscd.service pcscd.socket
%else
%insserv_cleanup
%endif
%post -n libpcsclite1 -p /sbin/ldconfig
%postun -n libpcsclite1 -p /sbin/ldconfig
%post -n libpcscspy0 -p /sbin/ldconfig
%postun -n libpcscspy0 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc %{_docdir}/%{name}
@ -176,6 +203,9 @@ exit 0
%dir %{_sysconfdir}/reader.conf.d
%config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf
%{ifddir}
%if %suse_version > 1140
%_unitdir/*
%endif
%{_initrddir}/pcscd
/var/adm/fillup-templates/sysconfig.pcscd
@ -183,6 +213,10 @@ exit 0
%defattr(-,root,root)
%{_libdir}/libpcsclite.so.*
%files -n libpcscspy0
%defattr(-,root,root)
%{_libdir}/libpcscspy.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/*