SHA256
1
0
forked from pool/vpnc

Accepting request 89212 from home:jengelh:bl-new

bnc#726231

OBS-URL: https://build.opensuse.org/request/show/89212
OBS-URL: https://build.opensuse.org/package/show/network/vpnc?expand=0&rev=59
This commit is contained in:
Raymond Wooninck 2011-10-24 22:30:44 +00:00 committed by Git OBS Bridge
parent ef102e7f57
commit e3b6e64b75
3 changed files with 35 additions and 2 deletions

26
vpnc-ipid.diff Normal file
View File

@ -0,0 +1,26 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-24 23:40:21.603981415 +0200
Upstream: tbd
vpnc-script: filter out more iproute2 fields
vpnc can throw an error message:
Error: either "to" is duplicate, or "ipid" is a garbage.
---
vpnc-script.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: vpnc/vpnc-script.in
===================================================================
--- vpnc.orig/vpnc-script.in
+++ vpnc/vpnc-script.in
@@ -116,7 +116,7 @@ destroy_tun_device() {
if [ -n "$IPROUTE" ]; then
fix_ip_get_output () {
- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid \S\+//g;'
}
set_vpngateway_route() {

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Oct 24 21:41:51 UTC 2011 - jengelh@medozas.de
- Resolve 'Error: either "to" is duplicate, or "ipid" is a
garbage.' message when connecting and inability to not be able
to send packets due to the gateway route being absent.
-------------------------------------------------------------------
Fri Aug 26 14:16:47 UTC 2011 - tittiatcoke@gmail.com

View File

@ -1,5 +1,4 @@
#
#
# spec file for package vpnc
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
@ -16,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: vpnc
@ -33,6 +31,7 @@ Source: %{name}-%{version}.tar.bz2
Patch0: bugfix.diff
Patch1: vpnc-no-build-dates.patch
Patch2: work-with-netconfig.patch
Patch3: vpnc-ipid.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -61,6 +60,7 @@ Authors:
%patch1
#Patch is not yet working :-(
#patch2 -p0
%patch -P 3 -p1
%build
export CFLAGS="%optflags -fno-strict-aliasing"