Re: [PR PATCH] [Updated] New package: NetworkManager-l2tp-1.8.2

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

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

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

https://github.com/dkosovic/void-packages master
https://github.com/void-linux/void-packages/pull/23646

New package: NetworkManager-l2tp-1.8.2
Package request as discussed in https://github.com/void-linux/void-packages/issues/22610

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

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

From b5bfbe44a03ca599e243c23969b822fa74450b4c Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Sun, 19 Jul 2020 16:54:55 +1000
Subject: [PATCH 1/2] New package: NetworkManager-l2tp-1.8.2

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

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
new file mode 100644
index 00000000000..031f05ad1a7
--- /dev/null
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -0,0 +1,22 @@
+# Template file for 'NetworkManager-l2tp'
+pkgname=NetworkManager-l2tp
+version=1.8.2
+revision=1
+build_style=gnu-configure
+configure_args="--runstatedir=/run"
+hostmakedepends="pkg-config intltool glib-devel"
+makedepends="gtk+3-devel libglib-devel libsecret-devel network-manager-applet-devel
+libressl-devel nss-devel ppp-devel"
+depends="strongswan xl2tpd ppp"
+short_desc="NetworkManager VPN plugin for L2TP/IPsec"
+maintainer="Douglas Kosovic <doug@uq.edu.au>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nm-l2tp/NetworkManager-l2tp"
+distfiles="https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/${version}/${pkgname}-${version}.tar.xz"
+checksum=1d80986dc88951e298446833d314bab7af0a933e736960d6b3b025e6b7faca94
+
+do_configure() {
+	PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/include/pppd/patchlevel.h)
+
+	./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
+}

From 40bd0dc6864996dfbe27c2e1ef83c024c1a08826 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Sun, 19 Jul 2020 18:18:40 +1000
Subject: [PATCH 2/2] Cross compiler fix

---
 srcpkgs/NetworkManager-l2tp/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 031f05ad1a7..218597c2411 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -16,7 +16,11 @@ distfiles="https://github.com/nm-l2tp/NetworkManager-l2tp/releases/download/${ve
 checksum=1d80986dc88951e298446833d314bab7af0a933e736960d6b3b025e6b7faca94
 
 do_configure() {
-	PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/include/pppd/patchlevel.h)
+	if [ "$CROSS_BUILD" ]; then
+		PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/${XBPS_CROSS_TRIPLET}/usr/include/pppd/patchlevel.h)
+	else
+		PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/include/pppd/patchlevel.h)
+	fi
 
 	./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
 }