gentoo resync : 26.11.2017

5 files changed, 80 insertions, 68 deletions

diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index a8d2ec73f6f5..0c8793f6ea8a 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,11 +1,8 @@
+AUX networkmanager-openvpn-1.8.0-static-key.patch 1273 BLAKE2B 311b87ac48595b3276ce9c5651f813d13c4d39f7355903220a0d2149a52b6ed9e7c8c405a5aa0ef30aae5bd2c8b9f6c13211a68503dcd53ea3c981acdbf676d7 SHA512 2b91e6bdf0994ee276a201c277020e9dc12ef3e9d1f55e9d06d0eebb2599760a0810dc1f8a59e63d2b57c974f81b1dd55d12bfa243f81410d785f5516f91de18
+AUX networkmanager-openvpn-1.8.0-user_cert.patch 1037 BLAKE2B 4034034aa8c983d6a362f342fbb1639e9a691b2abee686ad916c888936eaad39c1bde0a6475a155a2f8d45cf3b34ddcfaa18850b9a93057b00bb4acfbd9be7f2 SHA512 86424821c47925492186a950bb16548a1d57745cb2ca462223d1944a71e8bb4cd330b88e8b60e60014a716505a1bcc80afae0aea2b2987a8e3b304c0064b8480
 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
-EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
-EBUILD networkmanager-openvpn-1.2.6.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
-EBUILD networkmanager-openvpn-1.2.8.ebuild 1245 SHA256 234a539a6cc0ebf77faa1ec4f97124f0bf6a6b43128a9ce25cdc3d8d9c1d0bbe SHA512 caa8db384290d9bf0700e3b3c827a70283c8ddae7fe83b37736bae29010a542f075f8ce06337f3cbd7eb5bcb9cb56990f797fffd812e61be8bff3b51d3d44d27 WHIRLPOOL 7796beba48b6b4b74807184642ff41179367e5f1f91da5588be844f7ba2ff9821178bf3095fef99a21aad07d442c3217d8703cf6e2d48495ce6b058451041fd8
-EBUILD networkmanager-openvpn-1.8.0.ebuild 1239 SHA256 492f5e3549e8ac564450a8251dcf826a8753f2690db7d2970e75b9ccff4f16f0 SHA512 68094ec0ee4d0094560a49e8c6abc41675f78edcdb72cf1f88b4945ef0a6a32c81f42560952b83b19e9e5106c9d7f366b0c3162e8ebadca2694f1351b4ad30a8 WHIRLPOOL cc8910ed116fa7ad4c92b362f0060fae31c1c8b48eb4f74d58e774a0a137f1e9ca4ea4696a1559aaa1bb3eb8c0d1d741c01260a9b4eabf6078958dd9f72aef01
-MISC ChangeLog 6211 SHA256 f2380c9cff2bf554d42c7e59f6f110bba3e5538d10c59519e7dedfb550038a13 SHA512 d67c67ef8813695dc23432e047d51be81322f8143377a7261ead6811f33b03c2b24fea5e5895613ce9d9ff3ba6396b07c244adaa4560f37c15c0e1f9c6f5a98c WHIRLPOOL f807fecc1858b4ad433fb7c002c518dff5db7772f01b282edf3447490ae6c2ae4cbdf21c9465d071237105511f7b67aed6cc5b797bc7b874561122d0eea6d12d
-MISC ChangeLog-2015 10215 SHA256 8a2dc9e16a52b5984d2662f79bd4d0e29019afdee312eac6071214c9104ddde5 SHA512 4141295a2b577c691a404e81350fff792628fc3a9a4dd9f968a1514ef178b1fcd3d941fabbc5acfb3f9c77e3cea3d5f4485c0c1be591aec63e1d6563b2456353 WHIRLPOOL ed7aa3cd25fd7dab23bcad9edc8bf065527d3feb0f63ff48a87227a4652e1f0aa83f632c5746c2e40c7f16086b57cc2619c48886e0f3baf2fc118303c255346b
-MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
+DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
+EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 BLAKE2B 23cfbb7e850d57957aa93fa71df13ba3454dfdc92ab100d04036cfa58fcce1b573d0635b453a6d12597ff42f20de30dc95599b68966172d44834dfd23caf6ddc SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33
+EBUILD networkmanager-openvpn-1.8.0-r1.ebuild 1444 BLAKE2B 358fb5fcf2769e8086d7dfe5735ae084b635952b7978acff160e53e62c9cc341321fbc2bb0a5f8b32840f952f5f3fdf43db90136087cfdd5b4e14aa16399b5e3 SHA512 ca059cdd1977e1ad0c505e84a34dc5658aa8196b9af775983991c71704b2c01e1010838293d90f7710e754174352fecc0586488503ea7c6b8ac434d1a5354a96
+EBUILD networkmanager-openvpn-1.8.0.ebuild 1239 BLAKE2B a7b4a022a382f1c79a7fc174950834d8637daa5af6a4e70546b21ffec59bd3b571092fc6ab420d11223aa27a1964145c001d6bb4b059101605540f7a984ea075 SHA512 68094ec0ee4d0094560a49e8c6abc41675f78edcdb72cf1f88b4945ef0a6a32c81f42560952b83b19e9e5106c9d7f366b0c3162e8ebadca2694f1351b4ad30a8
+MISC metadata.xml 364 BLAKE2B 5ad394f27dbdfbc904fc2d854bdf5f29ee37f5a7b6a9abf05b622d16a5333f3b2a44c328cf4ce41b77438774b4d8c4489f4053e27523cd0c5629f2be5d1d887f SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6
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.2.6.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
deleted file mode 100644
index 2d450d056704..000000000000
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.2.0:=
-	>=net-vpn/openvpn-2.1_rc9
-	gtk? (
-		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.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
-}
-
-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)
-}
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
index 17fe3108517a..1c70636fe182 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.8.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
@@ -16,11 +16,11 @@ IUSE="gtk test"
 
 RDEPEND="
 	>=dev-libs/glib-2.32:2
-	>=net-misc/networkmanager-1.2.0:=
-	>=net-vpn/openvpn-2.1_rc9
+	>=net-misc/networkmanager-1.7.0:=
+	>=net-vpn/openvpn-2.1
 	gtk? (
 		>=app-crypt/libsecret-0.18
-		>=gnome-extra/nm-applet-1.2.0
+		>=gnome-extra/nm-applet-1.7.0
 		>=x11-libs/gtk+-3.4:3
 	)
 "
@@ -35,6 +35,14 @@ pkg_setup() {
 	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