From 89c6c06b8c42107dd231687a1012354e7d3039fc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 26 Nov 2017 11:42:28 +0000 Subject: gentoo resync : 26.11.2017 --- .../networkmanager-openvpn-1.8.0-static-key.patch | 33 ++++++++++++++++++++++ .../networkmanager-openvpn-1.8.0-user_cert.patch | 29 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch create mode 100644 net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch (limited to 'net-misc/networkmanager-openvpn/files') diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch new file mode 100644 index 000000000000..07f98bd6e01c --- /dev/null +++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch @@ -0,0 +1,33 @@ +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/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch new file mode 100644 index 000000000000..43f0a97d7e3e --- /dev/null +++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.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 + -- cgit v1.2.3