Hello community, here is the log from the commit of package vpnc for openSUSE:Factory checked in at 2014-11-24 11:13:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vpnc (Old) and /work/SRC/openSUSE:Factory/.vpnc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vpnc" Changes: -------- --- /work/SRC/openSUSE:Factory/vpnc/vpnc.changes 2014-09-28 19:56:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vpnc.new/vpnc.changes 2014-11-24 11:13:06.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 12 13:52:59 UTC 2014 - [email protected] + +- 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. + +------------------------------------------------------------------- Old: ---- vpnc-0.5.3r517.tar.bz2 vpnc-add-name-to-stderr-log.diff vpnc-no-build-dates.patch vpnc-pidfile-path.diff New: ---- vpnc-0.5.3r550.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vpnc.spec ++++++ --- /var/tmp/diff_new_pack.DBJKdU/_old 2014-11-24 11:13:08.000000000 +0100 +++ /var/tmp/diff_new_pack.DBJKdU/_new 2014-11-24 11:13:08.000000000 +0100 @@ -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 @@ 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 @@ %prep %setup -q -n %{name} -%patch1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" ++++++ vpnc-0.5.3r517.tar.bz2 -> vpnc-0.5.3r550.tar.bz2 ++++++ ++++ 2782 lines of diff (skipped) ++++++ vpnc-restart-after-timeout.diff ++++++ --- /var/tmp/diff_new_pack.DBJKdU/_old 2014-11-24 11:13:08.000000000 +0100 +++ /var/tmp/diff_new_pack.DBJKdU/_new 2014-11-24 11:13:08.000000000 +0100 @@ -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 @@ } 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 @@ 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 @@ 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 @@ 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 @@ if (opt_vendor == VENDOR_NORTEL) free((void *)group_id); - return 0; - } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
