rpms/vpnc/devel vpnc-0.3.3-no-srcport.patch, NONE, 1.1 vpnc.spec, 1.8, 1.9

[Tomas Mraz (tmraz)]

Author: tmraz

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

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.3.3-no-srcport.patch 
Log Message:
* Thu Sep 22 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-4
- improve compatibility with some Ciscos


vpnc-0.3.3-no-srcport.patch:

--- NEW FILE vpnc-0.3.3-no-srcport.patch ---
--- vpnc-0.3.3/vpnc.c.no-srcport	2005-05-05 15:24:17.000000000 +0200
+++ vpnc-0.3.3/vpnc.c	2005-09-22 19:11:52.000000000 +0200
@@ -810,7 +810,7 @@
 		l = l->next;
 		l->u.id.type = ISAKMP_IPSEC_ID_KEY_ID;
 		l->u.id.protocol = IPPROTO_UDP;
-		l->u.id.port = ntohs(local_port);
+		l->u.id.port = 500; /* this must be 500, not local_port */
 		l->u.id.length = strlen(key_id);
 		l->u.id.data = xallocc(l->u.id.length);
 		memcpy(l->u.id.data, key_id, strlen(key_id));


Index: vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vpnc.spec	15 Jun 2005 18:17:55 -0000	1.8
+++ vpnc.spec	10 Oct 2005 08:21:55 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.3.3
-Release:        3
+Release:        4
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -12,6 +12,7 @@
 Patch0:         vpnc-0.3.2-pie.patch
 Patch1:		vpnc-0.3.3-sbin-path.patch
 Patch2:		vpnc-0.3.3-ip-output.patch
+Patch3:		vpnc-0.3.3-no-srcport.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libgcrypt-devel > 1.1.90
@@ -28,6 +29,7 @@
 %patch0 -p1 -b .pie
 %patch1 -p1 -b .sbin-path
 %patch2 -p1 -b .ip-output
+%patch3 -p1 -b .no-srcport
 
 %build
 make PREFIX=/usr
@@ -49,9 +51,10 @@
 %defattr(-,root,root)
 %doc README
 
+%dir %{_sysconfdir}/vpnc
+%{_sysconfdir}/vpnc/vpnc-script
 %config(noreplace) %{_sysconfdir}/vpnc/default.conf
 %{_sbindir}/*
-%{_sysconfdir}/vpnc
 %{_mandir}/man8/*
 %dir %{_var}/run/vpnc
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/pid
@@ -59,6 +62,9 @@
 %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup
 
 %changelog
+* Thu Sep 22 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-4
+- improve compatibility with some Ciscos
+
 * Wed Jun 15 2005 Tomas Mraz <tmraz at redhat.com> 0.3.3-3
 - improve fix_ip_get_output in vpnc-script (#160364)