net-misc/networkmanager-openvpn: version bump to 1.2.2 to 1.2.4

dbus-glib is not needed anymore.
Fixes bug #588388 as well.

Package-Manager: portage-2.3.0

4 files changed, 165 insertions, 0 deletions

diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 23d5cd7eb588..e0a7836cdbc7 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,2 +1,3 @@
 DIST NetworkManager-openvpn-1.0.8.tar.xz 428244 SHA256 1b979519d72ba4d78e729d4856c5b53fad914ca7ee3ca91209ce489ba78912ac SHA512 c641926e5593cfb46e2e1f2f1e4a244991efb2142a9ff420b3a2764692cc7b30941ee97980402a3f4911a527c06f8e8c4c9c6eabac5188837cad666b58369371 WHIRLPOOL 0fe6f54d09d2287ae0133ee2a6e78d5f7b1f7d5f0f4b584057069c8eae9f40da122aa39d7220c84a623292d62807f9c01576c771494ca81f2b38d626802dd446
 DIST NetworkManager-openvpn-1.2.2.tar.xz 476964 SHA256 47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef SHA512 4382cb32d78ad8f362a860e13acd440eff5499dc10e77ea86b57e3fe7f63f4448eecf5b9cd262be496d0497f325144489b0b501ddda3fafd1c911831e1a08396 WHIRLPOOL c2bb43265fa923d8fb9f65ee916d0c778f3634689a57702df4202d6fa7564b8d26f476c5fc359694d31e76be133854625767deaff4a1c58df8b6f1f78006157e
+DIST NetworkManager-openvpn-1.2.4.tar.xz 486720 SHA256 db6b4d5bc49c68990703c90f2cfbdc6a94e16f702b0740085017d5c06d3e5b9d SHA512 4b241031605c878483242a09492ae082ebf1f235c7bf5355db25be50f524ec9712198628e643a58e7c4dd26154d02828f3361ad8ca2b8d3af821ac6a81c675df WHIRLPOOL a4303e166b47623cce7fd650ba522ead3e07ed08cf43aaea93d7ff8c621f721ea5d36e12fb0f3d0cca6a65bff0c1ff98ebff105103fe6e94c0c1550982b76061
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch
new file mode 100644
index 000000000000..3b6d4a68fd8d
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch
@@ -0,0 +1,46 @@
+From 220b38717f8d0fc16c8b9d68cfd6e5b5751e4669 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Mon, 15 Aug 2016 16:36:57 +0200
+Subject: build: fix linking libnm-vpn-plugin-openvpn.la for dlopen()
+
+On some systems, dlopen() is not in libdl.so [1].
+
+[1] https://autotools.io/autoconf/finding.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769783
+---
+ configure.ac           | 3 +++
+ properties/Makefile.am | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 34829f4..3988bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,9 @@ dnl
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS(select socket uname)
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
+ 
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+diff --git a/properties/Makefile.am b/properties/Makefile.am
+index 552e537..04ed5cd 100644
+--- a/properties/Makefile.am
++++ b/properties/Makefile.am
+@@ -57,7 +57,8 @@ libnm_vpn_plugin_openvpn_la_CFLAGS =                    \
+         $(LIBNM_CFLAGS)
+ 
+ libnm_vpn_plugin_openvpn_la_LIBADD = \
+-        $(LIBNM_LIBS)
++        $(LIBNM_LIBS) \
++        $(DLOPEN)
+ 
+ libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+         -avoid-version \
+-- 
+cgit v0.12
+
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch
new file mode 100644
index 000000000000..deddddcf5d29
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch
@@ -0,0 +1,58 @@
+From 8d76aebe99b1b9c67adab4922c0c33edb1f89b7f Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Mon, 15 Aug 2016 16:55:01 +0200
+Subject: build: use $(DL_LIBS) name for -ldl
+
+Usually, our variables for libraries are call *_LIBS. Adjust the name.
+---
+ configure.ac                 | 6 +++---
+ properties/Makefile.am       | 3 ++-
+ properties/tests/Makefile.am | 1 -
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3988bad..142fa67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,9 +38,9 @@ dnl
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS(select socket uname)
+-AC_SEARCH_LIBS([dlopen], [dl dld], [], [
+-  AC_MSG_ERROR([unable to find the dlopen() function])
+-])
++
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
++AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
+ 
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+diff --git a/properties/Makefile.am b/properties/Makefile.am
+index 04ed5cd..12ee00c 100644
+--- a/properties/Makefile.am
++++ b/properties/Makefile.am
+@@ -58,7 +58,8 @@ libnm_vpn_plugin_openvpn_la_CFLAGS =                    \
+ 
+ libnm_vpn_plugin_openvpn_la_LIBADD = \
+         $(LIBNM_LIBS) \
+-        $(DLOPEN)
++        $(DL_LIBS) \
++        $(NULL)
+ 
+ libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+         -avoid-version \
+diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
+index c4639ee..c3eef5b 100644
+--- a/properties/tests/Makefile.am
++++ b/properties/tests/Makefile.am
+@@ -27,7 +27,6 @@ test_import_export_LDADD = \
+ 	$(GTK_LIBS) \
+ 	$(LIBNM_LIBS) \
+ 	$(LIBNMA_LIBS) \
+-	-ldl \
+ 	$(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
+ 
+ 
+-- 
+cgit v0.12
+
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild
new file mode 100644
index 000000000000..176915dca07e
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit autotools 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-misc/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"
+
+	# Fix underlinking issue, bug #588388, upstream #769783
+	eapply "${FILESDIR}"/${PN}-1.2.4-underlinking-*.patch
+
+	eautoreconf
+	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)
+}