net-misc/networkmanager-openvpn: remove unused patch(es)
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sat, 12 May 2018 15:32:24 +0000 (17:32 +0200)
committerAaron Bauman <bman@gentoo.org>
Sun, 13 May 2018 19:18:10 +0000 (15:18 -0400)
Closes: https://github.com/gentoo/gentoo/pull/8371

net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch [deleted file]
net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch [deleted file]

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
deleted file mode 100644 (file)
index 07f98bd..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From eae01ceaeed9bf2c46a3b402fef89024dde0853b Mon Sep 17 00:00:00 2001
-From: Brandon Guttersohn <bguttersohn@gmail.com>
-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
deleted file mode 100644 (file)
index 43f0a97..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From c79c951aa10524a238992314561c033e10f45882 Mon Sep 17 00:00:00 2001
-From: polygamma <jonny.westphalen@googlemail.com>
-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
-