rpms/vpnc/devel vpnc-0.5.3-cloexec.patch, NONE, 1.1 vpnc.spec, 1.32, 1.33 vpnc-0.5.1-cloexec.patch, 1.1, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16207

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


vpnc-0.5.3-cloexec.patch:

--- NEW FILE vpnc-0.5.3-cloexec.patch ---
diff -up vpnc-0.5.3/vpnc.c.cloexec vpnc-0.5.3/vpnc.c
--- vpnc-0.5.3/vpnc.c.cloexec	2008-11-19 21:55:51.000000000 +0100
+++ vpnc-0.5.3/vpnc.c	2008-11-20 11:48:07.000000000 +0100
@@ -2877,6 +2877,8 @@ static void do_phase2_qm(struct sa_block
 				close_tunnel(s);
 				error(1, errno, "Couldn't open socket of ESP. Maybe something registered ESP already.\nPlease try '--natt-mode force-natt' or disable whatever is using ESP.\nsocket(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(s);


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- vpnc.spec	20 Nov 2008 09:56:12 -0000	1.32
+++ vpnc.spec	20 Nov 2008 10:51:53 -0000	1.33
@@ -14,7 +14,7 @@
 Source4:	vpnc.pam
 Source5:	vpnc-helper
 Source6:	vpnc-cleanup
-Patch2:		vpnc-0.5.1-cloexec.patch
+Patch2:		vpnc-0.5.3-cloexec.patch
 Patch3:		vpnc-0.5.1-dpd.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)


--- vpnc-0.5.1-cloexec.patch DELETED ---