net-misc/networkmanager-openvpn: Apply important fixes from 'master' to fix the saving of user_cert and handling of connection with static-key.

Package-Manager: Portage-2.3.14, Repoman-2.3.6

4 files changed, 126 insertions, 1 deletions

diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 30f576c54c21..f136f11d8a63 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,4 +1,4 @@
 DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502
 DIST NetworkManager-openvpn-1.2.6.tar.xz 494132 SHA256 2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0 SHA512 973b13937bd14891181cfac4b3c8df891bbbd8aad31769130d7acd6f3c41e23fb3359a49a750c885e2c72c94aaf357ff1e326ece7a304b2154c6b33c35118a05 WHIRLPOOL b99542e3529b73d21770dc1ca492e29131f04de0336b6a53f58ed9a4e1f886e04bbebd32b33dc3a1b11483dd6a73779964af3a64d06edd8fb6f4c759c021cc2a
 DIST NetworkManager-openvpn-1.2.8.tar.xz 498732 SHA256 3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 SHA512 e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 WHIRLPOOL ead14f8ca4e194c0ff2b9b2151b44e3a2d97c81a4c89187c701090ce891861ba0f5a947e4b132bb2c70a28647ddb976d3989b1a3f54be87a22e983afad49f161
-DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 SHA256 166e1123ade1b322162b83876c605393a8e74240aa908cba934319f312b2e3a4 SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c WHIRLPOOL 170b6d02a4e2d2d9ebd5246fd390cc9a40f3b56fad019348b66e83d88458c309c61324bf528695c0295ae95e93a08918c4c4222582788789ccb97701b75f3230
+DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
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 <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
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 <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
+
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..1c70636fe182
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
+	gtk? (
+		>=app-crypt/libsecret-0.18
+		>=gnome-extra/nm-applet-1.7.0
+		>=x11-libs/gtk+-3.4:3
+	)
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	enewgroup nm-openvpn
+	enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+PATCHES=(
+	# Fix unusable config imports (from 'master')
+	"${FILESDIR}/${PN}-1.8.0-user_cert.patch"
+
+	# Fix validation of static-key in GUI (from 'master')
+	"${FILESDIR}/${PN}-1.8.0-static-key.patch"
+)
+
+src_prepare() {
+	# Test will fail if the machine doesn't have a particular locale installed
+	# FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+	sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+		-i properties/tests/test-import-export.c || die "sed failed"
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# --localstatedir=/var needed per bug #536248
+	gnome2_src_configure \
+		--localstatedir=/var \
+		--disable-more-warnings \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		$(use_with gtk gnome)
+}