rpms/vpnc/F-10 vpnc-0.5.3-cloexec.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 vpnc-cleanup, 1.1, 1.2 vpnc.spec, 1.31, 1.32 vpnc-0.5.1-cloexec.patch, 1.1, NONE vpnc-0.5.1-mtu.patch, 1.2, NONE

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/vpnc/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3990

Modified Files:
	.cvsignore sources vpnc-cleanup vpnc.spec 
Added Files:
	vpnc-0.5.3-cloexec.patch 
Removed Files:
	vpnc-0.5.1-cloexec.patch vpnc-0.5.1-mtu.patch 
Log Message:
* Thu Nov 20 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.3-2
- upgrade to new version
- fix race in vpnc-cleanup (#465315)


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2007 19:49:50 -0000	1.5
+++ .cvsignore	9 Dec 2008 19:54:21 -0000	1.6
@@ -1 +1 @@
-vpnc-0.5.1.tar.gz
+vpnc-0.5.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2007 19:49:50 -0000	1.5
+++ sources	9 Dec 2008 19:54:21 -0000	1.6
@@ -1 +1 @@
-7a8e94dbe94f39a4fd89b72e0125f66f  vpnc-0.5.1.tar.gz
+4378f9551d5b077e1770bbe09995afb3  vpnc-0.5.3.tar.gz


Index: vpnc-cleanup
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/F-10/vpnc-cleanup,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vpnc-cleanup	24 Jul 2008 21:09:49 -0000	1.1
+++ vpnc-cleanup	9 Dec 2008 19:54:21 -0000	1.2
@@ -3,8 +3,6 @@
 
 start on stopped rcS
 
-stop on runlevel
-
 script
 	rm -f /var/run/vpnc/pid
 	RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/F-10/vpnc.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- vpnc.spec	24 Jul 2008 21:31:57 -0000	1.31
+++ vpnc.spec	9 Dec 2008 19:54:21 -0000	1.32
@@ -1,6 +1,6 @@
 Name:           vpnc
-Version:        0.5.1
-Release:        6%{?dist}
+Version:        0.5.3
+Release:        2%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -14,10 +14,8 @@
 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
-Patch4:		vpnc-0.5.1-mtu.patch
-Patch5:		vpnc-0.5.1-domain.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -44,8 +42,6 @@
 %setup -q
 %patch2 -p1 -b .cloexec
 %patch3 -p1 -b .dpd
-%patch4 -p1 -b .mtu
-%patch5 -p1 -b .domain
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -77,6 +73,7 @@
 ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/vpnc-disconnect
 install -Dp -m 0644 %{SOURCE6} \
     $RPM_BUILD_ROOT%{_sysconfdir}/event.d/vpnc-cleanup
+rm -f $RPM_BUILD_ROOT%{_datadir}/doc/vpnc/COPYING
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,6 +104,10 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Nov 20 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.3-2
+- upgrade to new version
+- fix race in vpnc-cleanup (#465315)
+
 * Thu Jul 24 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-6
 - do not modify domain in resolv.conf (#446404)
 - clean up modified resolv.conf on startup (#455899)


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


--- vpnc-0.5.1-mtu.patch DELETED ---