[gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-fortisslvpn/, net-misc/networkmanager-fortisslvpn/files/

[gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-fortisslvpn/, net-misc/networkmanager-fortisslvpn/files/

[Gilles Dartiguelongue]

commit:     34ab84120999a02734608a641431f45e24510332
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 20:38:25 2017 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 22:47:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ab8412

net-misc/networkmanager-fortisslvpn: version bump 1.2.2 → 1.2.4

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/networkmanager-fortisslvpn/Manifest       |  1 +
 ...workmanager-fortisslvpn-1.2.6-location-fix.diff | 37 +++++++++++++++++
 .../networkmanager-fortisslvpn-1.2.6.ebuild        | 47 ++++++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
index 9a9d2070e97..a5e0ad34d2d 100644
--- a/net-misc/networkmanager-fortisslvpn/Manifest
+++ b/net-misc/networkmanager-fortisslvpn/Manifest
@@ -1 +1,2 @@
 DIST NetworkManager-fortisslvpn-1.2.2.tar.xz 294576 SHA256 d7d9e396bee90df73ecaa3e49ef55308cab2666771ee1dd72060701eeb11a04f SHA512 db9660107e3ce9dec436ad0aeaba922b1a883a016ad19bb1946b310f2b97168451c72803f5f6fceec68ca766fd30720dc8b6d5fcdcd8f52543bc707341c30737 WHIRLPOOL 77355c2cc0af80e7e4974e82ebdda91b2daa787f8dbd8375eda5760d26d9ca1ccf45b6d24fb95af8642569e252a503e1e63ad444e5fc8d695395c8cdc7e1b606
+DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 SHA256 8ec489c37c92ca2d382e889ade109caac11737d448c9c64f7bc5848d5e512b17 SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d WHIRLPOOL d4428c163ff643a2da5ee710818d2ff1397c7e6fa8575cf90520bfa9497bfba3d85ef7b56c7a75eb681c691dbb3e64f4a0957ee8bbfb1dda74c74e28846f7902

diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
new file mode 100644
index 00000000000..c0439bf0e39
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff
@@ -0,0 +1,37 @@
+diff --git a/Makefile.am b/Makefile.am
+index 59ba94121..6419e9f57 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,6 +26,8 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
+ nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
+ nmvpnservice_DATA = nm-fortisslvpn-service.name
+ 
++fortisslvpn_statedir = $(localstatedir)/lib/$(PACKAGE)
++
+ BUILT_SOURCES =
+ 
+ ###############################################################################
+@@ -276,7 +278,7 @@ auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
+ if WITH_LIBNM_GLIB
+ # Install a file with full path to plugins for an old gnome-shell
+ # https://bugzilla.gnome.org/show_bug.cgi?id=693590
+-install-data-hook:
++install-compat-name-file:
+ 	mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN
+ 	sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \
+ 	    -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+@@ -286,8 +288,14 @@ install-data-hook:
+ 
+ uninstall-hook:
+ 	 rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-fortisslvpn-service.name
++else
++install-compat-name-file:
++	@:
+ endif
+ 
++install-data-hook: install-compat-name-file
++	$(mkinstalldirs) -m 0700 $(DESTDIR)$(fortisslvpn_statedir)
++
+ appdatadir = $(datadir)/appdata
+ appdata_files = $(appdata_in_files:.xml.in=.xml)
+ if WITH_GNOME

diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
new file mode 100644
index 00000000000..98442620baa
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="gtk"
+
+RDEPEND="
+	>=net-misc/networkmanager-1.2:=
+	>=dev-libs/glib-2.32:2
+	net-dialup/ppp:=
+	>=net-vpn/openfortivpn-1.2.0
+	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
+"
+
+PATCHES=(
+	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
+	"${FILESDIR}"/${P}-location-fix.diff
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-dist-version=Gentoo \
+		--localstatedir=/var \
+		$(use_with gtk gnome)
+}

[gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-fortisslvpn/, net-misc/networkmanager-fortisslvpn/files/

[Patrice Clement]

commit:     fffd4eeec18894724408f7930599b707504121a1
Author:     Mathy Vanvoorden <mathy <AT> vanvoorden <DOT> be>
AuthorDate: Tue Nov  7 19:33:37 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 22:58:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffd4eee

net-misc/networkmanager-fortisslvpn-1.2.6: fix dependency on nm-utils.

This applies upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346 to
prevent the error 'undefined symbol: _nm_utils_ascii_str_to_int64' from
happening.

Closes: https://bugs.gentoo.org/631008
Closes: https://github.com/gentoo/gentoo/pull/6144
Package-Manager: Portage-2.3.8, Repoman-2.3.4

 ...r-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff | 21 +++++++++++++++++++++
 .../networkmanager-fortisslvpn-1.2.6.ebuild         |  2 ++
 2 files changed, 23 insertions(+)

diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
new file mode 100644
index 00000000000..f882679954f
--- /dev/null
+++ b/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff
@@ -0,0 +1,21 @@
+diff --git a/Makefile.am b/Makefile.am
+index 6bef38ed5..951b829e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -95,6 +95,7 @@ pppd_plugindir = $(PPPD_PLUGIN_DIR)
+ pppd_plugin_LTLIBRARIES = src/nm-fortisslvpn-pppd-plugin.la
+ 
+ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
++	shared/nm-utils/nm-shared-utils.c \
+ 	src/nm-fortisslvpn-pppd-plugin.c \
+ 	src/nm-ppp-status.h
+ src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+@@ -102,7 +103,7 @@ src_nm_fortisslvpn_pppd_plugin_la_LDFLAGS = \
+ 	-module -avoid-version
+ src_nm_fortisslvpn_pppd_plugin_la_LIBADD = \
+ 	src/libnm-fortisslvpn-pppd-service-dbus.la \
+-	$(GLIB_LIBS)
++	$(GLIB_LIBS) \
+ 	$(LIBNM_LIBS)
+ 
+ ###############################################################################

diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
index 98442620baa..94074c6b078 100644
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Upstream patch e5d476076e068f58ef4fa938f09945159fce36a6
 	"${FILESDIR}"/${P}-location-fix.diff
+	# Upstream patch 4195187fbe5be348222c9a8472f7c9cf0e51d346
+	"${FILESDIR}"/${P}-nm-utils-dependency-fix.diff
 )
 
 src_configure() {