Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c30d301adde3174432e63fc5361287a41fda4fc1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (c30d301adde3174432e63fc5361287a41fda4fc1)
  • Date: Tue, 17 Aug 2010 05:21:54 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/pcsc-lite/BUILD | 12 ++++++------
crypto/pcsc-lite/CONFIGURE | 3 +--
crypto/pcsc-lite/DEPENDS | 10 +++++-----
crypto/pcsc-lite/DETAILS | 6 +++---
crypto/pcsc-lite/HISTORY | 7 ++++---
5 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 3e0d2558cd2f696ce9905d9e1342a8e5ffa951ed
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/pcsc-lite: version 1.6.4, removed obsolete options, corrected
dependencies on hal/libusb

commit 66b22968d92577e48db7a9d5ede365f822449403
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

Revert "crypto/pcsc-lite: version 1.6.4"

This reverts commit df5b861a3e9c61d7a3009dc49b2467919b644437.

diff --git a/crypto/pcsc-lite/BUILD b/crypto/pcsc-lite/BUILD
index 2955b44..c6fb978 100755
--- a/crypto/pcsc-lite/BUILD
+++ b/crypto/pcsc-lite/BUILD
@@ -1,9 +1,9 @@
-OPTS="$PCSC_MUSCLE \
- $PCSC_EXADPU \
- --enable-confdir=$INSTALL_ROOT/etc/pcsc-lite \
- --enable-ipcdir=/var/run/ipc \
- --enable-runpid=/var/run \
- $OPTS" &&
+if [[ $PCSC_DEVICE_ACCESS != hal ]]; then
+ OPTS="--disable-libhal $OPTS"
+fi &&
+if [[ $PCSC_DEVICE_ACCESS != libusb ]]; then
+ OPTS="--disable-libusb $OPTS"
+fi &&

make_single &&
default_build &&
diff --git a/crypto/pcsc-lite/CONFIGURE b/crypto/pcsc-lite/CONFIGURE
index 0dd7deb..f6c7ac4 100755
--- a/crypto/pcsc-lite/CONFIGURE
+++ b/crypto/pcsc-lite/CONFIGURE
@@ -1,2 +1 @@
-config_query_option PCSC_MUSCLE "Enable MUSCLE support?" y
"--enable-muscledropdir=/usr/lib/pcsc-lite/services" &&
-config_query_option PCSC_EXAPDU "Enable extended APDU support?" n
"--enable-extendedapdu"
+config_query_list PCSC_DEVICE_ACCESS "which library do you want to use to
access devices?" none libusb hal
diff --git a/crypto/pcsc-lite/DEPENDS b/crypto/pcsc-lite/DEPENDS
index 7641855..7b06d25 100755
--- a/crypto/pcsc-lite/DEPENDS
+++ b/crypto/pcsc-lite/DEPENDS
@@ -1,6 +1,6 @@
depends g++ &&
-optional_depends libusb "--enable-libusb" "--disable-libusb" "for USB
support" &&
-
-optional_depends hal \
- "" "--disable-libhal" \
- "for HAL support"
+if [[ $PCSC_DEVICE_ACCESS == libusb ]]; then
+ depends libusb "--enable-libusb"
+elif [[ $PCSC_DEVICE_ACCESS == hal ]]; then
+ depends hal "--enable-libhal"
+fi
diff --git a/crypto/pcsc-lite/DETAILS b/crypto/pcsc-lite/DETAILS
index ca78b63..aead4f4 100755
--- a/crypto/pcsc-lite/DETAILS
+++ b/crypto/pcsc-lite/DETAILS
@@ -1,9 +1,9 @@
SPELL=pcsc-lite
VERSION=1.6.4
-
SOURCE_HASH=sha512:db2794113f2091273dc33f21ea0a56d527b59df67947f22860d40aef1f1414fc6a9c54b3a1fae8e5c3131f6c1f155593508418ccdbab49deec8fdbc121ffdbb0
+
SOURCE_HASH=sha512:4f6aaab1fbd1652a8dc84c151ef7d4568c076c2090b4a6059b9362940a8da7a6e50421a0cfb3ff6b2383733385e63686d95884ba4b9ad28f4cbcab2cfac29210
SOURCE=$SPELL-$VERSION.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-1.6.2"
- SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3329/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/3337/$SOURCE
WEB_SITE=http://pcsclite.alioth.debian.org/
LICENSE[0]=BSD
ENTERED=20050106
diff --git a/crypto/pcsc-lite/HISTORY b/crypto/pcsc-lite/HISTORY
index ff54c22..c3ffdba 100644
--- a/crypto/pcsc-lite/HISTORY
+++ b/crypto/pcsc-lite/HISTORY
@@ -1,6 +1,7 @@
-2010-08-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DETAILS: 1.6.4
- * DEPENDS: made dependency on libusb optional
+2010-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.6.4
+ * BUILD, DEPENDS, CONFIGURE: removed obsolete options,
+ made dependency on libusb or hal mutually exclusive

2010-08-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.6.2




Archive powered by MHonArc 2.6.24.

Top of Page