Re: [PR PATCH] [Updated] New Package: NetworkManager-fortisslvpn-1.3.90

[Twilighttony <Twilighttony@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1642 bytes --]

There is an updated pull request by Twilighttony against master on the void-packages repository

https://github.com/Twilighttony/void-packages NetworkManager-fortisslvpn
https://github.com/void-linux/void-packages/pull/33066

New Package: NetworkManager-fortisslvpn-1.3.90
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33066.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-NetworkManager-fortisslvpn-33066.patch --]
[-- Type: text/x-diff, Size: 5850 bytes --]

From cf123b97201d144dc435dbe306e35486cfad2c16 Mon Sep 17 00:00:00 2001
From: Twilighttony <starrbeartony14@zoho.com>
Date: Thu, 23 Sep 2021 00:19:44 -0400
Subject: [PATCH 1/5] New Package: NetworkManager-fortisslvpn-1.3.90

---
 srcpkgs/NetworkManager-fortisslvpn/template | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 srcpkgs/NetworkManager-fortisslvpn/template

diff --git a/srcpkgs/NetworkManager-fortisslvpn/template b/srcpkgs/NetworkManager-fortisslvpn/template
new file mode 100644
index 000000000000..69cdd84e550f
--- /dev/null
+++ b/srcpkgs/NetworkManager-fortisslvpn/template
@@ -0,0 +1,37 @@
+# Template file for 'NetworkManager-openvpn'
+pkgname=NetworkManager-fortisslvpn
+version=1.3.90
+revision=1
+build_style=gnu-configure
+configure_args="--disable-static"
+hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
+makedepends="ppp-devel gtk+3-devel libglib-devel libnma-devel libsecret-devel"
+depends="openfortivpn"
+short_desc="NetworkManager VPN plugin for OpenFortiVPN"
+maintainer="Twilighttony <starrbeartony14@zoho.com>"
+license="GPL-2.0-or-later"
+homepage="https://wiki.gnome.org/Projects/NetworkManager"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=884a7432bb38ae9c942e094f23d0a3feb504432153c3d2869ab71a4dd244d0fb
+system_accounts="_nm_openfortivpn"
+lib32disabled=yes
+_nm_openfortivpn_homedir="/var/empty"
+
+do_configure() {
+	./configure --prefix=/usr \
+	--sysconfdir=/etc \
+	--localstatedir=/var \
+	--libexecdir=/usr/lib/networkmanager \
+	--disable-static \
+	--with-pppd-plugin-dir=/usr/lib/pppd/$_pppver
+  make
+}
+
+post_extract() {
+	sed -i 's/\(#define NM_OPENFORTIVPN_\(USER\|GROUP\)\).*/\1 "_nm_openfortivpn"/' \
+		shared/nm-service-defines.h
+}
+
+pre_configure() {
+	autoreconf -fi
+}

From 96e501b96d0e23f047c6ef4276dcf55ee9a5a6c4 Mon Sep 17 00:00:00 2001
From: Twilighttony <starrbeartony14@zoho.com>
Date: Thu, 23 Sep 2021 01:10:13 -0400
Subject: [PATCH 2/5] change to proper template name

---
 srcpkgs/NetworkManager-fortisslvpn/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-fortisslvpn/template b/srcpkgs/NetworkManager-fortisslvpn/template
index 69cdd84e550f..1cb8af84e92a 100644
--- a/srcpkgs/NetworkManager-fortisslvpn/template
+++ b/srcpkgs/NetworkManager-fortisslvpn/template
@@ -1,4 +1,4 @@
-# Template file for 'NetworkManager-openvpn'
+# Template file for 'NetworkManager-fortisslvpn'
 pkgname=NetworkManager-fortisslvpn
 version=1.3.90
 revision=1

From 8ed5a8aaa368e83f25c5a5f1a997b11b5ab90aae Mon Sep 17 00:00:00 2001
From: Twilighttony <starrbeartony14@zoho.com>
Date: Thu, 23 Sep 2021 01:22:25 -0400
Subject: [PATCH 3/5] fix _pppver issues

---
 srcpkgs/NetworkManager-fortisslvpn/template | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/NetworkManager-fortisslvpn/template b/srcpkgs/NetworkManager-fortisslvpn/template
index 1cb8af84e92a..fe776b25e3a8 100644
--- a/srcpkgs/NetworkManager-fortisslvpn/template
+++ b/srcpkgs/NetworkManager-fortisslvpn/template
@@ -16,16 +16,10 @@ checksum=884a7432bb38ae9c942e094f23d0a3feb504432153c3d2869ab71a4dd244d0fb
 system_accounts="_nm_openfortivpn"
 lib32disabled=yes
 _nm_openfortivpn_homedir="/var/empty"
+_pppver=2.4.9
+
+configure_args="--libexecdir=/usr/lib/networkmanager --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver"
 
-do_configure() {
-	./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static \
-	--with-pppd-plugin-dir=/usr/lib/pppd/$_pppver
-  make
-}
 
 post_extract() {
 	sed -i 's/\(#define NM_OPENFORTIVPN_\(USER\|GROUP\)\).*/\1 "_nm_openfortivpn"/' \

From f09c4d758d9ccc508eff57aa0789f330d0a6ae0e Mon Sep 17 00:00:00 2001
From: Twilighttony <starrbeartony14@zoho.com>
Date: Thu, 23 Sep 2021 19:14:29 -0400
Subject: [PATCH 4/5] removed sed from template

---
 srcpkgs/NetworkManager-fortisslvpn/template | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/srcpkgs/NetworkManager-fortisslvpn/template b/srcpkgs/NetworkManager-fortisslvpn/template
index fe776b25e3a8..9dd535e1d5da 100644
--- a/srcpkgs/NetworkManager-fortisslvpn/template
+++ b/srcpkgs/NetworkManager-fortisslvpn/template
@@ -20,12 +20,6 @@ _pppver=2.4.9
 
 configure_args="--libexecdir=/usr/lib/networkmanager --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver"
 
-
-post_extract() {
-	sed -i 's/\(#define NM_OPENFORTIVPN_\(USER\|GROUP\)\).*/\1 "_nm_openfortivpn"/' \
-		shared/nm-service-defines.h
-}
-
 pre_configure() {
 	autoreconf -fi
 }

From 4c1d481260f82eb59ca65e0cedfb41ef9cbe5381 Mon Sep 17 00:00:00 2001
From: Twilighttony <starrbeartony14@zoho.com>
Date: Fri, 24 Sep 2021 17:18:36 -0400
Subject: [PATCH 5/5] merge configure-args into one line

---
 srcpkgs/NetworkManager-fortisslvpn/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/NetworkManager-fortisslvpn/template b/srcpkgs/NetworkManager-fortisslvpn/template
index 9dd535e1d5da..9e70853f76bd 100644
--- a/srcpkgs/NetworkManager-fortisslvpn/template
+++ b/srcpkgs/NetworkManager-fortisslvpn/template
@@ -3,7 +3,6 @@ pkgname=NetworkManager-fortisslvpn
 version=1.3.90
 revision=1
 build_style=gnu-configure
-configure_args="--disable-static"
 hostmakedepends="automake gettext-devel glib-devel intltool libtool pkg-config"
 makedepends="ppp-devel gtk+3-devel libglib-devel libnma-devel libsecret-devel"
 depends="openfortivpn"
@@ -18,7 +17,7 @@ lib32disabled=yes
 _nm_openfortivpn_homedir="/var/empty"
 _pppver=2.4.9
 
-configure_args="--libexecdir=/usr/lib/networkmanager --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver"
+configure_args="--disable-static --libexecdir=/usr/lib/networkmanager --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver"
 
 pre_configure() {
 	autoreconf -fi