rpms/pcsc-lite/devel pcsc-lite-close_on_exec.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 import.log, 1.1, 1.2 pcsc-lite.spec, 1.19, 1.20 sources, 1.6, 1.7

[Robert Relyea]

Author: rrelyea

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25234/devel

Modified Files:
	.cvsignore import.log pcsc-lite.spec sources 
Added Files:
	pcsc-lite-close_on_exec.patch 
Log Message:


upgrade to 1.5.2
fix close on exec issue


pcsc-lite-close_on_exec.patch:

--- NEW FILE pcsc-lite-close_on_exec.patch ---
diff -up ./src/sys_unix.c.close_on_exec ./src/sys_unix.c
--- ./src/sys_unix.c.close_on_exec	2009-02-24 16:02:47.641288000 -0800
+++ ./src/sys_unix.c	2009-02-24 16:10:25.774746000 -0800
@@ -123,9 +123,12 @@ INTERNAL int SYS_USleep(int iTimeVal)
  * @retval >0 The file descriptor.
  * @retval -1 An error ocurred.
  */
+
 INTERNAL int SYS_OpenFile(const char *pcFile, int flags, int mode)
 {
-	return open(pcFile, flags, mode);
+	int fd = open(pcFile, flags, mode);
+	fcntl(fd, F_SETFD, FD_CLOEXEC);
+	return fd;
 }
 
 /**


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Aug 2008 00:31:35 -0000	1.6
+++ .cvsignore	6 Mar 2009 00:37:05 -0000	1.7
@@ -1 +1 @@
-pcsc-lite-1.4.102.tar.bz2
+pcsc-lite-1.5.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Aug 2008 00:31:36 -0000	1.1
+++ import.log	6 Mar 2009 00:37:05 -0000	1.2
@@ -1 +1,2 @@
 pcsc-lite-1_4_102-1_rhel5_bob:HEAD:pcsc-lite-1.4.102-1.rhel5_bob.src.rpm:1219883684
+pcsc-lite-1_5_2-1_fc10_bob:HEAD:pcsc-lite-1.5.2-1.fc10_bob.src.rpm:1236299703


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pcsc-lite.spec	26 Feb 2009 10:14:06 -0000	1.19
+++ pcsc-lite.spec	6 Mar 2009 00:37:05 -0000	1.20
@@ -1,14 +1,16 @@
 Name:           pcsc-lite
-Version:        1.4.102
-Release:        5%{?dist}
+Version:        1.5.2
+Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
+%define upstream_build 2795
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
-Source0:        http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.bz2
+Source0:        http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
 Patch0:         %{name}-1.4-docinst.patch
 Patch1:         %{name}-1.4.100-rpath64.patch
+Patch2:         %{name}-close_on_exec.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -61,6 +63,7 @@
 %setup -q
 %patch0 -p0 -b .docinst
 %patch1 -p1 -b .rpath64
+%patch2 -p1 -b .close_on_exec
 
 %build
 %configure \
@@ -122,7 +125,7 @@
 %doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO
 %dir %{_sysconfdir}/reader.conf.d/
 %doc %{_sysconfdir}/reader.conf.d/README
-%ghost %config %{_sysconfdir}/reader.conf
+%ghost %config(noreplace) %{_sysconfdir}/reader.conf
 %{_initrddir}/pcscd
 %{_sbindir}/pcscd
 %{_sbindir}/update-reader.conf
@@ -147,6 +150,11 @@
 
 
 %changelog
+* Fri Feb 27 2009 Bob Relyea <rrelyea at redhat.com> - 1.5.2-1
+- Pick up 1.5.2
+- Add FD_CLOEXEC flag
+- make reader.conf a noreplace config file
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.102-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Aug 2008 00:31:36 -0000	1.6
+++ sources	6 Mar 2009 00:37:05 -0000	1.7
@@ -1 +1 @@
-b97d3a725ab93662adf09acfbc49efeb  pcsc-lite-1.4.102.tar.bz2
+d7d466621bec39354351f09349f6374c  pcsc-lite-1.5.2.tar.bz2