From 498d5573f5aa26e794d20dd8deb35bb3cfc5c2e7 Mon Sep 17 00:00:00 2001
From: LukenShiro <lukenshiro@ngi.it>
Date: Wed, 14 Dec 2011 12:38:15 -0600
Subject: [PATCH] system/pcsc-lite: Updated for version 1.8.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/pcsc-lite/doinst.sh            | 18 +++++++++++-------
 system/pcsc-lite/pcsc-lite.SlackBuild | 18 +++++++++++++++---
 system/pcsc-lite/pcsc-lite.info       |  8 ++++----
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/system/pcsc-lite/doinst.sh b/system/pcsc-lite/doinst.sh
index 5086b84736..713fd54d6e 100644
--- a/system/pcsc-lite/doinst.sh
+++ b/system/pcsc-lite/doinst.sh
@@ -11,11 +11,15 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-if [ -e etc/rc.d/rc.pcscd ]; then
-  cp -a etc/rc.d/rc.pcscd etc/rc.d/rc.pcscd.new.incoming
-  cat etc/rc.d/rc.pcscd.new > etc/rc.d/rc.pcscd.new.incoming
-  mv etc/rc.d/rc.pcscd.new.incoming etc/rc.d/rc.pcscd.new
-fi
-
-config etc/rc.d/rc.pcscd.new
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
 
+preserve_perms etc/rc.d/rc.pcscd.new
diff --git a/system/pcsc-lite/pcsc-lite.SlackBuild b/system/pcsc-lite/pcsc-lite.SlackBuild
index 263bb33085..b4201e0867 100644
--- a/system/pcsc-lite/pcsc-lite.SlackBuild
+++ b/system/pcsc-lite/pcsc-lite.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=pcsc-lite
-VERSION=${VERSION:-1.7.2}
+VERSION=${VERSION:-1.8.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -40,6 +40,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Bail out if user or group isn't valid on your system
+# For slackbuilds.org, assigned pcscd uid/gid are 257/257
+# See http://slackbuilds.org/uid_gid.txt
+if ! grep ^pcscd: /etc/group 2>&1 > /dev/null; then
+    echo "  You must have a \"pcscd\" group to run this script."
+    echo "    # groupadd -g 257 pcscd"
+    exit 1
+elif ! grep ^pcscd: /etc/passwd 2>&1 > /dev/null; then
+    echo "  You must have a \"pcscd\" user to run this script."
+    echo "    # useradd -u 257 -g pcscd -d /var/run/pcscd -s /bin/false pcscd"
+    exit 1
+fi
+
 # Debug is off by default
 DEBUGATR=${DEBUGATR:-0}
 
@@ -124,7 +137,7 @@ sed -i "s|@sysconfdir_exp@|/etc/reader.conf.d|g" $PKG/usr/man/man8/pcscd.8
 # Create the directory for drivers and such (not included with this package)
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pcsc/{drivers,services}
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -134,7 +147,6 @@ 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.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
-
 # remove README.DAEMON, automatically installed by doc/Makefile.
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/README.DAEMON
 
diff --git a/system/pcsc-lite/pcsc-lite.info b/system/pcsc-lite/pcsc-lite.info
index 00da3d800f..9d358af5ce 100644
--- a/system/pcsc-lite/pcsc-lite.info
+++ b/system/pcsc-lite/pcsc-lite.info
@@ -1,10 +1,10 @@
 PRGNAM="pcsc-lite"
-VERSION="1.7.2"
+VERSION="1.8.1"
 HOMEPAGE="http://pcsclite.alioth.debian.org"
-DOWNLOAD="https://alioth.debian.org/frs/download.php/3533/pcsc-lite-1.7.2.tar.bz2"
-MD5SUM="47e7055cfc14399fdaa1b7a4aa06e5aa"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/3687/pcsc-lite-1.8.1.tar.bz2"
+MD5SUM="fd035e4f610eba6fa545159e60d0d780"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
-APPROVED="dsomero"
+APPROVED="rworkman"