Hello community,
here is the log from the commit of package pcsc-lite for openSUSE:Factory
checked in at Wed Jan 12 08:31:52 CET 2011.
--------
--- pcsc-lite/pcsc-lite.changes 2009-12-15 01:39:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/pcsc-lite/pcsc-lite.changes 2011-01-10 19:36:34.000000000 +0100
@@ -1,0 +2,13 @@
+Mon Jan 10 19:36:08 CET 2011 - sbrabec@suse.cz
+
+- Updated to version 1.6.6:
+ * code and behavior improvements
+ * many fixes
+ * uses libusb-1.0
+ * two security fixes (bnc#609317, CVE-2010-0407,
+ bnc#661000, CVE-2010-4531)
+ * for more see ChangeLog
+- Disabled HAL support.
+- Create dedicated UID and GID "scard".
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
pcsc-lite-1.5.5.tar.bz2
pcsc-lite-init.patch
New:
----
pcsc-lite-1.6.6.tar.bz2
pcsc-lite-init
pcsc-lite-reader-conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-lite.spec ++++++
--- /var/tmp/diff_new_pack.aSyfqC/_old 2011-01-12 08:31:15.000000000 +0100
+++ /var/tmp/diff_new_pack.aSyfqC/_new 2011-01-12 08:31:15.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package pcsc-lite (Version 1.5.5)
+# spec file for package pcsc-lite (Version 1.6.6)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,9 +21,14 @@
Name: pcsc-lite
# FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do:
%define ifddir %{_libdir}/readers
-BuildRequires: hal-devel pkg-config readline-devel
-Version: 1.5.5
-Release: 2
+BuildRequires: pkg-config readline-devel
+%if %suse_version >= 1110
+BuildRequires: libusb-1_0-devel
+%else
+BuildRequires: hal-devel
+%endif
+Version: 1.6.6
+Release: 1
PreReq: %{insserv_prereq} %{fillup_prereq}
Group: Productivity/Security
License: BSD3c(or similar)
@@ -34,9 +39,12 @@
Source2: README.SUSE
Source3: pre_checkin.sh
Source4: baselibs.conf
-Patch1: pcsc-lite-init.patch
+Source5: pcsc-lite-init
+Source6: pcsc-lite-reader-conf
Requires: libpcsclite1 >= %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%define USER scard
+%define GROUP scard
%description
The purpose of PCSC Lite is to provide a Windows(R) SCard interface in
@@ -119,8 +127,7 @@
%prep
%setup -q
-cp -a %{S:1} %{S:2} .
-%patch1
+cp -a %{S:1} %{S:2} %{S:5} %{S:6} .
%build
%if %suse_version > 1110
@@ -129,17 +136,19 @@
%configure\
--docdir=%{_docdir}/%{name}\
--enable-usbdropdir=%{ifddir}\
+%if %suse_version >= 1110
+ --disable-libhal\
+%endif
--disable-static
make %{?jobs:-j%jobs}
%install
%makeinstall
-touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
-mkdir $RPM_BUILD_ROOT%{ifddir}
+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 etc/pcscd.init $RPM_BUILD_ROOT/etc/init.d/pcscd
+install -m 755 pcsc-lite-init $RPM_BUILD_ROOT/etc/init.d/pcscd
ln -sf ../../etc/init.d/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
@@ -149,6 +158,10 @@
%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}
@@ -170,9 +183,8 @@
%{_libdir}/*.so
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
-%ghost %{_sysconfdir}/reader.conf
%dir %{_sysconfdir}/reader.conf.d
-%config %{_sysconfdir}/reader.conf.d/reader.conf
+%config(noreplace) %{_sysconfdir}/reader.conf.d/reader.conf
%{ifddir}
/etc/init.d/pcscd
/var/adm/fillup-templates/sysconfig.pcscd
++++++ pcsc-lite-1.5.5.tar.bz2 -> pcsc-lite-1.6.6.tar.bz2 ++++++
++++ 50900 lines of diff (skipped)
++++++ pcsc-lite-init ++++++
#!/bin/sh
#
# pcscd Starts the pcscd Daemon
#
# chkconfig: 2345 25 88
# description: The PC/SC smart card daemon is a resource manager for the \
# PC/SC lite and Musclecard frameworks. It coordinates \
# communications with smart card readers, smart cards, and \
# cryptographic tokens that are connected to the system.
#
# processname: pcscd
# config: /etc/reader.conf
#
### BEGIN INIT INFO
# Provides: pcscd
# Required-Start: $local_fs $remote_fs $syslog
# Required-Stop: $local_fs $remote_fs $syslog
# Should-Start: udev hal openct
# Should-Stop: udev hal openct
# 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
# PC/SC lite and Musclecard frameworks. It coordinates
# communications with smart card readers, smart cards, and
# cryptographic tokens that are connected to the system.
# X-UnitedLinux-Default-Enabled: yes
### END INIT INFO
#
# Note! pcscd should be started after pcmcia, and shut down before it
# for smooth experience with PCMCIA readers.
. /etc/rc.status
rc_reset
umask 077
exec=/usr/sbin/pcscd
prog=$(basename $exec)
lockfile=/var/lock/subsys/$prog
PCSCD_OPTIONS=
# Source config
if [ -f /etc/sysconfig/pcscd ] ; then
. /etc/sysconfig/pcscd
fi
start() {
echo -n $"Starting PC/SC smart card daemon ($prog): "
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): "
killproc $exec
retval=$?
rc_status
echo
[ $retval -eq 0 ] && rm -f $lockfile
rc_status -v
}
restart() {
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
reload|force-reload)
restart
;;
status)
checkproc $exec
rc_status -v
;;
condrestart|try-restart)
if test -f $lockfile ; then
restart
else
rc_reset
fi
rc_status
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
rc_exit
++++++ pcsc-lite-reader-conf ++++++
# Configuration file for pcsc-lite
#
# This file has to be configured for serial and PCMCIA readers only.
# normal USB readers shall _not_ be configured here!
#
# David Corcoran