From 6e7dae16b7eb2d74f461870305a8eec01ee32de4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mar 11 2022 16:38:43 +0000 Subject: Update to 1.4.0 release --- diff --git a/.gitignore b/.gitignore index cd91985..a3dcd58 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /NetworkManager-fortisslvpn-1.2.8.tar.xz /NetworkManager-fortisslvpn-1.2.10.tar.xz /NetworkManager-fortisslvpn-1.3.90.tar.xz +/NetworkManager-fortisslvpn-1.4.0.tar.xz diff --git a/0001-pinentry-fix-a-format-security-error.patch b/0001-pinentry-fix-a-format-security-error.patch deleted file mode 100644 index e8f5950..0000000 --- a/0001-pinentry-fix-a-format-security-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 701f6f6f66f10e0b2ec6b0d6af80d1a8ec226a55 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Tue, 16 Jul 2019 13:20:41 +0200 -Subject: [PATCH] pinentry: fix a format-security error - ---- - src/nm-fortisslvpn-pinentry.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/nm-fortisslvpn-pinentry.c b/src/nm-fortisslvpn-pinentry.c -index 91adaff..fadbddf 100644 ---- a/src/nm-fortisslvpn-pinentry.c -+++ b/src/nm-fortisslvpn-pinentry.c -@@ -131,7 +131,7 @@ main (int argc, char *argv[]) - g_free (escaped); - } else { - /* You're not my real pinentry program! */ -- g_printerr (line); -+ g_printerr ("Error: line from pinentry not understood: '%s'\n", line); - g_print ("ERR 666 Not understood\n"); - } - g_free (line); --- -2.21.0 - diff --git a/NetworkManager-fortisslvpn-peer-dns-handling.patch b/NetworkManager-fortisslvpn-peer-dns-handling.patch deleted file mode 100644 index 1eaaa59..0000000 --- a/NetworkManager-fortisslvpn-peer-dns-handling.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 88fe44bead5b2d06aa3c294544366798fb77aa26 Mon Sep 17 00:00:00 2001 -From: Tomas Kovar -Date: Sat, 4 Apr 2020 22:16:01 +0200 -Subject: [PATCH] Closes: - https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/issues/20 - ---- - src/nm-fortisslvpn-service.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c -index c2105af..9af823d 100644 ---- a/src/nm-fortisslvpn-service.c -+++ b/src/nm-fortisslvpn-service.c -@@ -210,6 +210,7 @@ run_openfortivpn (NMFortisslvpnPlugin *plugin, NMSettingVpn *s_vpn, GError **err - GPtrArray *argv; - const char *value; - gs_free char *str_tmp = NULL; -+ NMSettingIPConfig *ip4_config; - - openfortivpn = nm_find_openfortivpn (); - if (!openfortivpn) { -@@ -229,6 +230,10 @@ run_openfortivpn (NMFortisslvpnPlugin *plugin, NMSettingVpn *s_vpn, GError **err - - g_ptr_array_add (argv, (gpointer) g_strdup ("--no-routes")); - g_ptr_array_add (argv, (gpointer) g_strdup ("--no-dns")); -+ ip4_config = nm_connection_get_setting_ip4_config (priv->connection); -+ if (!nm_setting_ip_config_get_ignore_auto_dns (ip4_config)) { -+ g_ptr_array_add (argv, (gpointer) g_strdup ("--pppd-use-peerdns=1")); -+ } - - value = nm_setting_vpn_get_data_item (s_vpn, NM_FORTISSLVPN_KEY_GATEWAY); - g_ptr_array_add (argv, (gpointer) g_strdup (value)); --- -2.24.1 - diff --git a/NetworkManager-fortisslvpn.spec b/NetworkManager-fortisslvpn.spec index 7a1c20e..bdf5a5b 100644 --- a/NetworkManager-fortisslvpn.spec +++ b/NetworkManager-fortisslvpn.spec @@ -4,17 +4,19 @@ # Disable the legacy version by default %bcond_with libnm_glib %endif +%if 0%{?fedora} < 36 && 0%{?rhel} < 10 +%bcond_with gtk4 +%else +%bcond_without gtk4 +%endif Summary: NetworkManager VPN plugin for Fortinet compatible SSLVPN Name: NetworkManager-fortisslvpn -Version: 1.3.90 -Release: 13%{?dist} +Version: 1.4.0 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source0: https://download.gnome.org/sources/NetworkManager-fortisslvpn/1.3/%{name}-%{version}.tar.xz -Patch0: https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/commit/701f6f6f66f10.patch#/0001-pinentry-fix-a-format-security-error.patch -# https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/issues/20 -Patch1: https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/merge_requests/15.patch#/%{name}-peer-dns-handling.patch +Source0: https://download.gnome.org/sources/NetworkManager-fortisslvpn/1.4/%{name}-%{version}.tar.xz %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) @@ -34,6 +36,10 @@ BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 BuildRequires: libnm-gtk-devel >= 1.2.0 %endif +%if %with gtk4 +BuildRequires: libnma-gtk4-devel +%endif + Requires: dbus-common Requires: NetworkManager >= 1:1.2.0 Requires: openfortivpn @@ -64,6 +70,9 @@ the Fortinet compatible SSLVPN server with NetworkManager (GNOME files). %build %configure \ --disable-static \ +%if %with gtk4 + --with-gtk4 \ +%endif %if %without libnm_glib --without-libnm-glib \ %endif @@ -119,6 +128,9 @@ exit 0 %changelog +* Fri Mar 11 2022 Lubomir Rintel - 1.4.0-1 +- Update to 1.4.0 release + * Wed Jan 19 2022 Fedora Release Engineering - 1.3.90-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 3682e9d..ed95401 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-fortisslvpn-1.3.90.tar.xz) = 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa +SHA512 (NetworkManager-fortisslvpn-1.4.0.tar.xz) = 94e96f204262825f3d525c96b5f135b31d9a3bb382bd2baf3fafdceb08768321331d4bd4f6af8879a8818e3bad854cdf057c9915e0ac9aee09d17e83b9d12d54