From 1d02833762b517696015871391e33f8f6b37950a Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Dec 07 2015 09:46:32 +0000 Subject: Update to a more recent git snapshot --- diff --git a/0001-helper-fix-generation-of-routes.patch b/0001-helper-fix-generation-of-routes.patch deleted file mode 100644 index 9a7fffe..0000000 --- a/0001-helper-fix-generation-of-routes.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2513adb32447a3f21ad5ef9477698adbd5b8720b Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani -Date: Fri, 23 Oct 2015 17:44:54 +0200 -Subject: [PATCH] helper: fix generation of routes - -When only one route was receive it was not added to IP configuration. - -Fixes: 1c8d9d35a24253f9fcd0ce866962a80e0c706066 ---- - src/nm-vpnc-service-vpnc-helper.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/nm-vpnc-service-vpnc-helper.c b/src/nm-vpnc-service-vpnc-helper.c -index 4d4a973..0f9a901 100644 ---- a/src/nm-vpnc-service-vpnc-helper.c -+++ b/src/nm-vpnc-service-vpnc-helper.c -@@ -158,8 +158,7 @@ get_ip4_routes (void) - GVariantBuilder builder; - GVariant *value; - char *tmp; -- int num; -- int i; -+ int num, i, size = 0; - - #define BUFLEN 256 - -@@ -217,10 +216,11 @@ get_ip4_routes (void) - g_variant_builder_add_value (&array, g_variant_new_uint32 (next_hop)); - g_variant_builder_add_value (&array, g_variant_new_uint32 (metric)); - g_variant_builder_add_value (&builder, g_variant_builder_end (&array)); -+ size++; - } - - value = g_variant_builder_end (&builder); -- if (i > 1) -+ if (size > 0) - return value; - - g_variant_unref (value); --- -2.4.3 - diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index dd902ba..32eb068 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -1,4 +1,4 @@ -%global snapshot .20151023git9c54e7c +%global snapshot .20151120git51422d8 Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc @@ -9,7 +9,6 @@ License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-vpnc/1.2/%{name}-%{version}.tar.xz -Patch0: 0001-helper-fix-generation-of-routes.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -21,7 +20,7 @@ BuildRequires: libsecret-devel Requires: gtk3 Requires: dbus -Requires: NetworkManager >= 1:1.2.0-0.3 +Requires: NetworkManager >= 1:1.1.0 Requires: vpnc Requires: shared-mime-info Requires: gnome-keyring @@ -49,7 +48,6 @@ the vpnc server with NetworkManager (GNOME files). %prep %setup -q -%patch0 -p1 -b .fix-routes %build @@ -102,6 +100,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name %changelog +* Mon Dec 07 2015 Lubomir Rintel - 1:1.2.0-0.2.20151120git51422d8 +- Update to a more recent git snapshot + * Fri Oct 23 2015 Lubomir Rintel - 1:1.2.0-0.1.20151023git9c54e7c - Update to a more recent git snapshot diff --git a/sources b/sources index 5169275..ef0bd51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -db7bec0646c0c7251c55db78132cb9dd NetworkManager-vpnc-1.2.0.tar.xz +48558fada1e8cf67c8c9518acc5f9f23 NetworkManager-vpnc-1.2.0.tar.xz