rpms/vpnc/F-8 vpnc-0.5.1-cloexec.patch, NONE, 1.1 vpnc-0.5.1-domain.patch, NONE, 1.1 vpnc-0.5.1-mtu.patch, NONE, 1.1 vpnc.spec, 1.26, 1.27 vpnc-0.4.0-cloexec.patch, 1.2, NONE
Tomáš Mráz (tmraz)
fedora-extras-commits at redhat.com
Wed Jul 30 21:03:46 UTC 2008
Author: tmraz
Update of /cvs/pkgs/rpms/vpnc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31859
Modified Files:
vpnc.spec
Added Files:
vpnc-0.5.1-cloexec.patch vpnc-0.5.1-domain.patch
vpnc-0.5.1-mtu.patch
Removed Files:
vpnc-0.4.0-cloexec.patch
Log Message:
* Wed Jul 30 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-5.1
- do not modify domain in resolv.conf (#446404)
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();
vpnc-0.5.1-domain.patch:
--- NEW FILE vpnc-0.5.1-domain.patch ---
diff -up vpnc-0.5.1/vpnc-script.domain vpnc-0.5.1/vpnc-script
--- vpnc-0.5.1/vpnc-script.domain 2008-07-24 22:06:21.000000000 +0200
+++ vpnc-0.5.1/vpnc-script 2008-07-24 22:07:08.000000000 +0200
@@ -238,7 +238,7 @@ EOF
LINE=""
fi
;;
- domain*|search*)
+ search*)
if [ -n "$CISCO_DEF_DOMAIN" ]; then
LINE="$LINE $CISCO_DEF_DOMAIN"
CISCO_DEF_DOMAIN=""
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 show "$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/F-8/vpnc.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vpnc.spec 13 Nov 2007 07:25:41 -0000 1.26
+++ vpnc.spec 30 Jul 2008 21:03:15 -0000 1.27
@@ -1,6 +1,6 @@
Name: vpnc
Version: 0.5.1
-Release: 2%{?dist}
+Release: 5.1%{?dist}
Summary: IPSec VPN client compatible with Cisco equipment
@@ -13,13 +13,15 @@
Source3: vpnc-disconnect.consolehelper
Source4: vpnc.pam
Source5: vpnc-helper
-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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgcrypt-devel > 1.1.90
-Requires: kernel >= 2.4
+Requires: iproute
%description
A VPN client compatible with Cisco's EasyVPN equipment.
@@ -41,6 +43,8 @@
%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
@@ -49,6 +53,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 +103,19 @@
%{_sbindir}/vpnc-helper
%changelog
+* Wed Jul 30 2008 Tomas Mraz <tmraz at redhat.com> - 0.5.1-5.1
+- do not modify domain in resolv.conf (#446404)
+
+* Sat Apr 5 2008 Michal Schmidt <mschmidt at redhat.com> - 0.5.1-5
+- vpnc-script: fix 'ip link ...' syntax.
+
+* 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
+
* Tue Nov 13 2007 Tomas Mraz <tmraz at redhat.com> - 0.5.1-2
- try to make DPD less sensitive (#345281)
--- vpnc-0.4.0-cloexec.patch DELETED ---
More information about the scm-commits
mailing list