system/pcsc-lite: Updated for version 1.5.3

5 files changed, 47 insertions, 25 deletions

diff --git a/system/pcsc-lite/README b/system/pcsc-lite/README
index 9cb40b4cafe6..dfb659451401 100644
--- a/system/pcsc-lite/README
+++ b/system/pcsc-lite/README
@@ -1,16 +1,17 @@
 PC/SC-lite (Personal Computer/Smart Card interface)
+License: BSD
 
 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 compiled with --enable-usbdropdir=/usr/lib/pcsc/drivers
+It is compiled with --enable-usbdropdir=<libdir>/pcsc/drivers
 This will be the destination directory for usb readers' drivers (ccid, cardman,
-others).
+and others).
 
 NOTE: drivers are not included and must be compiled and installed separately. 
-See /usr/doc/pcsc-lite-1.4.102/DRIVERS for more information on getting and 
-installing specific drivers.
+See DRIVERS file in pcsc-lite's doc directory 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".
@@ -21,6 +22,11 @@ output messages.
 Compiling with "APIDOC=1 ./pcsc-lite.SlackBuild" produces API .pdf
 documentation (mainly intended for developers).
 
+pcsc-lite uses libusb for smart-card reader's detection. If you want to
+avoid usb polling (according to upstream's advice), you can compile with
+"HALD=1 ./pcsc-lite.SlackBuild" in order to use libhal for detecting your
+reader.
+
 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 dbe48cc2cec6..821b649c21d5 100644
--- a/system/pcsc-lite/docs-DRIVERS.diff
+++ b/system/pcsc-lite/docs-DRIVERS.diff
@@ -6,8 +6,8 @@
  and copy it to a temporary location.  After you have unarchived the files
 -copy the directory to /usr/local/pcsc/drivers/.  If the directory
 -/usr/local/pcsc/drivers/ does not exist create it before copying the driver
-+copy the directory to /usr/lib/pcsc/drivers/.  If the directory
-+/usr/lib/pcsc/drivers/ does not exist create it before copying the driver
++copy the directory to <libdir>/pcsc/drivers/.  If the directory
++<libdir>/pcsc/drivers/ does not exist create it before copying the driver
  directory to it.
  
  Example Mac OS X, Linux 2.4:
@@ -15,12 +15,12 @@
  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
++cp -r driver.bundle <libdir>/pcsc/drivers/
++cd <libdir>/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.
++The <libdir>/pcsc/drivers/ directory should contain bundle directories only.
  You must restart pcscd to use the new driver.
  
  
diff --git a/system/pcsc-lite/doinst.sh b/system/pcsc-lite/doinst.sh
index 1555bf6c5fda..7669b280aaa5 100644
--- a/system/pcsc-lite/doinst.sh
+++ b/system/pcsc-lite/doinst.sh
@@ -1,3 +1,4 @@
+#!/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 6ffbf7181901..681b74800fc8 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-8  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2007-2009  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=${VERSION:-1.4.102}
+VERSION=${VERSION:-1.5.3}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -36,14 +36,20 @@ OUTPUT=${OUTPUT:-/tmp}
 DEBUGATR=${DEBUGATR:-0}	# Debug is off by default
 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)
-
+# using upstream preferred behaviour by default (libhal)
+HALD=${HALD:-0}		# 0 for conservative detection behaviour, 1 for libhal
 # 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"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e 	# Exit on most errors
@@ -69,24 +75,31 @@ case "$DEBUGATR" in
 	;;
 esac
 
-# libusb and libhal support are mutually exclusive: using conservative behaviour (libusb)
+# libusb and libhal support are mutually exclusive for reader detection:
+case "$HALD" in
+    0)	LIBHAL_FLAG="--enable-libusb --disable-libhal"
+	;;
+    *)	LIBHAL_FLAG="--enable-libhal --disable-libusb"
+	;;
+esac	
+
 # --enable-runpid=/var/run/pcscd.pid is not supported anymore;
+# --enable-muscledropdir="<libdir>/pcsc/services" is not supported anymore;
 # pid directory changed to /var/run/pcscd for consistency
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --enable-confdir=/etc \
   --localstatedir=/var \
   --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}able-debugatr
+  --enable-usbdropdir="/usr/lib${LIBDIRSUFFIX}/pcsc/drivers" \
+  --${DEBUGATR_FLAG}able-debugatr \
+  $LIBHAL_FLAG
 
 make
 make install DESTDIR=$PKG
@@ -103,7 +116,7 @@ install -m 0755 $CWD/rc.pcscd $PKG/etc/rc.d/rc.pcscd.new
 mv $PKG/etc/reader.conf.d/reader.conf $PKG/etc/reader.conf.d/reader.conf.new
 
 # Create the directory for drivers and such (not included with this package)
-mkdir -p $PKG/usr/lib/pcsc/{drivers,services}
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pcsc/{drivers,services}
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -119,6 +132,7 @@ 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
 
@@ -127,8 +141,8 @@ rm -f $PKG/usr/doc/$PRGNAM-$VERSION/README.DAEMON
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION/
 case "$APIDOC" in
     1)	if [ -x $TEXTOPDFBIN ]; then
-	  $TEXTOPDFBIN ifdhandler-3.tex 
-	  $TEXTOPDFBIN pcsc-lite.tex
+	  $TEXTOPDFBIN ifdhandler-3.tex 1>&2 >/dev/null
+	  $TEXTOPDFBIN pcsc-lite.tex 1>&2 >/dev/null
 	else
 	    echo "API .pdf documentation NOT built."
 	fi
@@ -136,6 +150,7 @@ case "$APIDOC" in
     *) echo "API .pdf documentation NOT built."
 	;;
 esac
+
 for oldfiles in *.aux *.tex *.toc *.log *.bib *.out ; 
     do rm -f $oldfiles ; 
 done
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index 55fca857e1f7..0726c21ea1e6 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.102"
+VERSION="1.5.3"
 HOMEPAGE="http://pcsclite.alioth.debian.org"
-DOWNLOAD="http://alioth.debian.org/frs/download.php/2479/pcsc-lite-1.4.102.tar.bz2"
-MD5SUM="b97d3a725ab93662adf09acfbc49efeb"
+DOWNLOAD="http://alioth.debian.org/frs/download.php/3017/pcsc-lite-1.5.3.tar.bz2"
+MD5SUM="95fbd1fb1b51a6f22bb0dd4a796772d3"
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
-APPROVED="rworkman"
+APPROVED="dsomero"