system/pcsc-lite: Updated for version 1.4.102

7 files changed, 79 insertions, 36 deletions

diff --git a/system/pcsc-lite/README b/system/pcsc-lite/README
index f1487907c4701..9cb40b4cafe61 100644
--- a/system/pcsc-lite/README
+++ b/system/pcsc-lite/README
@@ -1,16 +1,16 @@
 PC/SC-lite (Personal Computer/Smart Card interface)
 
-This is middleware to access a smart card using SCard API (PC/SC) Its purpose 
+This is a middleware to access a smart card using SCard API (PC/SC) Its purpose
 is to provide a Windows(R) SCard interface in a very small form factor for 
-communicating to smart cards and readers. It is released under BSD license.
+communicating to smart cards and readers.
 
 It is compiled with --enable-usbdropdir=/usr/lib/pcsc/drivers
 This will be the destination directory for usb readers' drivers (ccid, cardman,
 others).
 
 NOTE: drivers are not included and must be compiled and installed separately. 
-See /usr/doc/pcsc-lite-1.4.99/DRIVERS for more information on getting and 
-installing specifc drivers.
+See /usr/doc/pcsc-lite-1.4.102/DRIVERS for more information on getting and 
+installing specific drivers.
 
 For serial and pcmcia readers only, it is necessary to edit files in 
 /etc/reader.conf.d/ and run "/usr/sbin/update-reader.conf".
@@ -18,6 +18,9 @@ For serial and pcmcia readers only, it is necessary to edit files in
 Compiling with "DEBUGATR=1 ./pcsc-lite.SlackBuild" enables ATR parsing debug 
 output messages.
 
+Compiling with "APIDOC=1 ./pcsc-lite.SlackBuild" produces API .pdf
+documentation (mainly intended for developers).
+
 To start PC/SC-lite daemon, run "/etc/rc.d/rc.pcscd start".
 For pcmcia readers, this daemon should be started after rc.pcmcia - this is 
 most easily accomplished by adding the following to /etc/rc.d/rc.local:
diff --git a/system/pcsc-lite/docs-DRIVERS.diff b/system/pcsc-lite/docs-DRIVERS.diff
index 86d4f8163edc1..dbe48cc2cec65 100644
--- a/system/pcsc-lite/docs-DRIVERS.diff
+++ b/system/pcsc-lite/docs-DRIVERS.diff
@@ -1,8 +1,6 @@
-
-diff -Nur pcsc-lite-1.4.99.orig/DRIVERS pcsc-lite-1.4.99/DRIVERS
---- DRIVERS.bak	2007-10-13 16:21:11.000000000 -0500
-+++ DRIVERS	2008-03-06 00:21:53.119195118 -0600
-@@ -2,8 +2,8 @@
+--- DRIVERS	2008-05-17 17:20:11.636054139 +0200
++++ DRIVERS.new	2008-05-17 17:21:51.637812109 +0200
+@@ -2,18 +2,18 @@
  
  To install USB drivers, download the driver from http://www.linuxnet.com/
  and copy it to a temporary location.  After you have unarchived the files
@@ -13,6 +11,19 @@ diff -Nur pcsc-lite-1.4.99.orig/DRIVERS pcsc-lite-1.4.99/DRIVERS
  directory to it.
  
  Example Mac OS X, Linux 2.4:
+ 
+ tar -xzvf driver.bundle-0.1.0.tar.gz
+-cp -r driver.bundle /usr/local/pcsc/drivers/
+-cd /usr/local/pcsc/drivers/driver.bundle
++cp -r driver.bundle /usr/lib/pcsc/drivers/
++cd /usr/lib/pcsc/drivers/driver.bundle
+ build or use Project Builder to build
+ 
+-The /usr/local/pcsc/drivers/ directory should contain bundle directories only.
++The /usr/lib/pcsc/drivers/ directory should contain bundle directories only.
+ You must restart pcscd to use the new driver.
+ 
+ 
 @@ -28,3 +28,7 @@
  Refer to the driver README for more information.
  
diff --git a/system/pcsc-lite/doinst.sh b/system/pcsc-lite/doinst.sh
index 7669b280aaa56..1555bf6c5fda7 100644
--- a/system/pcsc-lite/doinst.sh
+++ b/system/pcsc-lite/doinst.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild
index 17c378a23f2b9..6ffbf7181901f 100644
--- a/system/pcsc-lite/pcsc-lite.SlackBuild
+++ b/system/pcsc-lite/pcsc-lite.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for pcsc-lite
 
-# Copyright 2007  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2007-8  LukenShiro <lukenshiro@ngi.it>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcsc-lite
-VERSION=1.4.99
+VERSION=${VERSION:-1.4.102}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -34,7 +34,11 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 DEBUGATR=${DEBUGATR:-0}	# Debug is off by default
-DOCFILES="DRIVERS SECURITY ChangeLog COPYING ChangeLog.svn HELP NEWS TODO AUTHORS INSTALL README"  
+APIDOC=${APIDOC:-0}	# API documentation building is off by default
+TEXTOPDFBIN="/usr/share/texmf/bin/pdflatex"	# program to convert .tex files into .pdf (for APIDOC)
+
+# README and README.DAEMON are not useful and partly outdated. ChangeLog.svn is empty.
+DOCFILES="DRIVERS SECURITY ChangeLog COPYING HELP NEWS TODO AUTHORS INSTALL"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -48,7 +52,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -59,12 +63,15 @@ patch -p0 < $CWD/docs-DRIVERS.diff || exit 1
 
 # ATR (answer to reset) debug parsing output 
 case "$DEBUGATR" in
-    0)	DEBUGATR_FLAG="disable-debugatr"
+    0)	DEBUGATR_FLAG="dis"
 	;;
-    *)	DEBUGATR_FLAG="enable-debugatr"
+    *)	DEBUGATR_FLAG="en"
 	;;
 esac
 
+# libusb and libhal support are mutually exclusive: using conservative behaviour (libusb)
+# --enable-runpid=/var/run/pcscd.pid is not supported anymore;
+# pid directory changed to /var/run/pcscd for consistency
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -72,13 +79,14 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --enable-confdir=/etc \
   --localstatedir=/var \
-  --enable-ipcdir=/var/run \
-  --enable-runpid=/var/run/pcscd.pid \
+  --enable-ipcdir=/var/run/pcscd \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-libusb \
+  --disable-libhal \
   --enable-usbdropdir="/usr/lib/pcsc/drivers" \
   --enable-muscledropdir="/usr/lib/pcsc/services" \
-  --${DEBUGATR_FLAG}
+  --${DEBUGATR_FLAG}able-debugatr
 
 make
 make install DESTDIR=$PKG
@@ -111,17 +119,27 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo
+# remove README.DAEMON, automatically installed by doc/Makefile.
+rm -f $PKG/usr/doc/$PRGNAM-$VERSION/README.DAEMON
+
 ## .pdf api documentation files seem not to be built from .tex sources during make
-## Most people don't need/want api docs anyway, so uncomment below if you do
-#( cd $PKG/usr/doc/$PRGNAM-$VERSION/
-#  if [ -x /usr/share/texmf/bin/pdflatex ]; then
-#    pdflatex ifdhandler-3.tex >/dev/null
-#    pdflatex pcsc-lite.tex >/dev/null
-#    for oldfiles in *.aux *.tex *.toc *.log *.bib *.out ; 
-#      do rm -f $oldfiles ; 
-#    done
-#  fi
-#)
+## Most people don't need/want api docs anyway. Nonetheless tex sources are removed.
+( cd $PKG/usr/doc/$PRGNAM-$VERSION/
+case "$APIDOC" in
+    1)	if [ -x $TEXTOPDFBIN ]; then
+	  $TEXTOPDFBIN ifdhandler-3.tex 
+	  $TEXTOPDFBIN pcsc-lite.tex
+	else
+	    echo "API .pdf documentation NOT built."
+	fi
+	;;
+    *) echo "API .pdf documentation NOT built."
+	;;
+esac
+for oldfiles in *.aux *.tex *.toc *.log *.bib *.out ; 
+    do rm -f $oldfiles ; 
+done
+)
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index 7f1b7b8d8a077..55fca857e1f7d 100644
--- a/system/pcsc-lite/pcsc-lite.info
+++ b/system/pcsc-lite/pcsc-lite.info
@@ -1,8 +1,8 @@
 PRGNAM="pcsc-lite"
-VERSION="1.4.99"
+VERSION="1.4.102"
 HOMEPAGE="http://pcsclite.alioth.debian.org"
-DOWNLOAD="http://alioth.debian.org/frs/download.php/2257/pcsc-lite-1.4.99.tar.gz"
-MD5SUM="16c59b54edde9fa466c0e1f0eb86fd61"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/2479/pcsc-lite-1.4.102.tar.bz2"
+MD5SUM="b97d3a725ab93662adf09acfbc49efeb"
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
 APPROVED="rworkman"
diff --git a/system/pcsc-lite/rc.pcscd b/system/pcsc-lite/rc.pcscd
index 480414de621b5..613c80ae440e8 100644
--- a/system/pcsc-lite/rc.pcscd
+++ b/system/pcsc-lite/rc.pcscd
@@ -6,7 +6,7 @@
 # before it for smooth experience with PCMCIA readers.
 #
 
-PIDFILE=/var/run/pcscd.pid
+PIDFILE=/var/run/pcscd/pcscd.pid
 PCSCD_OPTS=""
 
 # Start
@@ -27,7 +27,7 @@ pcscd_stop() {
   echo "Stopping PC/SC-lite smart card daemon..."
   if [ -e "$PIDFILE" ]; then
       kill $(cat $PIDFILE)
-      rm -f $PIDFILE
+      rm -f $PIDFILE 1>&2 >/dev/null
   fi
   # Just in case:
   killall pcscd 1>&2 >/dev/null
@@ -40,6 +40,15 @@ pcscd_restart() {
   pcscd_start
 }
 
+# Status
+pcscd_status() {
+  if [ -e "$PIDFILE" ]; then
+    echo "pcscd is running."
+  else
+    echo "pcscd is stopped."
+  fi
+}
+
 case "$1" in
 'start')
   pcscd_start
@@ -50,6 +59,9 @@ case "$1" in
 'restart')
   pcscd_restart
   ;;
+'status')
+  pcscd_status
+  ;;
 *)
-  echo "usage $0 start|stop|restart"
+  echo "usage $0 start|stop|restart|status"
 esac
diff --git a/system/pcsc-lite/slack-desc b/system/pcsc-lite/slack-desc
index 283099c5f798d..8c34410d3bd80 100644
--- a/system/pcsc-lite/slack-desc
+++ b/system/pcsc-lite/slack-desc
@@ -13,7 +13,7 @@ pcsc-lite: Its purpose is to provide a Windows(R) SCard interface in a
 pcsc-lite: very small form factor for communicating to smart cards and 
 pcsc-lite: readers.
 pcsc-lite:  
-pcsc-lite: https://alioth.debian.org/projects/pcsclite/
+pcsc-lite: http://alioth.debian.org/projects/pcsclite/
 pcsc-lite: 
 pcsc-lite: 
 pcsc-lite: