Hello community,
here is the log from the commit of package pcsc-gempc
checked in at Sun Jun 3 21:59:12 CEST 2007.
--------
--- pcsc-gempc/pcsc-gempc.changes 2006-05-26 13:24:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/pcsc-gempc/pcsc-gempc.changes 2007-06-01 15:22:53.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Jun 1 15:22:39 CEST 2007 - sbrabec@suse.cz
+
+- Updated to version 1.0.1:
+ * Minor fixes.
+ * Define interface, bulk_in and bulk_out fields and store the
+ device values.
+- Build with libusb-devel.
+
+-------------------------------------------------------------------
Old:
----
ifd-gempc-1.0.0.tar.bz2
New:
----
ifd-gempc-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcsc-gempc.spec ++++++
--- /var/tmp/diff_new_pack.L17630/_old 2007-06-03 21:57:26.000000000 +0200
+++ /var/tmp/diff_new_pack.L17630/_new 2007-06-03 21:57:26.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package pcsc-gempc (Version 1.0.0)
+# spec file for package pcsc-gempc (Version 1.0.1)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -11,18 +11,19 @@
# norootforbuild
Name: pcsc-gempc
-BuildRequires: pcsc-lite-devel pkgconfig
-Version: 1.0.0
-Release: 13
+%define _name ifd-gempc
+BuildRequires: libusb-devel pcsc-lite-devel pkg-config
+Version: 1.0.1
+Release: 1
Group: System/Libraries
-License: GPL, BSD
-URL: http://ludovic.rousseau.free.fr/softwares
+License: BSD License and BSD-like, GNU General Public License (GPL)
+URL: http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/
Summary: PCSC driver for the Gemplus GemPC 410/430 smartcard readers
-Source0: ifd-gempc-%{version}.tar.bz2
-Patch0: ifd-gempc-%{version}-devname.diff
-Patch1: ifd-gempc-%{version}-makefile.diff
+Source0: %{_name}-%{version}.tar.bz2
+Patch0: %{_name}-1.0.0-devname.diff
+Patch1: %{_name}-1.0.0-makefile.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%define ifddir %{_libdir}/readers
+%define ifddir %(pkg-config libpcsclite --variable=usbdropdir)
%description
This package contains a driver for the GemPC 410 and GemPC 430 smart
@@ -37,33 +38,42 @@
Jean-Luc Giraud
%prep
-%setup -q -n ifd-gempc-%{version}
+%setup -q -n %{_name}-%{version}
%patch0
%patch1
+mv README.410 README_410
+mv README.430 README_430
+for DIR in GemPC410 GemPC430 ; do
+ for FILE in $DIR/COPYING* $DIR/TODO* ; do
+ SUFFIX=.${FILE##*.}
+ if test "$SUFFIX" = ".$FILE" ; then
+ SUFFIX=
+ fi
+ mv $FILE ${FILE%.*}${DIR#GemPC}$SUFFIX
+ done
+done
%build
-#make CFLAGS="$RPM_OPT_FLAGS -DFOO"
+make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS"
%install
-install -d $RPM_BUILD_ROOT%{ifddir}/
-make -C common clean
-make -C GemPC410 install CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT
-make -C common clean
-make -C GemPC430 install CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT
-ln -sf libGemPC410.so.1.0.0 $RPM_BUILD_ROOT%{ifddir}/libGemPC410.so
-chmod +x $RPM_BUILD_ROOT%{ifddir}/libGemPC410.so
-cp GemPC410/COPYING.GPL LICENSE.410
-cp GemPC430/COPYING LICENSE.430
+%makeinstall
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc LICENSE* README*
+%doc Changelog README* Gem*/COPYING* Gem*/TODO*
%{ifddir}/
-%changelog -n pcsc-gempc
+%changelog
+* Fri Jun 01 2007 - sbrabec@suse.cz
+- Updated to version 1.0.1:
+ * Minor fixes.
+ * Define interface, bulk_in and bulk_out fields and store the
+ device values.
+- Build with libusb-devel.
* Fri May 26 2006 - schwab@suse.de
- Don't strip binaries.
* Wed Jan 25 2006 - mls@suse.de
++++++ ifd-gempc-1.0.0.tar.bz2 -> ifd-gempc-1.0.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/Changelog new/ifd-gempc-1.0.1/Changelog
--- old/ifd-gempc-1.0.0/Changelog 2005-06-17 14:39:54.000000000 +0200
+++ new/ifd-gempc-1.0.1/Changelog 2006-02-09 14:31:18.000000000 +0100
@@ -1,3 +1,17 @@
+2006-02-09 Ludovic Rousseau
+
+ * README: release 1.0.1
+
+ * GemPC430/libusb_wrap.c, common/GCdebug.c, common/ifdhandler.c:
+ fix some compilation warnings with gcc 4.0
+
+ * check:
+ allow compilation with pcsc-lite-1.2.9-beta10. The script was buggy
+ for beta > 9
+
+ * GemPC430/libusb_wrap.c:
+ WriteUSB(): remove a useless "POUET" debug message
+
2005-06-17 Ludovic Rousseau
* GemPC430/libusb_wrap.c:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/check new/ifd-gempc-1.0.1/check
--- old/ifd-gempc-1.0.0/check 2005-06-17 12:44:23.000000000 +0200
+++ new/ifd-gempc-1.0.1/check 2006-02-09 14:28:25.000000000 +0100
@@ -18,7 +18,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# this code is greatly inspired by configure scripts generated by autoconf
-# $Id: check,v 1.9 2005/06/17 10:44:23 rousseau Exp $
+# $Id: check,v 1.10 2006-02-09 13:28:25 rousseau Exp $
exec 5>./config.log
@@ -92,9 +92,24 @@
#include <$ac_hdr>
int main() {
if (strcmp(PCSCLITE_VERSION_NUMBER, $ac_version) < 0)
-return 1;
+{
+ char cpcsc[] = PCSCLITE_VERSION_NUMBER;
+ char cdriver[] = $ac_version;
+
+ /* compare "1.2.9-beta" */
+ if (strncmp(cpcsc, cdriver, 10) == 0)
+ {
+ int p, v;
+ p = atoi(cpcsc+10);
+ v = atoi(cdriver+10);
+
+ if (v<=p)
+ return 0;
+ }
+ return 1;
+}
else
-return 0;
+ return 0;
}
EOF
if { (eval $ac_link) 2>&5; } && ./conftest; then
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/common/GCdebug.c new/ifd-gempc-1.0.1/common/GCdebug.c
--- old/ifd-gempc-1.0.0/common/GCdebug.c 2005-06-17 12:20:43.000000000 +0200
+++ new/ifd-gempc-1.0.1/common/GCdebug.c 2006-02-09 14:29:35.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * $Id: GCdebug.c,v 1.7 2005/06/17 10:20:43 rousseau Exp $
+ * $Id: GCdebug.c,v 1.8 2006-02-09 13:29:35 rousseau Exp $
* GCdebug.c: log (or not) messages
* Copyright (C) 2001 Ludovic Rousseau
*
@@ -34,7 +34,7 @@
const int len)
{
int i;
- unsigned char *c, *debug_buf_end;
+ char *c, *debug_buf_end;
debug_buf_end = DebugBuffer + DEBUG_BUF_SIZE - 5;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/common/ifdhandler.c new/ifd-gempc-1.0.1/common/ifdhandler.c
--- old/ifd-gempc-1.0.0/common/ifdhandler.c 2004-07-24 16:31:04.000000000 +0200
+++ new/ifd-gempc-1.0.1/common/ifdhandler.c 2006-02-09 14:29:35.000000000 +0100
@@ -13,7 +13,7 @@
/ See http://www.linuxnet.com for more information.
/ License: See file COPYING.BSD
/
-/ $Id: ifdhandler.c,v 1.25 2004/07/24 14:31:04 rousseau Exp $
+/ $Id: ifdhandler.c,v 1.26 2006-02-09 13:29:35 rousseau Exp $
/
******************************************************************/
@@ -449,7 +449,7 @@
/* just (CLA, INS, P1, P2) for an APDU */
if (TxLength == ISO_CMD_SIZE)
{
- char cmd[ISO_CMD_SIZE + ISO_LENGTH_SIZE];
+ unsigned char cmd[ISO_CMD_SIZE + ISO_LENGTH_SIZE];
/* copy CLA, INS, P1, P2 */
memcpy(cmd, TxBuffer, ISO_CMD_SIZE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/GemPC430/libusb_wrap.c new/ifd-gempc-1.0.1/GemPC430/libusb_wrap.c
--- old/ifd-gempc-1.0.0/GemPC430/libusb_wrap.c 2005-06-17 14:39:19.000000000 +0200
+++ new/ifd-gempc-1.0.1/GemPC430/libusb_wrap.c 2006-02-09 14:29:33.000000000 +0100
@@ -1,6 +1,6 @@
/*
* libusb_wrap.c
- * $Id: libusb_wrap.c,v 1.18 2005/06/17 12:39:19 rousseau Exp $
+ * $Id: libusb_wrap.c,v 1.20 2006-02-09 13:29:33 rousseau Exp $
* USB access routines using the libusb library
*
* Created by Ludovic Rousseau on Sep 27 2002
@@ -245,11 +245,11 @@
DEBUG_XXD(debug_header, buffer, length);
- rv = usb_bulk_write(usbDevice[reader].handle, usbDevice[reader].bulk_out, buffer, length, USB_WRITE_TIMEOUT);
+ rv = usb_bulk_write(usbDevice[reader].handle, usbDevice[reader].bulk_out,
+ (char *)buffer, length, USB_WRITE_TIMEOUT);
if (rv < 0)
{
- DEBUG_CRITICAL("POUET");
if (usbDevice[reader].dev->bus)
{
DEBUG_CRITICAL4("%s/%s: %s", usbDevice[reader].dev->bus->dirname,
@@ -291,7 +291,8 @@
sprintf(debug_header, "<- %06X ", (int)lun);
- rv = usb_bulk_read(usbDevice[reader].handle, usbDevice[reader].bulk_in, buffer, *length, USB_READ_TIMEOUT);
+ rv = usb_bulk_read(usbDevice[reader].handle, usbDevice[reader].bulk_in,
+ (char *)buffer, *length, USB_READ_TIMEOUT);
*length = rv;
if (rv < 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/GemPC430/Makefile new/ifd-gempc-1.0.1/GemPC430/Makefile
--- old/ifd-gempc-1.0.0/GemPC430/Makefile 2005-06-17 14:39:26.000000000 +0200
+++ new/ifd-gempc-1.0.1/GemPC430/Makefile 2006-02-08 20:43:47.000000000 +0100
@@ -1,5 +1,5 @@
#
-# $Id: Makefile,v 1.46 2005/06/17 10:58:50 rousseau Exp $
+# $Id: Makefile,v 1.46 2005-06-17 10:58:50 rousseau Exp $
#
# set these paths to where you installed pcsc-lite and libusb
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ifd-gempc-1.0.0/README new/ifd-gempc-1.0.1/README
--- old/ifd-gempc-1.0.0/README 2005-06-17 13:02:39.000000000 +0200
+++ new/ifd-gempc-1.0.1/README 2006-02-09 14:29:55.000000000 +0100
@@ -96,6 +96,12 @@
History:
========
+1.0.1 - 9 February 2006, Ludovic Rousseau
+ - remove a useless "POUET" debug message
+ - allow compilation with pcsc-lite-1.2.9-beta10. The check script
+ was buggy for beta > 9
+ - fix some compilation warnings with gcc 4.0
+
1.0.0 - 17 June 2005, Ludovic Rousseau
- use new pcscd log function with dynamic level
- use `pkg-config libpcsclite --variable=usbdropdir` to know where
@@ -356,6 +362,6 @@
?.? - 25 Sep 2001, Jean-Luc Giraud
release of ifdhandler.{c,h} and GemCore.h
-$Id: README,v 1.33 2005/06/17 11:02:39 rousseau Exp $
+$Id: README,v 1.34 2006-02-09 13:29:55 rousseau Exp $
vim:ts=20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
