6 files changed, 60 insertions, 81 deletions
diff --git a/system/openct/README b/system/openct/README
index fc4f066f7f3c8..3096d8d03fd1b 100644
--- a/system/openct/README
+++ b/system/openct/README
@@ -4,35 +4,12 @@ a small and lean middleware, so applications can use it with minimal
 overhead. OpenCT also has a primitive mechanism to export smart card
 readers to remote machines via TCP/IP.
 
-This requires pcsc-lite (available on SlackBuilds.org).
+This requires pcsc-lite.
 
-For serial and pcmcia readers only, for using it as a PC/SC ifdhandler,
-you have to edit file reader-openct.conf in /etc/reader.conf.d/, to
-comment lines in other file(s) and run "/usr/sbin/update-reader.conf".
-
-Compiling with "APIDOC=1 ./openct.SlackBuild" produces API .pdf
-documentation (mainly intended for developers).
-
-Compiling with "HALD=1 ./openct.SlackBuild" enable smart-card reader
-detection using hal daemon's .fdi files. By default openct uses udev rules
-instead to detect it. Hal and udev are alternative.
-
-Compiling with "NONPRIV=1 ./openct.SlackBuild" enable non-privileged
-mode, but you may need to modify /etc/rc.d/rc.openctd to allow 'chown'
-to change user/group.
-
-To start OpenCT daemon, run "/etc/rc.d/rc.openctd start". This is 
-most easily accomplished by adding the following to /etc/rc.d/rc.local:
-	if [ -x /etc/rc.d/rc.openctd ]; then
-		/etc/rc.d/rc.openctd start
-	fi
-
-Beware!
-- OpenCT daemon is meant as _alternative_ to pcsc-lite: running rc.openctd
-and rc.pcscd at the same time can and will lead to unforseeable problems
-(specially with usb devices that can be managed by both of them, one daemon
-can claim one device, making it unavailable for other daemon).
-- for some unknown reasons, if you start rc.openctd and then stop it,
-you may need unplug and plug-in your usb smartcard reader in order
-to it to be seen again, so udev rule is re-applied.
+Smart-card reader detection using hal daemon is now deprecated. We use
+udev rules only.
+Compiling with "NONPRIV=1 ./openct.SlackBuild" enables
+non-privileged mode, but you may need to modify /etc/rc.d/rc.openctd 
+to allow 'chown' to change user/group.
 
+See README.SBo for further information.
diff --git a/system/openct/README.SBo b/system/openct/README.SBo
new file mode 100644
index 0000000000000..c15b64f27449a
--- /dev/null
+++ b/system/openct/README.SBo
@@ -0,0 +1,18 @@
+To start OpenCT daemon, run "/etc/rc.d/rc.openctd start". This is 
+most easily accomplished by adding the following to /etc/rc.d/rc.local:
+	if [ -x /etc/rc.d/rc.openctd ]; then
+		/etc/rc.d/rc.openctd start
+	fi
+
+For serial and pcmcia readers only, for using it as a PC/SC ifdhandler,
+you have to edit file reader-openct.conf in /etc/reader.conf.d/, to
+comment lines in other file(s) and run "/usr/sbin/update-reader.conf".
+
+Beware!
+- OpenCT daemon is meant as _alternative_ to pcsc-lite: running rc.openctd
+and rc.pcscd at the same time can and will lead to unforseeable problems
+(specially with usb devices that can be managed by both of them, one daemon
+can claim one device, making it unavailable for other daemon).
+- for some unknown reasons, if you start rc.openctd and then stop it,
+you may need unplug and plug-in your usb smartcard reader in order
+to it to be seen again, so udev rule is re-applied.
diff --git a/system/openct/doinst.sh b/system/openct/doinst.sh
index 359dfdfc76be9..bb02ff148c41b 100644
--- a/system/openct/doinst.sh
+++ b/system/openct/doinst.sh
@@ -21,3 +21,4 @@ fi
 config etc/rc.d/rc.openctd.new
 config etc/openct.conf.new
 config etc/reader.conf.d/reader-openct.conf.new
+
diff --git a/system/openct/openct.SlackBuild b/system/openct/openct.SlackBuild
index b4083691053f6..3924ed707fb5e 100644
--- a/system/openct/openct.SlackBuild
+++ b/system/openct/openct.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for openct
 
-# Copyright 2008-2009  LukenShiro <lukenshiro@ngi.it>
+# Copyright 2008-2010  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=openct
-VERSION=${VERSION:-0.6.16}
+VERSION=${VERSION:-0.6.19}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,7 +35,7 @@ OUTPUT=${OUTPUT:-/tmp}
 
 APIDOC=${APIDOC:-0}	# api documentation not built by default
 NONPRIV=${NONPRIV:-0}	# disable not-privileged mode (it will be used by root)
-HALD=${HALD:-0}		# hal detection is disabled by default, we use udev instead
+
 DOCFILES="NEWS TODO LGPL-2.1"
 
 if [ "$ARCH" = "i486" ]; then
@@ -81,13 +81,6 @@ case "$NONPRIV" in
 	;;
 esac
 
-case "$HALD" in
-    0)	UDEV_FLAGS="--with-udev=/lib${LIBDIRSUFFIX}/udev"
-	;;
-    *)	UDEV_FLAGS=""		# do nothing
-	;;
-esac
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -105,10 +98,10 @@ CXXFLAGS="$SLKCFLAGS" \
   --${APIDOC_FLAG}able-api-doc \
   --with-ifddir=/usr/lib${LIBDIRSUFFIX}/ifd \
   --disable-static \
-  --build=$ARCH-slackware-linux \
+  --with-udev=/lib/udev \
   --with-daemon-user=root \
   $NONPRIV_FLAGS \
-  $UDEV_FLAGS
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -139,35 +132,21 @@ sed -i "s|^DEVICENAME|#DEVICENAME|g" $PKG/etc/reader.conf.d/reader-openct.conf.n
 sed -i "s|^LIBPATH|#LIBPATH|g" $PKG/etc/reader.conf.d/reader-openct.conf.new
 sed -i "s|^CHANNELID|#CHANNELID|g" $PKG/etc/reader.conf.d/reader-openct.conf.new
 
-# Hal and udev detection are alternative, and their rules should not be
-# installed at the same time, according to upstream.
-case "$HALD" in
-    0)	# Install udev scripts for openct
-	mkdir -p $PKG/lib${LIBDIRSUFFIX}/udev
-	install -m755 etc/openct_usb $PKG/lib${LIBDIRSUFFIX}/udev/openct_usb
-	install -m755 etc/openct_pcmcia $PKG/lib${LIBDIRSUFFIX}/udev/openct_pcmcia
-	install -m755 etc/openct_serial $PKG/lib${LIBDIRSUFFIX}/udev/openct_serial
-
-	# Install udev rules for openct
-	mkdir -p $PKG/lib${LIBDIRSUFFIX}/udev/rules.d
-	cp -a etc/openct.udev $PKG/lib${LIBDIRSUFFIX}/udev/rules.d/95-openct.rules
-	# Update attributes according to recent udev rules' naming convention
-	sed -i "s|SYSFS{|ATTR{|g" $PKG/lib${LIBDIRSUFFIX}/udev/rules.d/95-openct.rules
-	# WAIT_FOR_SYSFS is replaced by WAIT_FOR in udev>=123:
-	sed -i "s|WAIT_FOR_SYSFS=|WAIT_FOR=|g" $PKG/lib${LIBDIRSUFFIX}/udev/rules.d/95-openct.rules
-	# modification taken to prevent bug (as happened in other distributions:
-	# i.e. https://bugzilla.redhat.com/287871):
-	# it seems 'sleep' program would otherwise be applied to every usb add
-	# event, not only to this one
-	sed -i "s|^PROGRAM=|#PROGRAM=|g" $PKG/lib${LIBDIRSUFFIX}/udev/rules.d/95-openct.rules
-	;;
-    *)	# Install openct rules/script for hal
-	mkdir -p $PKG/usr/share/hal/fdi/information/10freedesktop/
-	cp -a etc/openct.fdi $PKG/usr/share/hal/fdi/information/10freedesktop/10-usb-openct.fdi
-	mkdir -p $PKG/usr/libexec
-	install -m755 etc/openct.hald $PKG/usr/libexec/hald-addon-openct
-	;;
-esac
+# Hal detection is now deprecated by upstream, so we use udev detection.
+# Install udev scripts for openct
+mkdir -p $PKG/lib/udev
+install -m755 etc/openct_usb $PKG/lib/udev/openct_usb
+install -m755 etc/openct_pcmcia $PKG/lib/udev/openct_pcmcia
+install -m755 etc/openct_serial $PKG/lib/udev/openct_serial
+
+# Install udev rules for openct
+mkdir -p $PKG/lib/udev/rules.d
+cp -a etc/openct.udev $PKG/lib/udev/rules.d/95-openct.rules
+# modification taken to prevent bug (as happened in other distributions:
+# i.e. https://bugzilla.redhat.com/287871):
+# it seems 'sleep' program would otherwise be applied to every usb add
+# event, not only to this one
+sed -i "s|^PROGRAM=|#PROGRAM=|g" $PKG/lib/udev/rules.d/95-openct.rules
 
 # Directory for status, socket and lock files
 mkdir -p $PKG/var/run/openct
@@ -183,8 +162,10 @@ chown $USR_GRP $PKG/var/run/openct
 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/ifd
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -203,4 +184,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/openct/openct.info b/system/openct/openct.info
index 8dc3749ed2ae0..81ee2f311df9e 100644
--- a/system/openct/openct.info
+++ b/system/openct/openct.info
@@ -1,8 +1,10 @@
 PRGNAM="openct"
-VERSION="0.6.16"
+VERSION="0.6.19"
 HOMEPAGE="http://www.opensc-project.org/openct/"
-DOWNLOAD="http://www.opensc-project.org/files/openct/openct-0.6.16.tar.gz"
-MD5SUM="d8d8c63269985303a303a218c4b953d7"
+DOWNLOAD="http://www.opensc-project.org/files/openct/openct-0.6.19.tar.gz"
+MD5SUM="273f6dfd1c5f32990e23e8a0f3ca261c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="LukenShiro"
 EMAIL="lukenshiro@ngi.it"
 APPROVED="dsomero"
diff --git a/system/openct/slack-desc b/system/openct/slack-desc
index 772bb515a8c1b..d15bd8bfb17d8 100644
--- a/system/openct/slack-desc
+++ b/system/openct/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler---------------------------------------------------|
 openct: openct (Middleware framework for smart card terminals)
-openct: 
+openct:
 openct: It implements drivers for several smart card readers.  It comes as
 openct: driver in ifdhandler format for PC/SC-Lite, as CT-API driver, or
 openct: as a small and lean middleware, so applications can use it with 
 openct: minimal overhead.  OpenCT also has a primitive mechanism to export 
 openct: smart card readers to remote machines via TCP/IP.
-openct: 
+openct:
 openct: Homepage: http://www.opensc-project.org/openct/
-openct: 
-openct: 
+openct:
+openct: