diff options
| -rw-r--r-- | system/opensc/README | 8 | ||||
| -rw-r--r-- | system/opensc/doinst.sh | 1 | ||||
| -rw-r--r-- | system/opensc/opensc.SlackBuild | 28 | ||||
| -rw-r--r-- | system/opensc/opensc.info | 8 |
4 files changed, 26 insertions, 19 deletions
diff --git a/system/opensc/README b/system/opensc/README index 13c0f8fd6ae11..f4866279a666b 100644 --- a/system/opensc/README +++ b/system/opensc/README @@ -15,4 +15,10 @@ Beware! Smartcards have usually a limited number of times you may try a wrong PIN/PUK combination before they become inoperable/permanently blocked. You have been warned! -This requires pcsc-lite and openct. +This requires either pcsc-lite or openct (see below for details). + +Since version 0.12.0, only one reader subsystem can be used and compiled +in at the same time. The PCSC-LITE subsystem is used by default and it is +suitable for most smartcards (it requires pcsc-lite). If you need the +OPENCT subsystem instead, you have to pass "OPENCT=1" to the script when +building and have openct installed. diff --git a/system/opensc/doinst.sh b/system/opensc/doinst.sh index aeee8de287dc6..92ce19f61cf7b 100644 --- a/system/opensc/doinst.sh +++ b/system/opensc/doinst.sh @@ -12,4 +12,3 @@ config() { } config etc/opensc.conf.new - diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild index 202badbf50df9..8d2fec5c301df 100644 --- a/system/opensc/opensc.SlackBuild +++ b/system/opensc/opensc.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for opensc -# Copyright 2008-2010 LukenShiro <lukenshiro@ngi.it> +# Copyright 2008-2011 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=opensc -VERSION=${VERSION:-0.11.13} +VERSION=${VERSION:-0.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,7 +42,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="README COPYING NEWS" +DOCFILES="README COPYING NEWS ChangeLog" + +# opensc now supports only one reader subsystem (pcsc-lite or openct) +OPENCT=${OPENCT:-0} # pcsc-lite is the default, openct disabled + +case "$OPENCT" in + 0) RDRSUBSYS_flags="--enable-pcsc --disable-openct" ;; + *) RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;; +esac if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -69,6 +77,7 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# --enable-nsplugin and --with-pinentry= are no longer supported. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,11 +88,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --datarootdir=/usr/share \ --mandir=/usr/man \ - --enable-pcsc \ - --enable-nsplugin \ - --enable-doc \ - --enable-openct \ - --with-pinentry=/usr/bin/pinentry \ + $RDRSUBSYS_flags \ --build=$ARCH-slackware-linux make @@ -95,15 +100,12 @@ mv $PKG/etc/opensc.conf $PKG/etc/opensc.conf.new find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done 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 mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info index 21e44d93b60c4..7de5f119b93b1 100644 --- a/system/opensc/opensc.info +++ b/system/opensc/opensc.info @@ -1,10 +1,10 @@ PRGNAM="opensc" -VERSION="0.11.13" +VERSION="0.12.0" HOMEPAGE="http://www.opensc-project.org/opensc/" -DOWNLOAD="http://www.opensc-project.org/files/opensc/opensc-0.11.13.tar.gz" -MD5SUM="98fa151e947941f9c3f27420fdf47c11" +DOWNLOAD="http://www.opensc-project.org/files/opensc/opensc-0.12.0.tar.gz" +MD5SUM="630fa3b8717d22a1d069d120153a0c52" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="LukenShiro" EMAIL="lukenshiro@ngi.it" -APPROVED="dsomero" +APPROVED="rworkman" |