[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/files/, net-vpn/networkmanager-fortisslvpn/
commit: 38bac18e75d84d6bbd293b095c0a01d3e2b283e6 Author: Sam James gentoo org> AuthorDate: Sun Apr 23 15:51:55 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 15:52:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38bac18e net-vpn/networkmanager-fortisslvpn: fix patch rename metadata Closes: https://bugs.gentoo.org/904879 Signed-off-by: Sam James gentoo.org> ...workmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch | 23 ++ ...workmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch | 6 ++ ...workmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch | 9 + .../networkmanager-fortisslvpn-1.4.0-r2.ebuild | 4 ++-- 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch index 71da31e3e435..15d26822b71c 100644 --- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch +++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch @@ -11,6 +11,19 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss +--- + Makefile.am | 5 +- + configure.ac | 37 +++- + src/nm-fortisslvpn-pppd-compat.h | 93 +++ + src/nm-fortisslvpn-pppd-plugin.c | 24 ++--- + ...-status.h => nm-fortisslvpn-pppd-status.h} | 0 + src/nm-fortisslvpn-service.c | 2 +- + 6 files changed, 145 insertions(+), 16 deletions(-) + create mode 100644 src/nm-fortisslvpn-pppd-compat.h + rename src/{nm-ppp-status.h => nm-fortisslvpn-pppd-status.h} (100%) + +diff --git a/Makefile.am b/Makefile.am +index b2e5533..e1e5ec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service @@ -32,6 +45,8 @@ Signed-off-by: Eivind Næss nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ src/nm-fortisslvpn-pppd-service-dbus.h src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags) +diff --git a/configure.ac b/configure.ac +index a998707..877493e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,10 @@ AC_PROG_CC @@ -98,6 +113,9 @@ Signed-off-by: Eivind Næss dnl dnl Checks for typedefs, structures, and compiler characteristics. dnl +diff --git a/src/nm-fortisslvpn-pppd-compat.h b/src/nm-fortisslvpn-pppd-compat.h +new file mode 100644 +index 000..9a02908 --- /dev/null +++ b/src/nm-fortisslvpn-pppd-compat.h @@ -0,0 +1,93 @@ @@ -194,6 +212,8 @@ Signed-off-by: Eivind Næss + +#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) +#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__ +diff --git a/src/nm-fortisslvpn-pppd-plugin.c b/src/nm-fortisslvpn-pppd-plugin.c +index f2ad262..c2efb9a 100644 --- a/src/nm-fortisslvpn-pppd-plugin.c +++ b/src/nm-fortisslvpn-pppd-plugin.c @@ -23,12 +23,6 @@ @@ -266,9 +286,12 @@ Signed-off-by: Eivind Næss +#endif return 0; } +diff --git a/src/nm-ppp-status.h b/src/nm-fortisslvpn-pppd-status.h similarity index 100% rename from src/nm-ppp-status.h rename to src/nm-fortisslvpn-pppd-status.h +diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c +index 6c340d0..a8483c2 100644 --- a/src/nm-fortisslvpn-service.c +++ b/src/nm-fortisslvpn-service.c @@ -40,7 +40,7 @@ diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch index a0b14d390e9f..d322ba4bfe9f 100644 --- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch +++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch @@ -10,6 +10,12 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss +--- + configure.ac | 6 +- + 1 file changed, 1 insertion(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 877493e..a5b4abb 100644 --- a/configure.ac +++ b/configure.ac @@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,, diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch index 30092c021bd3..441b8e103398 100644 --- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch +++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch @@ -12,6 +12,13 @@ inline function ppp_add_notify(). Additional formatting changes to the nm-fortisslvpn-pppd-compat.h based on review from Lubomir. +--- + src/nm-fortisslvpn-pppd-compat.h | 112
[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/files/, net-vpn/networkmanager-fortisslvpn/
commit: 7113b88c66b29f032a4829f7a7106a50bba4976e Author: Sam James gentoo org> AuthorDate: Sun Apr 23 07:56:14 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 07:56:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7113b88c net-vpn/networkmanager-fortisslvpn: fix ppp-2.5.0 patches Need to be applied separately for renames to work. Closes: https://bugs.gentoo.org/904860 Signed-off-by: Sam James gentoo.org> ...orkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch} | 218 - ...workmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch | 29 +++ ...workmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch | 191 ++ ... => networkmanager-fortisslvpn-1.4.0-r2.ebuild} | 4 +- 4 files changed, 222 insertions(+), 220 deletions(-) diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch similarity index 57% rename from net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch rename to net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch index ddb800249cce..71da31e3e435 100644 --- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch +++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch @@ -1,7 +1,5 @@ https://bugs.gentoo.org/904842 https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6 -https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/8773f772d39f8eee6edc1fd2e5437c754ed41e1e -https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/merge_requests/27 From 084ef529c5fb816927ca54866f66b340265aa9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20N=C3=A6ss?= @@ -284,219 +282,3 @@ rename to src/nm-fortisslvpn-pppd-status.h #include "nm-utils/nm-vpn-plugin-macros.h" -- GitLab - -From 8773f772d39f8eee6edc1fd2e5437c754ed41e1e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eivind=20N=C3=A6ss?= -Date: Sat, 4 Mar 2023 21:29:54 + -Subject: [PATCH] Fixing configure.ac from previous change -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Eivind Næss a/configure.ac -+++ b/configure.ac -@@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,, - - dnl - dnl Check the presense of other pppd/*.h files --AC_CHECK_HEADERS([ --pppd/chap.h --pppd/chap-new.h --pppd/chap_ms.h --]) -+AC_CHECK_HEADERS(pppd/chap.h pppd/chap-new.h pppd/chap_ms.h) - - dnl - dnl Versions >= 2.5.0 will have pkg-config support --- -GitLab - -From d59819b5d26db44f51bfbb76be3b373c419e408d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eivind=20N=C3=A6ss?= -Date: Wed, 8 Mar 2023 04:30:13 + -Subject: [PATCH] Improve compatibility with pppd-2.5.0 release - -This allows compiling against the older pppd 2.4 series while still -using the new API in the plugin code. It does so by adding a static -inline function ppp_add_notify(). - -Additional formatting changes to the nm-fortisslvpn-pppd-compat.h based -on review from Lubomir. a/src/nm-fortisslvpn-pppd-compat.h -+++ b/src/nm-fortisslvpn-pppd-compat.h -@@ -1,32 +1,15 @@ --/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ --/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager -- * -- * Copyright (C) Eivind Næss, eivn...@yahoo.com -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License along -- * with this program; if not, write to the Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- * -- */ -+/* Copyright (C) 2023 Eivind Naess, eivn...@yahoo.com */ -+/* SPDX-License-Identifier: GPL-2.0-or-later */ - - #ifndef __NM_FORTISSLVPN_PPPD_COMPAT_H__ - #define __NM_FORTISSLVPN_PPPD_COMPAT_H__ - --#define INET6 1 -- --// PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. --// this silly macro magic is to work around that. -+/* Define INET6 to compile with IPv6 support against older pppd headers, -+ * pppd >= 2.5.0 use WITH_PPP_IPV6 and is defined in pppdconf.h */ -+#define INET6 1 - -+/* PPP < 2.5.0 defines and exports VERSION which overlaps with current package VERSION define. -+ * this silly macro
[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/files/, net-vpn/networkmanager-fortisslvpn/
commit: f38074ddee922d85be1edf2b59262b5d49306cd9 Author: Sam James gentoo org> AuthorDate: Sun Apr 23 04:24:53 2023 + Commit: Sam James gentoo org> CommitDate: Sun Apr 23 04:45:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38074dd net-vpn/networkmanager-fortisslvpn: fix compat. w/ ppp-2.5.0 Closes: https://bugs.gentoo.org/904842 Signed-off-by: Sam James gentoo.org> ...etworkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch | 502 + .../networkmanager-fortisslvpn-1.4.0-r1.ebuild | 59 +++ 2 files changed, 561 insertions(+) diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch new file mode 100644 index ..ddb800249cce --- /dev/null +++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0.patch @@ -0,0 +1,502 @@ +https://bugs.gentoo.org/904842 +https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6 +https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/8773f772d39f8eee6edc1fd2e5437c754ed41e1e +https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/merge_requests/27 + +From 084ef529c5fb816927ca54866f66b340265aa9f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Eivind=20N=C3=A6ss?= +Date: Sat, 4 Mar 2023 21:20:43 + +Subject: [PATCH] Adding support for compiling against pppd-2.5.0 (or master + branch) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Eivind Næss +--- a/Makefile.am b/Makefile.am +@@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service + src_nm_fortisslvpn_service_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ +- src/nm-ppp-status.h \ ++ src/nm-fortisslvpn-pppd-status.h \ + src/nm-fortisslvpn-service.h \ + src/nm-fortisslvpn-service.c \ + shared/nm-fortissl-properties.c \ +@@ -106,7 +106,8 @@ src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-shared-utils.h \ + src/nm-fortisslvpn-pppd-plugin.c \ +- src/nm-ppp-status.h ++ src/nm-fortisslvpn-pppd-compat.h \ ++ src/nm-fortisslvpn-pppd-status.h + nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \ + src/nm-fortisslvpn-pppd-service-dbus.h + src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags) +--- a/configure.ac b/configure.ac +@@ -19,7 +19,10 @@ AC_PROG_CC + AM_PROG_CC_C_O + AC_PROG_INSTALL + AC_PROG_LIBTOOL ++AC_PROG_CPP ++AC_PROG_EGREP + AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) ++PKG_PROG_PKG_CONFIG() + + AC_GNU_SOURCE + +@@ -37,20 +40,50 @@ dnl + dnl Required headers + dnl + AC_HEADER_STDC +-AC_CHECK_HEADERS(fcntl.h paths.h sys/ioctl.h sys/time.h syslog.h unistd.h) ++AC_CHECK_HEADERS(fcntl.h paths.h stdarg.h stdbool.h sys/ioctl.h sys/time.h syslog.h unistd.h) + + AC_CHECK_HEADERS(pppd/pppd.h,, + AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) + ++dnl ++dnl Check the presense of other pppd/*.h files ++AC_CHECK_HEADERS([ ++pppd/chap.h ++pppd/chap-new.h ++pppd/chap_ms.h ++]) ++ ++dnl ++dnl Versions >= 2.5.0 will have pkg-config support ++PKG_CHECK_EXISTS([pppd], ++[AS_VAR_SET([pppd_pkgconfig_support],[yes])]) ++ ++dnl ++dnl Get the version of pppd using pkg-config, assume 2.4.9 if not present ++PPPD_VERSION=2.4.5 ++if test x"$pppd_pkgconfig_support" = xyes; then ++PPPD_VERSION=`$PKG_CONFIG --modversion pppd` ++fi ++ ++ + AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) + + if test -n "$with_pppd_plugin_dir" ; then + PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" + else +- PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.5" ++ PPPD_PLUGIN_DIR="${libdir}/pppd/$PPPD_VERSION" + fi + AC_SUBST(PPPD_PLUGIN_DIR) + ++dnl The version of pppd dictates what code can be included, i.e. enable use of ++dnl #if WITH_PPP_VERSION >= PPP_VERSION(2,5,0) in the code ++AC_DEFINE_UNQUOTED([PPP_VERSION(x,y,z)], ++[((x & 0xFF) << 16 | (y & 0xFF) << 8 | (z & 0xFF) << 0)], ++[Macro to help determine the particular version of pppd]) ++PPP_VERSION=$(echo $PPPD_VERSION | sed -e "s/\./\,/g") ++AC_DEFINE_UNQUOTED(WITH_PPP_VERSION, PPP_VERSION($PPP_VERSION), ++[The real version of pppd represented as an int]) ++ + dnl + dnl Checks for typedefs, structures, and compiler characteristics. + dnl +--- /dev/null b/src/nm-fortisslvpn-pppd-compat.h +@@ -0,0 +1,93 @@ ++/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ ++/* nm-sstp-service - sstp (and other pppd) integration with NetworkManager ++ * ++ * Copyright (C) Eivind Næss, eivn...@yahoo.com ++ * ++ * This program is free software; you can redistribute it
[gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-fortisslvpn/files/, net-vpn/networkmanager-fortisslvpn/, ...
commit: 3111d7956172c965c991f1deef570a93d8999d01 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Feb 26 00:38:25 2019 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Feb 26 00:38:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3111d795 net-misc/networkmanager-fortisslvpn: pkgmove to net-vpn/networkmanager-fortisslvpn Signed-off-by: Mart Raudsepp gentoo.org> {net-misc => net-vpn}/networkmanager-fortisslvpn/Manifest| 0 .../files/networkmanager-fortisslvpn-1.2.6-location-fix.diff | 0 .../files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff | 0 {net-misc => net-vpn}/networkmanager-fortisslvpn/metadata.xml| 0 .../networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild | 0 .../networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild | 0 profiles/updates/1Q-2019 | 1 + 7 files changed, 1 insertion(+) diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest similarity index 100% rename from net-misc/networkmanager-fortisslvpn/Manifest rename to net-vpn/networkmanager-fortisslvpn/Manifest diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff similarity index 100% rename from net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff rename to net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-location-fix.diff diff --git a/net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff similarity index 100% rename from net-misc/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff rename to net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff diff --git a/net-misc/networkmanager-fortisslvpn/metadata.xml b/net-vpn/networkmanager-fortisslvpn/metadata.xml similarity index 100% rename from net-misc/networkmanager-fortisslvpn/metadata.xml rename to net-vpn/networkmanager-fortisslvpn/metadata.xml diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild similarity index 100% rename from net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild rename to net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.6.ebuild diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild similarity index 100% rename from net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild rename to net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild diff --git a/profiles/updates/1Q-2019 b/profiles/updates/1Q-2019 index db439534b0e..85fe04e0766 100644 --- a/profiles/updates/1Q-2019 +++ b/profiles/updates/1Q-2019 @@ -3,3 +3,4 @@ move dev-libs/swayidle gui-apps/swayidle move dev-libs/swaylock gui-apps/swaylock move dev-libs/wlroots gui-libs/wlroots move dev-libs/wl-clipboard gui-apps/wl-clipboard +move net-misc/networkmanager-fortisslvpn net-vpn/networkmanager-fortisslvpn