pcsc: upgraded pcsc related packages

conraid · Apr 10, 2016 · 806ae4f · 806ae4f
1 parent 043cdfc
commit 806ae4f
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 57 deletions.
diff --git a/pcsc-lite/README b/pcsc-lite/README
@@ -1,5 +1,5 @@
 
-Slackware Current Repository by Conraid 
+Slackware Current Repository by Conraid
 
 ======================================================================
 

diff --git a/pcsc-lite/pcsc-lite.SlackBuild b/pcsc-lite/pcsc-lite.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for pcsc-lite
 #
-# Copyright 2014-2015 Corrado Franco (http://conraid.net)
+# Copyright 2014-2016 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,8 +30,8 @@ set -eu
 CWD=$(pwd)
 
 PRGNAM=pcsc-lite
-VERSION=${VERSION:-1.8.14}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.8.16}
+BUILD=${BUILD:-1}
 TAG=${TAG:-cf}
 TMP=${TMP:-/tmp/pkg}
 PKG=$TMP/package-$PRGNAM
@@ -41,9 +41,9 @@ DOCFILES="AUTHORS COPYING ChangeLog* DRIVERS GPL* HELP INSTALL NEWS README SECUR
 
 if [ -z ${ARCH:=""} ]; then
   case "$( uname -m )" in
-  i?86) ARCH=i686 ;;
-  arm*) ARCH=arm ;;
-  *) ARCH=$( uname -m ) ;;
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -54,7 +54,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -69,17 +69,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go+r-w,a+X-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -88,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --enable-shared=yes \
   --enable-ipcdir=/var/run/pcscd \
-  --enable-usbdropdir="/usr/lib$LIBDIRSUFFIX/pcsc/drivers" \
+  --enable-usbdropdir="/usr/lib${LIBDIRSUFFIX}/pcsc/drivers" \
   --enable-confdir=/etc/reader.conf.d \
   --disable-debugatr \
   --host=$ARCH-slackware-linux \
@@ -115,7 +111,7 @@ fi
 install -Dm0755 $CWD/rc.pcscd $PKG/etc/rc.d/rc.pcscd.new
 
 # Create the directory for drivers and such (not included with this package) (thanks to SBo)
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pcsc/{drivers,services}
+mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pcsc/{drivers,services}
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION

diff --git a/pcsc-lite/pcsc-lite.info b/pcsc-lite/pcsc-lite.info
@@ -1,10 +1,10 @@
 PRGNAM="pcsc-lite"
-VERSION="1.8.14"
+VERSION="1.8.16"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
-DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2"
-FILENAME="pcsc-lite-1.8.14.tar.bz2"
+DOWNLOAD="https://alioth.debian.org/frs/download.php/file/4164/pcsc-lite-1.8.16.tar.bz2"
+FILENAME="pcsc-lite-1.8.16.tar.bz2"
 REQUIRES=""
-MD5SUM="439b2c8892f502e39e5b8997a7ae01ed"
-SHASUM="f498dc65f1763818a7e813a46a15be744639dbb3"
+MD5SUM="14a8ab01c225ba90f03d0720ad714c12"
+SHASUM="e99c6202eff1711650c6b4e9ddae67960897d7b1"
 MAINTAINER="Corrado Franco"
 EMAIL="conraid (at) linux (dot) it"
diff --git a/pcsc-perl/README b/pcsc-perl/README
@@ -1,5 +1,5 @@
 
-Slackware Current Repository by Conraid 
+Slackware Current Repository by Conraid
 
 ======================================================================
 

diff --git a/pcsc-perl/pcsc-perl.SlackBuild b/pcsc-perl/pcsc-perl.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for pcsc-perl
 #
-# Copyright 2014-2015 Corrado Franco (http://conraid.net)
+# Copyright 2014-2016 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,8 +30,8 @@ set -eu
 CWD=$(pwd)
 
 PRGNAM=pcsc-perl
-VERSION=${VERSION:-1.4.13}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4.14}
+BUILD=${BUILD:-1}
 TAG=${TAG:-cf}
 TMP=${TMP:-/tmp/pkg}
 PKG=$TMP/package-$PRGNAM
@@ -54,7 +54,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -69,11 +69,7 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go+r-w,a+X-s .
 
 PERL_MM_USE_DEFAULT=1 \
 perl Makefile.PL \

diff --git a/pcsc-perl/pcsc-perl.info b/pcsc-perl/pcsc-perl.info
@@ -1,10 +1,10 @@
 PRGNAM=pcsc-perl""
-VERSION="1.4.13"
+VERSION="1.4.14"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"
-DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.4.13.tar.bz2"
-FILENAME="pcsc-perl-1.4.13.tar.bz2"
+DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-perl/pcsc-perl-1.4.14.tar.bz2"
+FILENAME="pcsc-perl-1.4.14.tar.bz2"
 REQUIRES="pcsc-lite"
-MD5SUM="758ca469b79667fa8c41422df86a088b"
-SHASUM="2370451b374b3786c7b729e95d0fa16f1220eda0"
+MD5SUM="45601505dbb7b27329811ac9bad35fab"
+SHASUM="dd1fd3a7272c8221e16c3e83160e23fba1c4e494"
 MAINTAINER="Corrado Franco"
 EMAIL="conraid (at) linux (dot) it"
diff --git a/pcsc-tools/README b/pcsc-tools/README
@@ -1,5 +1,5 @@
 
-Slackware Current Repository by Conraid 
+Slackware Current Repository by Conraid
 
 ======================================================================
 

diff --git a/pcsc-tools/pcsc-tools.SlackBuild b/pcsc-tools/pcsc-tools.SlackBuild
@@ -2,7 +2,7 @@
 #
 # Slackware build script for pcsc-tools
 #
-# Copyright 2014-2015 Corrado Franco (http://conraid.net)
+# Copyright 2014-2016 Corrado Franco (http://conraid.net)
 # All rights reserved.
 #
 # This program is free software: you can redistribute it and/or modify
@@ -29,22 +29,21 @@ set -eu
 
 CWD=$(pwd)
 
-PRGNAM=${PRGNAM:-pcsc-tools}
-VERSION=${VERSION:-1.4.24}
+PRGNAM=pcsc-tools
+VERSION=${VERSION:-1.4.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-cf}
 TMP=${TMP:-/tmp/pkg}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="Changelog LICENCE MANIFEST README TODO *.txt"
+DOCFILES="Changelog LICENCE MANIFEST README *.txt"
 
-ARCH=${ARCH:=""} # Set ARCH or leave blank to determine it automatically
 if [ -z ${ARCH:=""} ]; then
   case "$( uname -m )" in
-  i?86) ARCH=i686 ;;
-  arm*) ARCH=arm ;;
-  *) ARCH=$( uname -m ) ;;
+    i?86) ARCH=i686 ;;
+    arm*) ARCH=arm ;;
+    *) ARCH=$( uname -m ) ;;
   esac
 fi
 
@@ -55,7 +54,7 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -pipe -fomit-frame-pointer"
   LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
@@ -70,11 +69,7 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go+r-w,a+X-s .
 
 # Sane man path
 sed 's|/share/man|/man|' -i Makefile
@@ -85,7 +80,7 @@ make DESTDIR=$PKG/usr install
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs -r strip --strip-unneeded 2> /dev/null || true
 find $PKG | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs -r strip -g 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION || more
 cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 

diff --git a/pcsc-tools/pcsc-tools.info b/pcsc-tools/pcsc-tools.info
@@ -1,10 +1,10 @@
 PRGNAM="pcsc-tools"
-VERSION="1.4.24"
+VERSION="1.4.26"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
-DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.24.tar.gz"
-FILENAME="pcsc-tools-1.4.24.tar.gz"
+DOWNLOAD="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.26.tar.gz"
+FILENAME="pcsc-tools-1.4.26.tar.gz"
 REQUIRES="pcsc-lite pcsc-perl"
-MD5SUM="3260d995e8090b808519443b7d739ba5"
-SHASUM="bac6516b9b68acb8e6f8819999c28812d84ff1a7"
+MD5SUM="b8376b1dc14bb43f799e5be67f55efe3"
+SHASUM="4817813b10d716c704f6e8fb6677ee472617a9c8"
 MAINTAINER="Corrado Franco"
 EMAIL="conraid (at) linux (dot) it"