Hello community, here is the log from the commit of package pcsc-lite for openSUSE:11.4 checked in at Fri May 27 01:22:03 CEST 2011.
-------- --- old-versions/11.4/UPDATES/all/pcsc-lite/pcsc-lite.changes 2011-03-10 15:57:59.000000000 +0100 +++ 11.4/pcsc-lite/pcsc-lite.changes 2011-05-18 08:43:52.000000000 +0200 @@ -1,0 +2,28 @@ +Wed May 18 06:42:02 UTC 2011 - [email protected] + +- cleanup spec file and requires +- moved libpcsclite1.so back to devel package + +------------------------------------------------------------------- +Tue May 3 20:15:49 UTC 2011 - [email protected] + +- make startup more robust by checking status files (bnc#686674) + +------------------------------------------------------------------- +Mon May 2 22:26:56 UTC 2011 - [email protected] + +- disable auto power off/on feature + +------------------------------------------------------------------- +Tue Apr 5 09:37:24 UTC 2011 - [email protected] + +- Updated to version 1.7.2: + * use libudev only on Linux and libusb elsewhere + * Try to use a (CCID) class driver if a specific driver fails + to use the reader. + * add support of multi-interfaces readers with libusb + * fix a problem with a multi-slots reader + * some other minor improvements and bug corrections +- cosmetic changes to init script output + +------------------------------------------------------------------- @@ -4 +32 @@ -- fix syslog not being present in runlevel 4 (bnc#678230) +- fix syslog not being present in runlevel 4 calling whatdependson for 11.4-i586 Old: ---- pcsc-lite-1.6.6.tar.bz2 New: ---- disable-power-off.diff pcsc-lite-1.7.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.om8xoH/_old 2011-05-27 01:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.om8xoH/_new 2011-05-27 01:21:24.000000000 +0200 @@ -22,18 +22,23 @@ # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do: %define ifddir %{_libdir}/readers BuildRequires: pkg-config readline-devel -%if %suse_version >= 1110 +%if %suse_version >= 1120 +BuildRequires: libudev-devel +%endif +%if %suse_version == 1110 BuildRequires: libusb-1_0-devel -%else +%endif +%if %suse_version < 1110 BuildRequires: hal-devel %endif -Version: 1.6.6 -Release: 4.<RELEASE2> -PreReq: %{insserv_prereq} %{fillup_prereq} +Version: 1.7.2 +Release: 5.<RELEASE2> +Requires(pre): pwdutils +Requires(post): %insserv_prereq %fillup_prereq Group: Productivity/Security License: BSD3c(or similar) Url: http://pcsclite.alioth.debian.org/ -Summary: PCS Smart Cards Library +Summary: PCSC Smart Cards Library Source: %{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Source2: README.SUSE @@ -41,7 +46,7 @@ Source4: baselibs.conf Source5: pcsc-lite-init Source6: pcsc-lite-reader-conf -Requires: libpcsclite1 >= %{version} +Patch0: disable-power-off.diff %if %suse_version > 1130 PreReq: sysvinit(syslog) %endif @@ -67,19 +72,11 @@ This functionality is exercised in the driver. - -Authors: --------- - David Corcoran <[email protected]> - Ludovic Rousseau <[email protected]> - Damien Sauveron <[email protected]> - Carlos Prados <[email protected]> - Antti Tapaninen <[email protected]> - %package -n libpcsclite1 License: BSD3c(or similar) Group: System/Libraries -Summary: PCS Smart Cards Library +Summary: PCSC Smart Card Library +Recommends: pcsc-lite >= %{version} %description -n libpcsclite1 The purpose of PCSC Lite is to provide a Windows(R) SCard interface in @@ -99,37 +96,21 @@ This functionality is exercised in the driver. - -Authors: --------- - David Corcoran <[email protected]> - Ludovic Rousseau <[email protected]> - Damien Sauveron <[email protected]> - Carlos Prados <[email protected]> - Antti Tapaninen <[email protected]> - %package devel License: BSD3c(or similar) Group: Development/Libraries/C and C++ Summary: Development package for the MUSCLE project SmartCards library -Requires: %{name} = %{version} pcsc-lite glibc-devel +Requires: %{name} = %{version}-%{release} +Requires: libpcsclite1 = %{version}-%{release} %description devel This package contains the development files for pcsc-lite. It allows to compile plugins for the pcsc-lite package. - -Authors: --------- - David Corcoran <[email protected]> - Ludovic Rousseau <[email protected]> - Damien Sauveron <[email protected]> - Carlos Prados <[email protected]> - Antti Tapaninen <[email protected]> - %prep %setup -q +%patch0 cp -a %{S:1} %{S:2} %{S:5} %{S:6} . %build @@ -140,40 +121,45 @@ --docdir=%{_docdir}/%{name}\ --enable-usbdropdir=%{ifddir}\ %if %suse_version >= 1110 - --disable-libhal\ + --disable-libhal \ +%endif +%if %suse_version == 1110 + --disable-libudev \ %endif --disable-static make %{?jobs:-j%jobs} %install %makeinstall +mkdir -p $RPM_BUILD_ROOT%{ifddir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: <pcsc-lite-reader-conf >$RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf # this program is noinst in the package -install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/ -mkdir $RPM_BUILD_ROOT/etc/init.d -install -m 755 pcsc-lite-init $RPM_BUILD_ROOT/etc/init.d/pcscd -ln -sf ../../etc/init.d/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd +#install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/ +install -D -m 755 pcsc-lite-init $RPM_BUILD_ROOT%{_initrddir}/pcscd +ln -sf %{_initrddir}/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP NEWS README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name} +cp -a AUTHORS ChangeLog ChangeLog.svn COPYING DRIVERS HELP README README.SUSE SECURITY TODO $RPM_BUILD_ROOT%{_docdir}/%{name} %clean rm -rf $RPM_BUILD_ROOT %pre -usr/sbin/groupadd -r -o %{GROUP} 2>/dev/null || : -usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false -c "Smart Card Reader" -d /sbin %{USER} 2>/dev/null || : - -%preun -%{stop_on_removal pcscd} +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} +exit 0 %post -%{fillup_and_insserv -y -n pcscd pcscd} +%fillup_and_insserv -y -n pcscd pcscd +%restart_on_update pcscd + +%preun +%stop_on_removal pcscd %postun -%{restart_on_update pcscd} -%{insserv_cleanup} +%insserv_cleanup %post -n libpcsclite1 -p /sbin/ldconfig @@ -182,14 +168,12 @@ %files %defattr(-,root,root) %doc %{_docdir}/%{name} -# .so must be in the main package (#235773): -%{_libdir}/*.so %doc %{_mandir}/man?/*.* %{_sbindir}/* %dir %{_sysconfdir}/reader.conf.d %config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf %{ifddir} -/etc/init.d/pcscd +%{_initrddir}/pcscd /var/adm/fillup-templates/sysconfig.pcscd %files -n libpcsclite1 @@ -199,6 +183,7 @@ %files devel %defattr(-,root,root) %{_includedir}/* +%{_libdir}/*.so %{_libdir}/*.*a %{_libdir}/pkgconfig/*.pc ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.om8xoH/_old 2011-05-27 01:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.om8xoH/_new 2011-05-27 01:21:24.000000000 +0200 @@ -1,2 +1,2 @@ -On SUSE Linux, drivers for various card readers can be found +On openSUSE, drivers for various card readers can be found in separate packages named pcsc-<drivername> ++++++ disable-power-off.diff ++++++ 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 */ ++++++ pcsc-lite-1.6.6.tar.bz2 -> pcsc-lite-1.7.2.tar.bz2 ++++++ ++++ 4212 lines of diff (skipped) ++++++ pcsc-lite-init ++++++ --- /var/tmp/diff_new_pack.om8xoH/_old 2011-05-27 01:21:24.000000000 +0200 +++ /var/tmp/diff_new_pack.om8xoH/_new 2011-05-27 01:21:24.000000000 +0200 @@ -17,7 +17,7 @@ # Required-Stop: $local_fs $remote_fs $syslog # Should-Start: udev hal openct # Should-Stop: udev hal openct -# Default-Start: 2 3 5 +# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Daemon to access a smart card using PC/SC # Description: The PC/SC smart card daemon is a resource manager for the @@ -45,21 +45,29 @@ . /etc/sysconfig/pcscd fi +cleanup() { + # if comm socket exists but pid file is absent pcscd fails to start + # bnc#686674 + if [ -S /var/run/pcscd/pcscd.comm -a ! -e /var/run/pcscd/pcscd.pid ]; then + # check if a pcscd instance is running and remove the socket in case it's not + checkproc $exec || rm /var/run/pcscd/pcscd.comm + fi +} + start() { - echo -n $"Starting PC/SC smart card daemon ($prog): " + echo -n "Starting PC/SC smart card daemon ($prog): " + cleanup startproc $exec $PCSCD_OPTIONS retval=$? rc_status - echo [ $retval -eq 0 ] && touch $lockfile rc_status -v } stop() { - echo -n $"Stopping PC/SC smart card daemon ($prog): " + echo -n "Stopping PC/SC smart card daemon ($prog): " killproc $exec retval=$? rc_status - echo [ $retval -eq 0 ] && rm -f $lockfile rc_status -v } @@ -77,6 +85,7 @@ restart ;; status) + echo -n "Checking for PC/SC smart card daemon ($prog): " checkproc $exec rc_status -v ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
