rpms/pcsc-lite/devel pcsc-lite-1.6.1-config_dir.patch, NONE, 1.1 pcsc-lite.spec, 1.28, 1.29

[Kalev Lember]

Author: kalev

Update of /cvs/pkgs/rpms/pcsc-lite/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23563

Modified Files:
	pcsc-lite.spec 
Added Files:
	pcsc-lite-1.6.1-config_dir.patch 
Log Message:
Patch to fix config dir handling


pcsc-lite-1.6.1-config_dir.patch:
 configure        |    7 +++++--
 configure.in     |    6 ++++--
 src/configfile.l |    2 ++
 src/pcscd.h.in   |    3 +--
 src/pcscdaemon.c |    2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)

--- NEW FILE pcsc-lite-1.6.1-config_dir.patch ---
Index: src/pcscdaemon.c
===================================================================
--- src/pcscdaemon.c	(revision 5058)
+++ src/pcscdaemon.c	(working copy)
@@ -523,7 +523,7 @@
 	}
 	else
 	{
-		rv = RFStartSerialReaders(PCSCLITE_READER_CONFIG);
+		rv = RFStartSerialReaders(PCSCLITE_CONFIG_DIR);
 		if (rv == -1)
 			at_exit();
 	}
Index: src/pcscd.h.in
===================================================================
--- src/pcscd.h.in	(revision 5058)
+++ src/pcscd.h.in	(working copy)
@@ -23,12 +23,11 @@
 #define SCARD_INSERTED			0x0002	/**< Card was inserted */
 #define SCARD_REMOVED			0x0004	/**< Card was removed */
 
-#define PCSCLITE_CONFIG_DIR		"@sysconfdir_exp@"
+#define PCSCLITE_CONFIG_DIR		"@PCSCLITE_CONFIG_DIR@"
 
 #define PCSCLITE_IPC_DIR		USE_IPCDIR
 #define PCSCLITE_RUN_PID		PCSCLITE_IPC_DIR "/pcscd.pid"
 
-#define PCSCLITE_READER_CONFIG		PCSCLITE_CONFIG_DIR "/reader.conf"
 #define PCSCLITE_CSOCK_NAME		PCSCLITE_IPC_DIR "/pcscd.comm"
 
 #define PCSCLITE_SVC_IDENTITY		0x01030000	/**< Service ID */
Index: src/configfile.l
===================================================================
--- src/configfile.l	(revision 5058)
+++ src/configfile.l	(working copy)
@@ -238,6 +238,8 @@
 		/* the configuration file is a directory */
 		struct dirent *direntry;
 
+		Log2(PCSC_LOG_DEBUG, "Parsing conf directory: %s", readerconf_dir);
+
 		/* for each configuration file */
 		while ((direntry = readdir(dir)) != NULL)
 		{
Index: configure.in
===================================================================
--- configure.in	(revision 5063)
+++ configure.in	(working copy)
@@ -332,7 +332,9 @@
 AS_AC_EXPAND(sbindir_exp,$sbindir)
 AS_AC_EXPAND(localstatedir_exp,$localstatedir)
 
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} sysconfdir=${sysconfdir_exp}"
+PCSCLITE_CONFIG_DIR="${sysconfdir_exp}/reader.conf.d"
+AC_SUBST(PCSCLITE_CONFIG_DIR)
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
 AC_DEFINE_UNQUOTED([PCSCLITE_FEATURES], ["${PCSCLITE_FEATURES}"], [Enabled PC/SC lite features])
 PCSCD_BINARY="${sbindir_exp}/pcscd"
 AC_DEFINE_UNQUOTED([PCSCD_BINARY], ["$PCSCD_BINARY"], [pcscd filename])
@@ -343,7 +345,7 @@
 
 Version:             ${PACKAGE_VERSION}
 System binaries:     $(eval eval eval echo "${sbindir_exp}")
-Configuration dir:   $(eval eval eval echo "${sysconfdir_exp}")
+Configuration dir:   ${PCSCLITE_CONFIG_DIR}
 
 
 Host:                ${host}
--- configure.rpath64	2010-06-04 16:00:15.000000000 +0300
+++ configure	2010-07-04 03:46:11.000000000 +0300
@@ -743,6 +604,7 @@
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+PCSCLITE_CONFIG_DIR
 localstatedir_exp
 sbindir_exp
 sysconfdir_exp
@@ -13108,7 +13237,9 @@
   exec_prefix=$exec_prefix_save
 
 
-PCSCLITE_FEATURES="${PCSCLITE_FEATURES} sysconfdir=${sysconfdir_exp}"
+PCSCLITE_CONFIG_DIR="${sysconfdir_exp}/reader.conf.d"
+
+PCSCLITE_FEATURES="${PCSCLITE_FEATURES} configdir=${PCSCLITE_CONFIG_DIR}"
 
 cat >>confdefs.h <<_ACEOF
 #define PCSCLITE_FEATURES "${PCSCLITE_FEATURES}"
@@ -13127,7 +13258,7 @@
 
 Version:             ${PACKAGE_VERSION}
 System binaries:     $(eval eval eval echo "${sbindir_exp}")
-Configuration dir:   $(eval eval eval echo "${sysconfdir_exp}")
+Configuration dir:   ${PCSCLITE_CONFIG_DIR}
 
 
 Host:                ${host}


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- pcsc-lite.spec	3 Jul 2010 23:53:50 -0000	1.28
+++ pcsc-lite.spec	4 Jul 2010 01:14:52 -0000	1.29
@@ -2,7 +2,7 @@
 
 Name:           pcsc-lite
 Version:        1.6.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -12,6 +12,8 @@ Source0:        http://alioth.debian.org
 Source1:        pcscd.init
 Patch0:         %{name}-1.4-docinst.patch
 Patch1:         %{name}-1.5.5-rpath64.patch
+# http://lists.drizzle.com/pipermail/muscle/2010-July/008411.html
+Patch2:         %{name}-1.6.1-config_dir.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +64,7 @@ BuildArch:      noarch
 %setup -q
 %patch0 -p0 -b .docinst
 %patch1 -p1 -b .rpath64
+%patch2 -p0 -b .config_dir
 
 # Convert to utf-8
 for file in ChangeLog; do
@@ -145,6 +148,9 @@ fi
 
 
 %changelog
+* Sun Jul 04 2010 Kalev Lember <kalev at smartlink.ee> - 1.6.1-3
+- Patch to fix config dir handling
+
 * Sun Jul 04 2010 Kalev Lember <kalev at smartlink.ee> - 1.6.1-2
 - Removed call to non-existent update-reader.conf in init script