From 29ddbdf7e2beb10fd409b780ccac1fb3c2f0d9f1 Mon Sep 17 00:00:00 2001 From: Douglas Kosovic Date: Sun, 19 Jul 2020 19:02:03 +1000 Subject: [PATCH 1/2] New package: NetworkManager-l2tp-1.8.2 --- srcpkgs/NetworkManager-l2tp/template | 26 ++++++++++++++++++++++++++ 1 file changed, 26 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..218597c2411 --- /dev/null +++ b/srcpkgs/NetworkManager-l2tp/template @@ -0,0 +1,26 @@ +# 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 " +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() { + 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} +} From 84a330e322d457cd7cac6fe9ad571242005349cd Mon Sep 17 00:00:00 2001 From: Douglas Kosovic Date: Wed, 22 Jul 2020 22:12:18 +1000 Subject: [PATCH 2/2] Changes based on PR comments --- srcpkgs/NetworkManager-l2tp/template | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template index 218597c2411..16bd590a97e 100644 --- a/srcpkgs/NetworkManager-l2tp/template +++ b/srcpkgs/NetworkManager-l2tp/template @@ -5,16 +5,18 @@ 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" +makedepends="gtk+3-devel glib-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 " 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" +distfiles="${homepage}/releases/download/${version}/${pkgname}-${version}.tar.xz" checksum=1d80986dc88951e298446833d314bab7af0a933e736960d6b3b025e6b7faca94 +# Automatically determine the pppd plugin dir location, but will need to +# revbump this package whenever version of ppp package is updated. do_configure() { 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)