rpms/pcsc-lite/devel pcscd.init, NONE, 1.1 pcsc-lite.spec, 1.26, 1.27 import.log, 1.2, NONE pcsc-lite-close_on_exec.patch, 1.1, NONE pcsc-lite-lsb_header.patch, 1.2, NONE

Sat Jul 3 23:08:37 UTC 2010

Author: kalev

Update of /cvs/pkgs/rpms/pcsc-lite/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv13570

Modified Files:
	pcsc-lite.spec 
Added Files:
	pcscd.init 
Removed Files:
	import.log pcsc-lite-close_on_exec.patch 
	pcsc-lite-lsb_header.patch 
Log Message:
Update to 1.6.1

--- NEW FILE pcscd.init ---
#!/bin/sh
#
# pcscd        Starts the pcscd Daemon
#
# chkconfig:   2345 27 73
# 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 haldaemon
# Required-Stop: $local_fs $remote_fs $syslog haldaemon
# Should-Start: openct
# Should-Stop: 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.
### END INIT INFO
#
# Note!  pcscd should be started after pcmcia, and shut down before it
# for smooth experience with PCMCIA readers.

. /etc/init.d/functions

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): "
    /usr/sbin/update-reader.conf && daemon $prog $PCSCD_OPTIONS
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}
stop() {
    echo -n $"Stopping PC/SC smart card daemon ($prog): "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}
restart() {
    stop
    start
}


case "$1" in
    start|stop|restart)
        $1
        ;;
    reload|force-reload)
        restart
        ;;
    status)
        status $prog
        ;;
    condrestart|try-restart)
        [ ! -f $lockfile ] || restart
        ;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- pcsc-lite.spec	13 Apr 2010 11:39:26 -0000	1.26
+++ pcsc-lite.spec	3 Jul 2010 23:08:36 -0000	1.27
@@ -1,19 +1,17 @@
-%global upstream_build 3082
+%global upstream_build 3298
 
 Name:           pcsc-lite
-Version:        1.5.5
-Release:        4%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
 Source0:        http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
+Source1:        pcscd.init
 Patch0:         %{name}-1.4-docinst.patch
 Patch1:         %{name}-1.5.5-rpath64.patch
-Patch2:         %{name}-close_on_exec.patch
-# Fedora specific changes to init script LSB header and start/stop priorities
-Patch3:         %{name}-lsb_header.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -64,14 +62,19 @@ BuildArch:      noarch
 %setup -q
 %patch0 -p0 -b .docinst
 %patch1 -p1 -b .rpath64
-%patch2 -p1 -b .close_on_exec
-%patch3 -p1 -b .lsb_header
+
+# Convert to utf-8
+for file in ChangeLog; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
 
 %build
 %configure \
   --disable-dependency-tracking \
   --disable-static \
-  --enable-confdir=%{_sysconfdir} \
   --enable-ipcdir=%{_localstatedir}/run \
   --enable-usbdropdir=%{_libdir}/pcsc/drivers
 make %{?_smp_mflags}
@@ -83,19 +86,15 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
 
-install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/pcscd
 
-cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README
-All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf
-by %{_sbindir}/update-reader.conf.
-EOF
+# remove setuid bit
+chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/pcscd
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
-rm $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf
-touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -124,15 +123,11 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO
 %dir %{_sysconfdir}/reader.conf.d/
-%doc %{_sysconfdir}/reader.conf.d/README
-%ghost %config(noreplace) %{_sysconfdir}/reader.conf
 %{_initrddir}/pcscd
 %{_sbindir}/pcscd
-%{_sbindir}/update-reader.conf
 %{_libdir}/pcsc/
 %{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
-%{_mandir}/man8/update-reader.conf.8*
 
 %files libs
 %defattr(-,root,root,-)
@@ -150,6 +145,9 @@ fi
 
 
 %changelog
+* Fri Jun 18 2010 Kalev Lember <kalev at smartlink.ee> - 1.6.1-1
+- Update to 1.6.1
+
 * Tue Apr 13 2010 Kalev Lember <kalev at smartlink.ee> - 1.5.5-4
 - Fix init script start / stop priorities (#580322)
 - Don't require pkgconfig as the dep is now automatically generated by rpm


--- import.log DELETED ---


--- pcsc-lite-close_on_exec.patch DELETED ---


--- pcsc-lite-lsb_header.patch DELETED ---

