- merged from DEVEL

Changed files:
    pcsc-lite-any.patch -> 1.2
    pcsc-lite-fhs.patch -> 1.3
    pcsc-lite-pcscd.init -> 1.7
    pcsc-lite.spec -> 1.23

diff --git a/pcsc-lite-any.patch b/pcsc-lite-any.patch
new file mode 100644 (file)
index 0000000..69d722c
--- /dev/null
+++ b/pcsc-lite-any.patch
@@ -0,0 +1,28 @@
+--- pcsc-lite-1.2.9-beta7/src/winscard.c.orig  2005-03-01 21:16:13.000000000 +0100
++++ pcsc-lite-1.2.9-beta7/src/winscard.c       2005-03-03 12:29:40.000000000 +0100
+@@ -214,6 +214,12 @@
+                       }
+                       else
+                       {
++                              /*
++                               * If it is set to ANY let it do any of the protocols
++                               */
++                              if (dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD)
++                                      dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
++
+                               if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
+                                       return SCARD_E_PROTO_MISMATCH;
+                       }
+@@ -518,6 +524,12 @@
+                       }
+                       else
+                       {
++                              /*
++                               * If it is set to ANY let it do any of the protocols
++                               */
++                              if (dwPreferredProtocols & SCARD_PROTOCOL_ANY_OLD)
++                                      dwPreferredProtocols = SCARD_PROTOCOL_T0 | SCARD_PROTOCOL_T1;
++
+                               if (! (dwPreferredProtocols & rContext->readerState->cardProtocol))
+                                       return SCARD_E_PROTO_MISMATCH;
+                       }

diff --git a/pcsc-lite-fhs.patch b/pcsc-lite-fhs.patch
index 686361a9c3bd82adc452085f0b446a82ca3ffdf4..ed876cb5e19764f246c44b5f6df5dc90649bee29 100644 (file)
--- a/pcsc-lite-fhs.patch
+++ b/pcsc-lite-fhs.patch
@@ -1,27 +1,26 @@
-diff -Nur pcsc-lite-1.1.1.orig/DRIVERS pcsc-lite-1.1.1/DRIVERS
---- pcsc-lite-1.1.1.orig/DRIVERS       Mon Jul  1 18:28:39 2002
-+++ pcsc-lite-1.1.1/DRIVERS    Tue Mar 11 10:52:56 2003
+--- pcsc-lite-1.2.9-beta5/DRIVERS.orig 2004-05-14 09:01:00.000000000 +0200
++++ pcsc-lite-1.2.9-beta5/DRIVERS      2004-07-30 16:48:19.000000000 +0200
 @@ -2,18 +2,18 @@
  
- To install drivers download the driver from http://www.linuxnet.com
+ To install USB drivers, download the driver from http://www.linuxnet.com/
  and copy it to a temporary location.  After you have unarchived the files
--copy the directory to /usr/local/pcsc/drivers.  If the directory 
--/usr/local/pcsc/drivers does not exist create it before copying the driver
-+copy the directory to /usr/lib/pcsc/drivers.  If the directory 
-+/usr/lib/pcsc/drivers does not exist create it before copying the driver
+-copy the directory to /usr/local/pcsc/drivers/.  If the directory
+-/usr/local/pcsc/drivers/ does not exist create it before copying the driver
++copy the directory to /usr/lib*/pcsc/drivers/.  If the directory
++/usr/lib*/pcsc/drivers/ does not exist create it before copying the driver
  directory to it.
  
  Example Mac OS X, Linux 2.4:
  
  tar -xzvf driver.bundle-0.1.0.tar.gz
--cp -r driver.bundle /usr/local/pcsc/drivers
+-cp -r driver.bundle /usr/local/pcsc/drivers/
 -cd /usr/local/pcsc/drivers/driver.bundle
-+cp -r driver.bundle /usr/lib/pcsc/drivers
-+cd /usr/lib/pcsc/drivers/driver.bundle
++cp -r driver.bundle /usr/lib*/pcsc/drivers/
++cd /usr/lib*/pcsc/drivers/driver.bundle
  build or use Project Builder to build
  
--The /usr/local/pcsc/drivers directory should contain bundle directories only.
-+The /usr/lib/pcsc/drivers directory should contain bundle directories only.
+-The /usr/local/pcsc/drivers/ directory should contain bundle directories only.
++The /usr/lib*/pcsc/drivers/ directory should contain bundle directories only.
  You must restart pcscd to use the new driver.
  
  

diff --git a/pcsc-lite-pcscd.init b/pcsc-lite-pcscd.init
index 0a4e370c805ce7684893b9f3121fb47fe00e87dc..2fb2009438b22684626638480c62c951b5decce4 100644 (file)
--- a/pcsc-lite-pcscd.init
+++ b/pcsc-lite-pcscd.init
@@ -4,7 +4,13 @@
 #
 # chkconfig:   2345 12 88
 #
-# description: daemon for pcsc-lite and musclecard framework
+# description: The PC/SC smart card daemon is a resource manager for the \
+#              PC/SC lite and Musclecard frameworks.  It coordinates \
+#              communications with smart card readers, smart cards, and \
+#              cryptographic tokens that are connected to the system.
+#
+# processname: pcscd
+# config:      /etc/reader.conf
 #
 # $Id$
 
@@ -12,6 +18,8 @@
 # Source function library
 . /etc/rc.d/init.d/functions
 
+umask 077
+
 # Set defaults
 LOGGING="yes"
 
@@ -19,7 +27,7 @@ LOGGING="yes"
 [ -f /etc/sysconfig/pcscd ] && . /etc/sysconfig/pcscd
 
 if is_yes "${LOGGING}"; then
-       LOGOPT="-d syslog"
+       LOGOPT="-d"
 else
        LOGOPT=""
 fi
@@ -31,7 +39,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/pcscd ]; then
                msg_starting pcscd
-               daemon pcscd $LOGOPT
+               /usr/sbin/update-reader.conf && daemon pcscd $LOGOPT
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/pcscd
        else

diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index 458489b37a5b2604eaba185a3c3c49d9f86a2911..b5dff570ff1cd994e7b6a63d40990fed8c37cd2c 100644 (file)
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -1,28 +1,30 @@
 Summary:       Muscle PCSC Framework for Linux
 Summary(pl):   ¦rodowisko PCSC dla Linuksa
 Name:          pcsc-lite
-Version:       1.2.0
-Release:       2
+Version:       1.3.0
+Release:       1
 License:       BSD
 Group:         Daemons
 #Source0Download: http://alioth.debian.org/project/showfiles.php?group_id=30105
-Source0:       http://alioth.debian.org/download.php/419/%{name}-%{version}.tar.gz
-# Source0-md5: 98456d274b2f4bfe74c5ab59070f8d50
+Source0:       http://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
+# Source0-md5: ccbb595be0e1d47c9f9f449f183bea6c
 Source1:       %{name}-pcscd.init
 Source2:       %{name}-pcscd.sysconfig
 Patch0:                %{name}-fhs.patch
+Patch1:                %{name}-any.patch
 URL:           http://www.linuxnet.com/middle.html
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
 BuildRequires: flex
 BuildRequires: libtool >= 1.4.2-9
 BuildRequires: libusb-devel
+Requires(pre): fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                muscledropdir   /usr/%{_lib}/pcsc/services
 %define                usbdropdir      /usr/%{_lib}/pcsc/drivers
+%define                muscledropdir   /usr/%{_lib}/pcsc/services
 
 %description
 pcscd is the daemon program for PC/SC Lite. It is a resource manager
@@ -54,7 +56,7 @@ Biblioteki PC/SC Lite.
 %package devel
 Summary:       PC/SC Lite development files
 Summary(pl):   Pliki dla programistów u¿ywaj±cych PC/SC Lite
-Group:         Development/Tools
+Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
@@ -66,7 +68,7 @@ Pliki dla programist
 %package static
 Summary:       Static PC/SC Lite libraries
 Summary(pl):   Biblioteki statyczne PC/SC Lite
-Group:         Development/Tools
+Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
@@ -78,10 +80,11 @@ Statyczne biblioteki PC/SC Lite.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal} -I aclocal
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
@@ -94,24 +97,30 @@ Statyczne biblioteki PC/SC Lite.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{muscledropdir},%{usbdropdir}} \
+install -d $RPM_BUILD_ROOT{%{usbdropdir},%{muscledropdir}} \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-# useful for drivers development
-install src/ifdhandler.h $RPM_BUILD_ROOT%{_includedir}
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/pcscd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/pcscd
 
 install doc/example/*.c $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+:> $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+# upgrade from pcsc-lite < 1.2.9-0.beta7
+if [ -f /etc/reader.conf -a ! -f /etc/reader.conf.d/reader.conf ]; then
+       install -d -m755 /etc/reader.conf.d
+       cp -af /etc/reader.conf /etc/reader.conf.d/reader.conf
+fi
+
 %post
 /sbin/chkconfig --add pcscd
 if [ -f /var/lock/subsys/pcscd ]; then
@@ -134,31 +143,33 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog* DRIVERS HELP NEWS README SECURITY doc/README.DAEMON
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/reader.conf
-%attr(754,root,root) /etc/rc.d/init.d/pcscd
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd
-%attr(755,root,root) %{_sbindir}/pcscd
-%attr(755,root,root) %{_bindir}/bundleTool
 %attr(755,root,root) %{_bindir}/formaticc
-%attr(755,root,root) %{_bindir}/installifd
+%attr(755,root,root) %{_sbindir}/installifd
+%attr(755,root,root) %{_sbindir}/pcscd
+%attr(755,root,root) %{_sbindir}/update-reader.conf
 %{_libdir}/pcsc
+%dir %{_sysconfdir}/reader.conf.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/reader.conf.d/reader.conf
+%ghost %{_sysconfdir}/reader.conf
+%attr(754,root,root) /etc/rc.d/init.d/pcscd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pcscd
 %{_mandir}/man1/formaticc.1*
-%{_mandir}/man8/bundleTool.8*
+%{_mandir}/man5/reader.conf.5*
 %{_mandir}/man8/pcscd.8*
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libpcsclite.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/*.pdf
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
-%{_pkgconfigdir}/*.pc
+%attr(755,root,root) %{_libdir}/libpcsclite.so
+%{_libdir}/libpcsclite.la
+%{_includedir}/PCSC
+%{_pkgconfigdir}/libpcsclite.pc
 %{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libpcsclite.a