From a7c0b0f12054926d797efc5ebb15ea0fae8f6042 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Sep 2017 00:44:42 +0200 Subject: [PATCH] properties: fix handling user-ca in GUI --- ...operties-fix-unusable-config-imports.patch | 29 +++++++++++++++++++ NetworkManager-openvpn.spec | 9 +++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-properties-fix-unusable-config-imports.patch diff --git a/0001-properties-fix-unusable-config-imports.patch b/0001-properties-fix-unusable-config-imports.patch new file mode 100644 index 0000000..43f0a97 --- /dev/null +++ b/0001-properties-fix-unusable-config-imports.patch @@ -0,0 +1,29 @@ +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/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec index 98dab06..fc6b556 100644 --- a/NetworkManager-openvpn.spec +++ b/NetworkManager-openvpn.spec @@ -2,12 +2,14 @@ Summary: NetworkManager VPN plugin for OpenVPN Name: NetworkManager-openvpn Epoch: 1 Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?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 + BuildRequires: gtk3-devel BuildRequires: NetworkManager-devel BuildRequires: NetworkManager-glib-devel >= 1:1.2.0 @@ -47,6 +49,8 @@ the OpenVPN server with NetworkManager (GNOME files). %prep %setup -q +%patch1 -p1 + %build if [ ! -f configure ]; then ./autogen.sh @@ -91,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la %{_datadir}/appdata/network-manager-openvpn.metainfo.xml %changelog +* Wed Sep 26 2017 Thomas Haller - 1:1.8.0-2 +- properties: fix handling user-ca in GUI + * Thu Sep 21 2017 Thomas Haller - 1:1.8.0-1 - Update to 1.8.0 release