* [PR PATCH] New package: NetworkManager-l2tp-1.8.2
@ 2020-07-19 6:59 dkosovic
2020-07-19 8:19 ` [PR PATCH] [Updated] " dkosovic
` (24 more replies)
0 siblings, 25 replies; 26+ messages in thread
From: dkosovic @ 2020-07-19 6:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 412 bytes --]
There is a new 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: 1541 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] 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}
+}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
@ 2020-07-19 8:19 ` dkosovic
2020-07-19 9:03 ` dkosovic
` (23 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-19 8:19 UTC (permalink / raw)
To: ml
[-- 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}
}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
2020-07-19 8:19 ` [PR PATCH] [Updated] " dkosovic
@ 2020-07-19 9:03 ` dkosovic
2020-07-22 6:22 ` [PR REVIEW] " fosslinux
` (22 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-19 9:03 UTC (permalink / raw)
To: ml
[-- 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: 1715 bytes --]
From 29ddbdf7e2beb10fd409b780ccac1fb3c2f0d9f1 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
Date: Sun, 19 Jul 2020 19:02:03 +1000
Subject: [PATCH] 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 <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() {
+ 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}
+}
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
2020-07-19 8:19 ` [PR PATCH] [Updated] " dkosovic
2020-07-19 9:03 ` dkosovic
@ 2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
` (21 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 169 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458559100
Comment:
Indent with 1 space.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (3 preceding siblings ...)
2020-07-22 6:22 ` fosslinux
@ 2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
` (19 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458559458
Comment:
An explanation of what this does in a comment above would be *nice* but not entirely necessary.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (2 preceding siblings ...)
2020-07-22 6:22 ` [PR REVIEW] " fosslinux
@ 2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
` (20 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 535 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458560458
Comment:
> I was just trying to avoid being a maintainer of a NetworkManager-l2tp package for another Linux distro on top of the ones I already maintain. I don't have anything against a PR, I just wanted to avoid being the maintainer.
If this is still true, feel free to have the package as Orphaned, and update it when/if you have time, rather than being the "goto person" for this template.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (4 preceding siblings ...)
2020-07-22 6:22 ` fosslinux
@ 2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
` (18 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458559651
Comment:
Can use `${homepage}` here instead of rewriting the lot out.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (5 preceding siblings ...)
2020-07-22 6:22 ` fosslinux
@ 2020-07-22 6:22 ` fosslinux
2020-07-22 6:33 ` ericonr
` (17 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 6:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458560773
Comment:
Shouldn't `glib-devel` be in `makedepends`, from a very quick scan of the Makefile.am?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (6 preceding siblings ...)
2020-07-22 6:22 ` fosslinux
@ 2020-07-22 6:33 ` ericonr
2020-07-22 7:01 ` dkosovic
` (16 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: ericonr @ 2020-07-22 6:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 252 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458565190
Comment:
If it needs `glib-compile-resources`, it needs `glib-devel` on host. I saw what looked like a call to it.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (7 preceding siblings ...)
2020-07-22 6:33 ` ericonr
@ 2020-07-22 7:01 ` dkosovic
2020-07-22 7:04 ` dkosovic
` (15 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 7:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458577047
Comment:
According to https://github.com/void-linux/void-packages/blob/master/srcpkgs/libglib-devel, `libglib-devel` is a symlink to `glib-devel`. So I'm guessing `glib-devel` doesn't need to be specified if `libglib-devel` is used. But happy to change it if required.
I used a combination of `makedepends` from NetworkManager-pptp and NetworkManager-openvpn, plus `libressl-devel` and `nss-devel`.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (8 preceding siblings ...)
2020-07-22 7:01 ` dkosovic
@ 2020-07-22 7:04 ` dkosovic
2020-07-22 7:15 ` fosslinux
` (14 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 7:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 199 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458578011
Comment:
happy to carry on for a while, can orphan it later.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (9 preceding siblings ...)
2020-07-22 7:04 ` dkosovic
@ 2020-07-22 7:15 ` fosslinux
2020-07-22 7:21 ` dkosovic
` (13 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 7:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458583503
Comment:
@ericonr that's kinda silly IMO, that the binaries are in there, but w/e, you're right
@dkosovic So `glib-devel` is still good here. But, for future reference `glib-devel` actually contains different content to `libglib-devel`. This is because, in void's packaging system, a symlink just means "use this template". As you can see [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/glib/template#L26) and [here](https://github.com/void-linux/void-packages/blob/master/srcpkgs/glib/template#L38), they are both from the same template `glib`. It's just that the files get moved out to those "subpackages". So, despite them being symlinks, they actually have different content. Two subpackages from the same template can be necessary, as they are in this case :) HTH
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (10 preceding siblings ...)
2020-07-22 7:15 ` fosslinux
@ 2020-07-22 7:21 ` dkosovic
2020-07-22 7:43 ` dkosovic
` (12 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 7:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458586552
Comment:
I'll try and come up with something.
Unfortunately the upstream ppp package doesn't use pkgconfig yet. For the PPP based NetworkManager VPNs, Debian uses `dh_ppp --plugin-dir`, OpenSUSE has `%requires_eq ppp`, Fedora does a similar `sed` on `/usr/include/pppd/patchlevel.h`.
For the `depends`, I would have liked to have had something like `ppp=${PPP_VERSION}`, to enforce that the package should get rebuilt whenever a new version of the ppp package comes along which uses a pppd plugin dir location based on the ppp version number.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (11 preceding siblings ...)
2020-07-22 7:21 ` dkosovic
@ 2020-07-22 7:43 ` dkosovic
2020-07-22 7:51 ` fosslinux
` (11 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 735 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458586552
Comment:
I'll try and come up with something for the comment.
But for a bit of background, unfortunately the upstream ppp package doesn't use pkgconfig yet. For the PPP based NetworkManager VPNs, Debian uses `dh_ppp --plugin-dir`, OpenSUSE has `%requires_eq ppp`, Fedora does a similar `sed` on `/usr/include/pppd/patchlevel.h`.
For the `depends`, I would have liked to have had something like `ppp=${PPP_VERSION}`, to enforce that the package should get rebuilt whenever a new version of the ppp package comes along which uses a pppd plugin dir location based on the ppp version number.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (12 preceding siblings ...)
2020-07-22 7:43 ` dkosovic
@ 2020-07-22 7:51 ` fosslinux
2020-07-22 12:13 ` [PR PATCH] [Updated] " dkosovic
` (10 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: fosslinux @ 2020-07-22 7:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 384 bytes --]
New review comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458602730
Comment:
That would be optimal. I came across a similar situation for another package a few months back. I just ended up adding a comment to the beginning of the template that the package should be revbumped when such a new version is released.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Updated] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (13 preceding siblings ...)
2020-07-22 7:51 ` fosslinux
@ 2020-07-22 12:13 ` dkosovic
2020-07-22 12:27 ` [PR REVIEW] " sgn
` (9 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 12:13 UTC (permalink / raw)
To: ml
[-- 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: 3453 bytes --]
From 29ddbdf7e2beb10fd409b780ccac1fb3c2f0d9f1 Mon Sep 17 00:00:00 2001
From: Douglas Kosovic <doug@uq.edu.au>
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 <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() {
+ 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 <doug@uq.edu.au>
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 <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"
+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)
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (14 preceding siblings ...)
2020-07-22 12:13 ` [PR PATCH] [Updated] " dkosovic
@ 2020-07-22 12:27 ` sgn
2020-07-22 12:28 ` sgn
` (8 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-22 12:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1139 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458753760
Comment:
I'll applied this on top of your change:
```diff
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 16bd590a97..5fc1665715 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -18,11 +18,7 @@ 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)
- else
- PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/include/pppd/patchlevel.h)
- fi
+ PPP_VERSION=$(awk '/VERSION/{print $3}' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
}
```
Thought?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (15 preceding siblings ...)
2020-07-22 12:27 ` [PR REVIEW] " sgn
@ 2020-07-22 12:28 ` sgn
2020-07-22 22:35 ` dkosovic
` (7 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-22 12:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1137 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r458753760
Comment:
I'll apply this on top of your change:
```diff
diff --git a/srcpkgs/NetworkManager-l2tp/template b/srcpkgs/NetworkManager-l2tp/template
index 16bd590a97..5fc1665715 100644
--- a/srcpkgs/NetworkManager-l2tp/template
+++ b/srcpkgs/NetworkManager-l2tp/template
@@ -18,11 +18,7 @@ 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)
- else
- PPP_VERSION=$(sed -n 's/^\#define\s*VERSION\s*"\([^\s]*\)"$/\1/p' /usr/include/pppd/patchlevel.h)
- fi
+ PPP_VERSION=$(awk '/VERSION/{print $3}' ${XBPS_CROSS_BASE}/usr/include/pppd/patchlevel.h)
./configure ${configure_args} --with-pppd-plugin-dir=/usr/lib/pppd/${PPP_VERSION}
}
```
Thought?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (16 preceding siblings ...)
2020-07-22 12:28 ` sgn
@ 2020-07-22 22:35 ` dkosovic
2020-07-23 1:45 ` sgn
` (6 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-22 22:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 407 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459121989
Comment:
I like how `${XBPS_CROSS_BASE}`simplified things.
awk version of `PPP_VERSION` ends up being `"2.4.7"` while the sed version didn't have quotes, but `--with-pppd-plugin-dir=/usr/lib/pppd/"2.4.7"` will work fine as a configure argument, so I'm okay with it.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (17 preceding siblings ...)
2020-07-22 22:35 ` dkosovic
@ 2020-07-23 1:45 ` sgn
2020-07-23 2:10 ` dkosovic
` (5 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-23 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459174825
Comment:
> awk version of `PPP_VERSION` ends up being `"2.4.7"` while the sed version didn't have quotes, but `--with-pppd-plugin-dir=/usr/lib/pppd/"2.4.7"` will work fine as a configure argument, so I'm okay with it.
That's right. I aware that `awk 'print $3'`'s output will be quoted with d-quotes.
But, the quotes will be stripped out with shell expansion.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (18 preceding siblings ...)
2020-07-23 1:45 ` sgn
@ 2020-07-23 2:10 ` dkosovic
2020-07-23 2:17 ` sgn
` (4 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-23 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459180170
Comment:
Not sure if I'm the one that needs to commit the change or you'll apply the change?
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (19 preceding siblings ...)
2020-07-23 2:10 ` dkosovic
@ 2020-07-23 2:17 ` sgn
2020-07-23 2:18 ` sgn
` (3 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-23 2:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459181700
Comment:
One (unimportant) questions: does the package work if `/etc/dbus-1/system.d/nm-l2tp-service.conf` is moved into `/usr/share/dbus-1/system.d`?
In any case, I can commit myself.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (20 preceding siblings ...)
2020-07-23 2:17 ` sgn
@ 2020-07-23 2:18 ` sgn
2020-07-23 2:42 ` dkosovic
` (2 subsequent siblings)
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-23 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459181700
Comment:
One (unimportant) questions: does the package work if `/etc/dbus-1/system.d/nm-l2tp-service.conf` is moved into `/usr/share/dbus-1/system.d`?
In any case, I can commit myself: https://github.com/sgn/void-packages/commit/e8bc05ea97
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR REVIEW] New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (21 preceding siblings ...)
2020-07-23 2:18 ` sgn
@ 2020-07-23 2:42 ` dkosovic
2020-07-23 11:16 ` sgn
2020-07-23 13:32 ` [PR PATCH] [Closed]: " sgn
24 siblings, 0 replies; 26+ messages in thread
From: dkosovic @ 2020-07-23 2:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
New review comment by dkosovic on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#discussion_r459187118
Comment:
The current Debian package has a patch that does that, so can confirm it should work with that location.
The next upstream version will use `/usr/share/dbus-1/system.d` by default with commit https://github.com/nm-l2tp/NetworkManager-l2tp/commit/1fb9197b628f4b010e515a49b55a2d20ed18a9cf.
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (22 preceding siblings ...)
2020-07-23 2:42 ` dkosovic
@ 2020-07-23 11:16 ` sgn
2020-07-23 13:32 ` [PR PATCH] [Closed]: " sgn
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-23 11:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/23646#issuecomment-662949898
Comment:
On 2020-07-22 19:43:04-0700, Douglas Kosovic <notifications@github.com> wrote:
> @dkosovic commented on this pull request.
>
>
>
> > + 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)
>
> The current Debian package has a patch that does that, so can confirm it should work with that location.
>
> The next upstream version will use `/usr/share/dbus-1/system.d` by default with commit https://github.com/nm-l2tp/NetworkManager-l2tp/commit/1fb9197b628f4b010e515a49b55a2d20ed18a9cf.
Thanks, I'll push this out when chromium is finished building.
https://github.com/sgn/void-packages/commit/a1d215ab4ae4beda1ae9ff0eb795a1b491497f52
Don't want to queue it on top of chromium.
--
Danh
^ permalink raw reply [flat|nested] 26+ messages in thread
* Re: [PR PATCH] [Closed]: New package: NetworkManager-l2tp-1.8.2
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
` (23 preceding siblings ...)
2020-07-23 11:16 ` sgn
@ 2020-07-23 13:32 ` sgn
24 siblings, 0 replies; 26+ messages in thread
From: sgn @ 2020-07-23 13:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 260 bytes --]
There's a closed pull request on the void-packages repository
New package: NetworkManager-l2tp-1.8.2
https://github.com/void-linux/void-packages/pull/23646
Description:
Package request as discussed in https://github.com/void-linux/void-packages/issues/22610
^ permalink raw reply [flat|nested] 26+ messages in thread
end of thread, other threads:[~2020-07-23 13:32 UTC | newest]
Thread overview: 26+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-19 6:59 [PR PATCH] New package: NetworkManager-l2tp-1.8.2 dkosovic
2020-07-19 8:19 ` [PR PATCH] [Updated] " dkosovic
2020-07-19 9:03 ` dkosovic
2020-07-22 6:22 ` [PR REVIEW] " fosslinux
2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
2020-07-22 6:22 ` fosslinux
2020-07-22 6:33 ` ericonr
2020-07-22 7:01 ` dkosovic
2020-07-22 7:04 ` dkosovic
2020-07-22 7:15 ` fosslinux
2020-07-22 7:21 ` dkosovic
2020-07-22 7:43 ` dkosovic
2020-07-22 7:51 ` fosslinux
2020-07-22 12:13 ` [PR PATCH] [Updated] " dkosovic
2020-07-22 12:27 ` [PR REVIEW] " sgn
2020-07-22 12:28 ` sgn
2020-07-22 22:35 ` dkosovic
2020-07-23 1:45 ` sgn
2020-07-23 2:10 ` dkosovic
2020-07-23 2:17 ` sgn
2020-07-23 2:18 ` sgn
2020-07-23 2:42 ` dkosovic
2020-07-23 11:16 ` sgn
2020-07-23 13:32 ` [PR PATCH] [Closed]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).