rpms/vpnc/devel vpnc-0.5.1-cloexec.patch, NONE, 1.1 vpnc.spec, 1.30, 1.31 vpnc-0.4.0-cloexec.patch, 1.2, NONE

[Tomáš Mráz (tmraz)]

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30465

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.5.1-cloexec.patch 
Removed Files:
	vpnc-0.4.0-cloexec.patch 
Log Message:
- rediff for no fuzz


vpnc-0.5.1-cloexec.patch:

--- NEW FILE vpnc-0.5.1-cloexec.patch ---
diff -up vpnc-0.5.1/vpnc.c.cloexec vpnc-0.5.1/vpnc.c
--- vpnc-0.5.1/vpnc.c.cloexec	2007-09-10 22:39:48.000000000 +0200
+++ vpnc-0.5.1/vpnc.c	2008-07-24 23:29:49.000000000 +0200
@@ -2693,6 +2693,8 @@ static void setup_link(struct sa_block *
 				close_tunnel();
 				error(1, errno, "socket(PF_INET, SOCK_RAW, IPPROTO_ESP)");
 			}
+			fcntl(s->esp_fd, F_SETFD, FD_CLOEXEC);
+
 #ifdef IP_HDRINCL
 			if (setsockopt(s->esp_fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) {
 				close_tunnel();


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- vpnc.spec	24 Jul 2008 21:09:49 -0000	1.30
+++ vpnc.spec	24 Jul 2008 21:31:57 -0000	1.31
@@ -14,7 +14,7 @@
 Source4:	vpnc.pam
 Source5:	vpnc-helper
 Source6:	vpnc-cleanup
-Patch2:		vpnc-0.4.0-cloexec.patch
+Patch2:		vpnc-0.5.1-cloexec.patch
 Patch3:		vpnc-0.5.1-dpd.patch
 Patch4:		vpnc-0.5.1-mtu.patch
 Patch5:		vpnc-0.5.1-domain.patch


--- vpnc-0.4.0-cloexec.patch DELETED ---