rpm/vpnc
SHA256
1
0
Fork 0
forked from pool/vpnc
Code Pull Requests Activity

Accepting request 261271 from network

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/261271
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vpnc?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2014-11-24 10:13:05 +00:00 committed by Git OBS Bridge
commit 266f1c27ab
8 changed files with 25 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vpnc-0.5.3r517.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ad36c9508fdca73948ba2c7a09c466f372361b447991fbc7cef9cd603365e7b9
size 112872

3
vpnc-0.5.3r550.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f8e93124f39c175e7a1d634e4c0110e8b3d12ed545ecd343710f577a963c384c
size 117029

25
vpnc-add-name-to-stderr-log.diff
View File

@ -1,25 +0,0 @@
Author: Stefan Seyfried <seife+obs@b1-sytems.com>
When called from e.g. NetworkManager, vpnc's stderr log messages
are redirected to logfiles where they are sometimes hard to spot,
e.g. they appear to be coming from NetworkManager itself.
Fix this by prepending "vpnc: " to them.
Index: b/config.c
===================================================================
--- a/config.c
+++ b/config.c
@@ -50,10 +50,11 @@ uint16_t opt_nortel_client_id;
static void log_to_stderr(int priority __attribute__((unused)), const char *format, ...)
{
va_list ap;
+ fprintf(stderr, "vpnc: ");
va_start(ap, format);
vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
va_end(ap);
}

14
vpnc-no-build-dates.patch
View File

@ -1,14 +0,0 @@
Index: makeman.pl
===================================================================
--- makeman.pl.orig
+++ makeman.pl
@@ -92,7 +92,8 @@ close $LONGHELP;
# Hopefully the code speaks for itself from now on...
setlocale( LC_ALL, 'C' );
-my $date = strftime( '%B %Y', localtime );
+my $write_secs = (stat("./vpnc.8.template"))[9];
+my $date = strftime( '%B %Y', localtime($write_secs) );
open my $VERSION, '<', './VERSION';
my $vpnc_version = <$VERSION>;

44
vpnc-pidfile-path.diff
View File

@ -1,44 +0,0 @@
Author: Stefan Seyfried <seife+obs@b1-systems.com>
Upstream: not yet
Subject: make pidfile writing work again
/var/run is cleared on every boot (tmpfs) and thus /var/run/vpnc
does not exist.
Just use /var/run/vpnc.pid instead, vpnc needs to run as root anyway,
so this should be fine.
vpnc-script is still using /var/run/vpnc for other stuff (resolv.conf
backup etc) but creates the directory on demand, so no harm is done
there.
Index: b/config.c
===================================================================
--- a/config.c
+++ b/config.c
@@ -182,11 +182,11 @@ static const char *config_def_script(voi
return "/etc/vpnc/vpnc-script";
}
static const char *config_def_pid_file(void)
{
- return "/var/run/vpnc/pid";
+ return "/var/run/vpnc.pid";
}
static const char *config_def_vendor(void)
{
return "cisco";
Index: b/vpnc-disconnect
===================================================================
--- a/vpnc-disconnect
+++ b/vpnc-disconnect
@@ -1,8 +1,8 @@
#!/bin/sh
-pid=/var/run/vpnc/pid
+pid=/var/run/vpnc.pid
if [ $# -ne 0 ]; then
echo "Usage: $0" 1>&2
exit 1
fi

41
vpnc-restart-after-timeout.diff
View File

@ -1,10 +1,8 @@
Index: b/tunip.c
Index: vpnc-nortel/tunip.c
===================================================================
--- a/tunip.c
+++ b/tunip.c
@@ -882,10 +882,13 @@ static void vpnc_main_loop(struct sa_blo
time(NULL) - s->ipsec.life.start,
s->ipsec.life.seconds,
--- vpnc-nortel.orig/tunip.c
+++ vpnc-nortel/tunip.c
@@ -882,6 +882,9 @@ static void vpnc_main_loop(struct sa_blo
s->ipsec.life.rx/1024,
s->ipsec.life.tx/1024,
s->ipsec.life.kbytes));
@ -14,11 +12,7 @@ Index: b/tunip.c
} while ((presult == 0 || (presult == -1 && errno == EINTR)) && !do_kill);
if (presult == -1) {
logmsg(LOG_ERR, "select: %m");
continue;
}
@@ -943,10 +946,13 @@ static void vpnc_main_loop(struct sa_blo
}
@@ -943,6 +946,9 @@ static void vpnc_main_loop(struct sa_blo
}
switch (do_kill) {
@ -28,15 +22,11 @@ Index: b/tunip.c
case -2:
logmsg(LOG_NOTICE, "connection terminated by dead peer detection");
break;
case -1:
logmsg(LOG_NOTICE, "connection terminated by peer");
Index: b/vpnc.c
Index: vpnc-nortel/vpnc.c
===================================================================
--- a/vpnc.c
+++ b/vpnc.c
@@ -3777,24 +3777,25 @@ int main(int argc, char **argv)
#endif
gcry_check_version("1.1.90");
--- vpnc-nortel.orig/vpnc.c
+++ vpnc-nortel/vpnc.c
@@ -3834,10 +3834,6 @@ int main(int argc, char **argv)
gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0);
group_init();
@ -47,10 +37,7 @@ Index: b/vpnc.c
do_config(argc, argv);
if (opt_vendor == VENDOR_NORTEL)
group_id = tolowercase(config[CONFIG_IPSEC_ID]);
else
group_id = config[CONFIG_IPSEC_ID];
@@ -3848,6 +3844,11 @@ int main(int argc, char **argv)
DEBUG(1, printf("\nvpnc version " VERSION "\n"));
hex_dump("hex_test", hex_test, sizeof(hex_test), NULL);
@ -62,11 +49,7 @@ Index: b/vpnc.c
DEBUGTOP(2, printf("S1 init_sockaddr\n"));
init_sockaddr(&s->dst, config[CONFIG_IPSEC_GATEWAY]);
init_sockaddr(&s->opt_src_ip, config[CONFIG_LOCAL_ADDR]);
DEBUGTOP(2, printf("S2 make_socket\n"));
s->ike.src_port = atoi(config[CONFIG_LOCAL_PORT]);
@@ -3845,10 +3846,11 @@ int main(int argc, char **argv)
close_tunnel(s);
@@ -3903,6 +3904,7 @@ int main(int argc, char **argv)
/* Free resources */
DEBUGTOP(2, printf("S9 cleanup\n"));
cleanup(s);
@ -74,5 +57,3 @@ Index: b/vpnc.c
if (opt_vendor == VENDOR_NORTEL)
free((void *)group_id);
return 0;
}

8
vpnc.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Nov 12 13:52:59 UTC 2014 - idonmez@suse.com
- Update to svn r550
* Bugfixes and many openSUSE patches merged
- Remove vpnc-no-build-dates.patch, vpnc-pidfile-path.diff and
vpnc-add-name-to-stderr-log.diff. Merged upstream.
-------------------------------------------------------------------
Tue Sep 23 15:22:31 UTC 2014 - mpluskal@suse.com

12
vpnc.spec
View File

@ -20,7 +20,7 @@
%define _rundir %{_localstatedir}/run
%endif
Name: vpnc
Version: 0.5.3r517
Version: 0.5.3r550
Release: 0
Summary: A Client for Cisco VPN concentrator
License: GPL-2.0+
@ -31,11 +31,8 @@ Source: %{name}-%{version}.tar.bz2
Source1: checkout_svn.sh
Source2: %{name}.conf
Source3: %{name}.service
Patch1: vpnc-no-build-dates.patch
# most ugly hack ever
Patch4: vpnc-restart-after-timeout.diff
Patch5: vpnc-pidfile-path.diff
Patch6: vpnc-add-name-to-stderr-log.diff
Patch1: vpnc-restart-after-timeout.diff
BuildRequires: gnutls
BuildRequires: libgcrypt-devel
BuildRequires: libgnutls-devel
@ -62,10 +59,7 @@ It runs entirely in userspace and uses the TUN/TAP driver for access.
%prep
%setup -q -n %{name}
%patch1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch1 -p1
%build
export CFLAGS="%{optflags}"