diff --git a/.gitignore b/.gitignore index 60e881d..e72ea68 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2 /NetworkManager-openvpn-1.2.8.tar.xz /NetworkManager-openvpn-1.2.10.tar.xz /NetworkManager-openvpn-1.8.0.tar.xz +/NetworkManager-openvpn-1.8.2.tar.xz diff --git a/0001-properties-fix-unusable-config-imports.patch b/0001-properties-fix-unusable-config-imports.patch deleted file mode 100644 index 43f0a97..0000000 --- a/0001-properties-fix-unusable-config-imports.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c79c951aa10524a238992314561c033e10f45882 Mon Sep 17 00:00:00 2001 -From: polygamma -Date: Mon, 25 Sep 2017 22:56:29 +0200 -Subject: [PATCH 1/1] properties: fix unusable config imports - -Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 - -https://github.com/NetworkManager/network-manager-openvpn/pull/1 -(cherry picked from commit fcf4b58fe0da5994687469ebb0c6eac3cf083e83) ---- - properties/auth-helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index f9babfb..c55afd1 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -544,7 +544,7 @@ update_tls (GtkBuilder *builder, const char *prefix, NMSettingVpn *s_vpn) - NM_OPENVPN_KEY_CERT, - NM_OPENVPN_KEY_KEY, - NM_OPENVPN_KEY_CERTPASS, -- prefix, "ca_cert", s_vpn); -+ prefix, "user_cert", s_vpn); - } - - static void --- -2.13.5 - diff --git a/0002-properties-fix-validation-of-static-key-in-GUI.patch b/0002-properties-fix-validation-of-static-key-in-GUI.patch deleted file mode 100644 index 07f98bd..0000000 --- a/0002-properties-fix-validation-of-static-key-in-GUI.patch +++ /dev/null @@ -1,33 +0,0 @@ -From eae01ceaeed9bf2c46a3b402fef89024dde0853b Mon Sep 17 00:00:00 2001 -From: Brandon Guttersohn -Date: Wed, 27 Sep 2017 09:57:58 +0200 -Subject: [PATCH 1/1] properties: fix validation of static-key in GUI - -Otherwise it's not possible to edit a connection with static key. - -[thaller@redhat.com: modified original patch and add commit message] - -https://bugzilla.gnome.org/show_bug.cgi?id=788226 - -Fixes: 86a70095afc229f1f970b7e546390d166152cfc2 -(cherry picked from commit b83f028a6da067dcc9b31555c15411f0288ebda1) ---- - properties/auth-helpers.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c -index c55afd1..16ff6e5 100644 ---- a/properties/auth-helpers.c -+++ b/properties/auth-helpers.c -@@ -449,7 +449,7 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e - } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) { - widget = GTK_WIDGET (gtk_builder_get_object (builder, "sk_key_chooser")); - filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); -- if (filename && strlen (filename)) { -+ if (!filename || !filename[0]) { - g_free (filename); - g_set_error (error, - NMV_EDITOR_PLUGIN_ERROR, --- -2.13.5 - diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index e4ea939..92926b2 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -8,15 +8,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 -Version: 1.8.0 -Release: 5%{?dist} +Version: 1.8.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base Source0: https://download.gnome.org/sources/NetworkManager-openvpn/1.8/%{name}-%{version}.tar.xz -Patch1: 0001-properties-fix-unusable-config-imports.patch -Patch2: 0002-properties-fix-validation-of-static-key-in-GUI.patch +#Patch1: 0001-example.patch BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel @@ -59,8 +58,7 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q -%patch1 -p1 -%patch2 -p1 +#%patch1 -p1 %build if [ ! -f configure ]; then @@ -112,6 +110,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %endif %changelog +* Mon Mar 12 2018 Thomas Haller - 1:1.8.2-1 +- Update to 1.8.2 release + * Wed Feb 07 2018 Fedora Release Engineering - 1:1.8.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 15d67f3..04c840e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-openvpn-1.8.0.tar.xz) = fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c +SHA512 (NetworkManager-openvpn-1.8.2.tar.xz) = c17f0de1d41df00b3359ab2dcce939574104b1272896bd403834b426c3fc3f177a5d2ea9cb5a1b98268f63095bc14c5904bd98c2fcf23481e78d8b8acb667927