rpms/vpnc/devel vpnc-0.5.1-mtu.patch,NONE,1.1 vpnc.spec,1.27,1.28

[Tomáš Mráz (tmraz)]

Author: tmraz

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

Modified Files:
	vpnc.spec 
Added Files:
	vpnc-0.5.1-mtu.patch 
Log Message:
* Thu Apr  3 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-4
- drop autogenerated perl requires (#440304)
- compute MTU based on default route device (#433846)


vpnc-0.5.1-mtu.patch:

--- NEW FILE vpnc-0.5.1-mtu.patch ---
diff -up vpnc-0.5.1/vpnc-script.mtu vpnc-0.5.1/vpnc-script
--- vpnc-0.5.1/vpnc-script.mtu	2007-09-06 22:05:15.000000000 +0200
+++ vpnc-0.5.1/vpnc-script	2008-04-03 10:23:42.000000000 +0200
@@ -95,7 +95,13 @@ fi
 # =========== tunnel interface handling ====================================
 
 do_ifconfig() {
-	ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu 1412 up
+	if [ -n "$IPROUTE" ]; then
+		DEV=$($IPROUTE route | grep ^default | sed 's/^.* dev \([[:alnum:]-]\+\).*$/\1/')
+		MTU=$(($($IPROUTE link "$DEV" | grep mtu | sed 's/^.* mtu \([[:digit:]]\+\).*$/\1/') - 88))
+	else
+		MTU=1412
+	fi
+	ifconfig "$TUNDEV" inet "$INTERNAL_IP4_ADDRESS" $ifconfig_syntax_ptp "$INTERNAL_IP4_ADDRESS" netmask 255.255.255.255 mtu "$MTU" up
 }
 
 destroy_tun_device() {


Index: vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vpnc/devel/vpnc.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- vpnc.spec	20 Feb 2008 05:39:45 -0000	1.27
+++ vpnc.spec	3 Apr 2008 08:32:21 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           vpnc
 Version:        0.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 Summary:        IPSec VPN client compatible with Cisco equipment
 
@@ -15,6 +15,7 @@
 Source5:	vpnc-helper
 Patch2:		vpnc-0.4.0-cloexec.patch
 Patch3:		vpnc-0.5.1-dpd.patch
+Patch4:		vpnc-0.5.1-mtu.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,6 +42,7 @@
 %setup -q
 %patch2 -p1 -b .cloexec
 %patch3 -p1 -b .dpd
+%patch4 -p1 -b .mtu
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="$RPM_OPT_FLAGS -pie" make PREFIX=/usr 
@@ -49,6 +51,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" PREFIX=/usr
 rm -f $RPM_BUILD_ROOT%{_bindir}/pcf2vpnc
+chmod 0644 pcf2vpnc
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcf2vpnc.1
 chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man8/vpnc.8
 install -m 0600 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vpnc/default.conf
@@ -98,6 +101,10 @@
 %{_sbindir}/vpnc-helper
 
 %changelog
+* Thu Apr  3 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-4
+- drop autogenerated perl requires (#440304)
+- compute MTU based on default route device (#433846)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.5.1-3
 - Autorebuild for GCC 4.3