* [ptxdist] [PATCH 1/7] libmbim: version bump 1.18.2 -> 1.24.2
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
@ 2020-08-23 13:40 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-23 13:41 ` [ptxdist] [PATCH 2/7] libqmi: version bump 1.24.4 -> 1.26.2 Ladislav Michl
` (5 subsequent siblings)
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:40 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/libmbim.make | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/rules/libmbim.make b/rules/libmbim.make
index 3a696180f..1d7ac7deb 100644
--- a/rules/libmbim.make
+++ b/rules/libmbim.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
#
# Paths and names
#
-LIBMBIM_VERSION := 1.18.2
-LIBMBIM_MD5 := 7f7da7fa4bf37e64e44822fa00d42d6b
+LIBMBIM_VERSION := 1.24.2
+LIBMBIM_MD5 := 6c2b490af87773c8446f37536e7411ac
LIBMBIM := libmbim-$(LIBMBIM_VERSION)
LIBMBIM_SUFFIX := tar.xz
LIBMBIM_URL := http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
@@ -36,10 +36,12 @@ LIBMBIM_CONF_ENV := \
LIBMBIM_CONF_TOOL := autoconf
LIBMBIM_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --disable-more-warnings \
+ --disable-compile-warnings \
+ --disable-Werror \
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
+ --disable-introspection \
--with-udev-base-dir=/usr/lib/udev
# ----------------------------------------------------------------------------
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [APPLIED] libmbim: version bump 1.18.2 -> 1.24.2
2020-08-23 13:40 ` [ptxdist] [PATCH 1/7] libmbim: version bump 1.18.2 -> 1.24.2 Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as e4f39aea9e5b1c6b94ff2fc021537c6891164a1c.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:21 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200823134056.GB482575@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libmbim.make b/rules/libmbim.make
> index 3a696180f8be..1d7ac7deb2b2 100644
> --- a/rules/libmbim.make
> +++ b/rules/libmbim.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
> #
> # Paths and names
> #
> -LIBMBIM_VERSION := 1.18.2
> -LIBMBIM_MD5 := 7f7da7fa4bf37e64e44822fa00d42d6b
> +LIBMBIM_VERSION := 1.24.2
> +LIBMBIM_MD5 := 6c2b490af87773c8446f37536e7411ac
> LIBMBIM := libmbim-$(LIBMBIM_VERSION)
> LIBMBIM_SUFFIX := tar.xz
> LIBMBIM_URL := http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
> @@ -36,10 +36,12 @@ LIBMBIM_CONF_ENV := \
> LIBMBIM_CONF_TOOL := autoconf
> LIBMBIM_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> - --disable-more-warnings \
> + --disable-compile-warnings \
> + --disable-Werror \
> --disable-gtk-doc \
> --disable-gtk-doc-html \
> --disable-gtk-doc-pdf \
> + --disable-introspection \
> --with-udev-base-dir=/usr/lib/udev
>
> # ----------------------------------------------------------------------------
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 2/7] libqmi: version bump 1.24.4 -> 1.26.2
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
2020-08-23 13:40 ` [ptxdist] [PATCH 1/7] libmbim: version bump 1.18.2 -> 1.24.2 Ladislav Michl
@ 2020-08-23 13:41 ` Ladislav Michl
2020-08-30 21:37 ` [ptxdist] [PATCH v2 " Ladislav Michl
2020-08-23 13:41 ` [ptxdist] [PATCH 3/7] modemmanager: version bump 1.12.6 -> 1.14.2 Ladislav Michl
` (4 subsequent siblings)
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/libqmi.make | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/rules/libqmi.make b/rules/libqmi.make
index 00ec44f8e..b7c7dd904 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
#
# Paths and names
#
-LIBQMI_VERSION := 1.24.4
-LIBQMI_MD5 := be6539fde54fec1fc9d852db201c8560
+LIBQMI_VERSION := 1.26.2
+LIBQMI_MD5 := ce7166668c9f1ccd496fc6af882ee00e
LIBQMI := libqmi-$(LIBQMI_VERSION)
LIBQMI_SUFFIX := tar.xz
LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
@@ -33,12 +33,17 @@ LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
LIBQMI_CONF_TOOL := autoconf
LIBQMI_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --disable-more-warnings \
+ --disable-compile-warnings \
+ --disable-Werror \
+ --disable-introspection \
+ --enable-collection=full \
--disable-firmware-update \
--disable-mm-runtime-check \
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
+ --disable-mbim-qmux \
+ --disable-qrtr \
--without-udev \
--with-udev-base-dir=/usr/lib/udev
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* [ptxdist] [PATCH v2 2/7] libqmi: version bump 1.24.4 -> 1.26.2
2020-08-23 13:41 ` [ptxdist] [PATCH 2/7] libqmi: version bump 1.24.4 -> 1.26.2 Ladislav Michl
@ 2020-08-30 21:37 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-30 21:37 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v2: resolve conflict after recent update
rules/libqmi.make | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/rules/libqmi.make b/rules/libqmi.make
index 9670236e2..2b3e40140 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
#
# Paths and names
#
-LIBQMI_VERSION := 1.24.4
-LIBQMI_MD5 := be6539fde54fec1fc9d852db201c8560
+LIBQMI_VERSION := 1.26.2
+LIBQMI_MD5 := ce7166668c9f1ccd496fc6af882ee00e
LIBQMI := libqmi-$(LIBQMI_VERSION)
LIBQMI_SUFFIX := tar.xz
LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
@@ -33,7 +33,10 @@ LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
LIBQMI_CONF_TOOL := autoconf
LIBQMI_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
- --disable-more-warnings \
+ --disable-compile-warnings \
+ --disable-Werror \
+ --disable-introspection \
+ --enable-collection=full \
--disable-firmware-update \
--disable-mm-runtime-check \
--disable-gtk-doc \
@@ -41,6 +44,7 @@ LIBQMI_CONF_OPT := \
--disable-gtk-doc-pdf \
--disable-qmi-username \
--$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \
+ --disable-qrtr \
--without-udev \
--with-udev-base-dir=/usr/lib/udev
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [APPLIED] libqmi: version bump 1.24.4 -> 1.26.2
2020-08-30 21:37 ` [ptxdist] [PATCH v2 " Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as 72a3aa9be717979bb9201c055a8f82a7b00b1411.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:21 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200830213753.GA93374@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libqmi.make b/rules/libqmi.make
> index 9670236e2619..2b3e40140b88 100644
> --- a/rules/libqmi.make
> +++ b/rules/libqmi.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
> #
> # Paths and names
> #
> -LIBQMI_VERSION := 1.24.4
> -LIBQMI_MD5 := be6539fde54fec1fc9d852db201c8560
> +LIBQMI_VERSION := 1.26.2
> +LIBQMI_MD5 := ce7166668c9f1ccd496fc6af882ee00e
> LIBQMI := libqmi-$(LIBQMI_VERSION)
> LIBQMI_SUFFIX := tar.xz
> LIBQMI_URL := http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
> @@ -33,7 +33,10 @@ LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
> LIBQMI_CONF_TOOL := autoconf
> LIBQMI_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> - --disable-more-warnings \
> + --disable-compile-warnings \
> + --disable-Werror \
> + --disable-introspection \
> + --enable-collection=full \
> --disable-firmware-update \
> --disable-mm-runtime-check \
> --disable-gtk-doc \
> @@ -41,6 +44,7 @@ LIBQMI_CONF_OPT := \
> --disable-gtk-doc-pdf \
> --disable-qmi-username \
> --$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \
> + --disable-qrtr \
> --without-udev \
> --with-udev-base-dir=/usr/lib/udev
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 3/7] modemmanager: version bump 1.12.6 -> 1.14.2
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
2020-08-23 13:40 ` [ptxdist] [PATCH 1/7] libmbim: version bump 1.18.2 -> 1.24.2 Ladislav Michl
2020-08-23 13:41 ` [ptxdist] [PATCH 2/7] libqmi: version bump 1.24.4 -> 1.26.2 Ladislav Michl
@ 2020-08-23 13:41 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-23 13:42 ` [ptxdist] [PATCH 4/7] networkmanager: version bump 1.26.0 -> 1.26.2 Ladislav Michl
` (3 subsequent siblings)
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:41 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/modemmanager.make | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 5cae10024..b592694a8 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
#
# Paths and names
#
-MODEMMANAGER_VERSION := 1.12.6
-MODEMMANAGER_MD5 := 796bf7bfc156c4229cef1a9cb8c79f37
+MODEMMANAGER_VERSION := 1.14.2
+MODEMMANAGER_MD5 := 3a4a94376ca6e8dbfb964394022f7a0e
MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION)
MODEMMANAGER_SUFFIX := tar.xz
MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
@@ -35,6 +35,8 @@ MODEMMANAGER_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-la
MODEMMANAGER_CONF_TOOL := autoconf
MODEMMANAGER_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ --disable-compile-warnings \
+ --disable-Werror \
--disable-gtk-doc \
--disable-gtk-doc-html \
--disable-gtk-doc-pdf \
@@ -42,7 +44,7 @@ MODEMMANAGER_CONF_OPT := \
--disable-rpath \
--disable-introspection \
--disable-vala \
- --disable-more-warnings \
+ --enable-all-plugins \
--with-gnu-ld \
--with-dbus-sys-dir=/usr/share/dbus-1/system.d \
--with-udev-base-dir=/usr/lib/udev \
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [APPLIED] modemmanager: version bump 1.12.6 -> 1.14.2
2020-08-23 13:41 ` [ptxdist] [PATCH 3/7] modemmanager: version bump 1.12.6 -> 1.14.2 Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as eb52de13f051a0ce382b5e674f3ca3b1faeeacd2.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:22 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200823134149.GD482575@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/modemmanager.make b/rules/modemmanager.make
> index 5cae10024bbd..b592694a86fc 100644
> --- a/rules/modemmanager.make
> +++ b/rules/modemmanager.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
> #
> # Paths and names
> #
> -MODEMMANAGER_VERSION := 1.12.6
> -MODEMMANAGER_MD5 := 796bf7bfc156c4229cef1a9cb8c79f37
> +MODEMMANAGER_VERSION := 1.14.2
> +MODEMMANAGER_MD5 := 3a4a94376ca6e8dbfb964394022f7a0e
> MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION)
> MODEMMANAGER_SUFFIX := tar.xz
> MODEMMANAGER_URL := https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
> @@ -35,6 +35,8 @@ MODEMMANAGER_LICENSE := GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-la
> MODEMMANAGER_CONF_TOOL := autoconf
> MODEMMANAGER_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + --disable-compile-warnings \
> + --disable-Werror \
> --disable-gtk-doc \
> --disable-gtk-doc-html \
> --disable-gtk-doc-pdf \
> @@ -42,7 +44,7 @@ MODEMMANAGER_CONF_OPT := \
> --disable-rpath \
> --disable-introspection \
> --disable-vala \
> - --disable-more-warnings \
> + --enable-all-plugins \
> --with-gnu-ld \
> --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
> --with-udev-base-dir=/usr/lib/udev \
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 4/7] networkmanager: version bump 1.26.0 -> 1.26.2
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
` (2 preceding siblings ...)
2020-08-23 13:41 ` [ptxdist] [PATCH 3/7] modemmanager: version bump 1.12.6 -> 1.14.2 Ladislav Michl
@ 2020-08-23 13:42 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
2020-08-23 13:42 ` [ptxdist] [PATCH 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12 Ladislav Michl
` (2 subsequent siblings)
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:42 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
...clients-cli-build-generate_docs_nm_settings_nmcli-on.patch | 0
.../{NetworkManager-1.26.0 => NetworkManager-1.26.2}/series | 0
rules/networkmanager.make | 4 ++--
3 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{NetworkManager-1.26.0 => NetworkManager-1.26.2}/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch (100%)
rename patches/{NetworkManager-1.26.0 => NetworkManager-1.26.2}/series (100%)
diff --git a/patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch b/patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
similarity index 100%
rename from patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
rename to patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
diff --git a/patches/NetworkManager-1.26.0/series b/patches/NetworkManager-1.26.2/series
similarity index 100%
rename from patches/NetworkManager-1.26.0/series
rename to patches/NetworkManager-1.26.2/series
diff --git a/rules/networkmanager.make b/rules/networkmanager.make
index c9f4b4f9f..26225e0b0 100644
--- a/rules/networkmanager.make
+++ b/rules/networkmanager.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
#
# Paths and names
#
-NETWORKMANAGER_VERSION := 1.26.0
-NETWORKMANAGER_MD5 := c0edbbf98a1ec81eed5a03539610d324
+NETWORKMANAGER_VERSION := 1.26.2
+NETWORKMANAGER_MD5 := ad5332a7fe5d00db7c75b722337be62b
NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
NETWORKMANAGER_SUFFIX := tar.xz
NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [APPLIED] networkmanager: version bump 1.26.0 -> 1.26.2
2020-08-23 13:42 ` [ptxdist] [PATCH 4/7] networkmanager: version bump 1.26.0 -> 1.26.2 Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as aca32d1331df0a6f05ea645e2df95fd3b7e25f42.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:22 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200823134215.GE482575@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch b/patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> similarity index 100%
> rename from patches/NetworkManager-1.26.0/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> rename to patches/NetworkManager-1.26.2/0001-clients-cli-build-generate_docs_nm_settings_nmcli-on.patch
> diff --git a/patches/NetworkManager-1.26.0/series b/patches/NetworkManager-1.26.2/series
> similarity index 100%
> rename from patches/NetworkManager-1.26.0/series
> rename to patches/NetworkManager-1.26.2/series
> diff --git a/rules/networkmanager.make b/rules/networkmanager.make
> index c9f4b4f9f7f4..26225e0b0e8b 100644
> --- a/rules/networkmanager.make
> +++ b/rules/networkmanager.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER) += networkmanager
> #
> # Paths and names
> #
> -NETWORKMANAGER_VERSION := 1.26.0
> -NETWORKMANAGER_MD5 := c0edbbf98a1ec81eed5a03539610d324
> +NETWORKMANAGER_VERSION := 1.26.2
> +NETWORKMANAGER_MD5 := ad5332a7fe5d00db7c75b722337be62b
> NETWORKMANAGER := NetworkManager-$(NETWORKMANAGER_VERSION)
> NETWORKMANAGER_SUFFIX := tar.xz
> NETWORKMANAGER_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(basename $(NETWORKMANAGER_VERSION))/$(NETWORKMANAGER).$(NETWORKMANAGER_SUFFIX)
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
` (3 preceding siblings ...)
2020-08-23 13:42 ` [ptxdist] [PATCH 4/7] networkmanager: version bump 1.26.0 -> 1.26.2 Ladislav Michl
@ 2020-08-23 13:42 ` Ladislav Michl
2020-08-28 10:49 ` Michael Olbrich
2020-08-23 13:43 ` [ptxdist] [PATCH 6/7] openfortivpn: new package Ladislav Michl
2020-08-23 13:43 ` [ptxdist] [PATCH 7/7] networkmanager-fortisslvpn: " Ladislav Michl
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:42 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/networkmanager-openvpn.make | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/rules/networkmanager-openvpn.make b/rules/networkmanager-openvpn.make
index 52dee7918..047ddefb5 100644
--- a/rules/networkmanager-openvpn.make
+++ b/rules/networkmanager-openvpn.make
@@ -14,13 +14,17 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += networkmanager-openvpn
#
# Paths and names
#
-NETWORKMANAGER_OPENVPN_VERSION := 1.8.4
-NETWORKMANAGER_OPENVPN_MD5 := db5bee5160da14ee76e9f8cf287ab9ec
+NETWORKMANAGER_OPENVPN_VERSION := 1.8.12
+NETWORKMANAGER_OPENVPN_MD5 := e8b1210011ece18d0278310fbff45af5
NETWORKMANAGER_OPENVPN := NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
NETWORKMANAGER_OPENVPN_SUFFIX := tar.xz
-NETWORKMANAGER_OPENVPN_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
+NETWORKMANAGER_OPENVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/$(basename $(NETWORKMANAGER_OPENVPN_VERSION))/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
NETWORKMANAGER_OPENVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
+NETWORKMANAGER_OPENVPN_LICENSE := GPL-2.0-or-later
+NETWORKMANAGER_OPENVPN_LICENSE_FILES := \
+ file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c \
+ file://src/nm-openvpn-service.c;startline=4;endline=16;md5=dc133184bee887456e34cd179e2e9549
# ----------------------------------------------------------------------------
# Prepare
@@ -29,8 +33,8 @@ NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
#
# autoconf
#
-NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
-NETWORKMANAGER_OPENVPN_CONF_OPT := \
+NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
+NETWORKMANAGER_OPENVPN_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--enable-shared \
--disable-static \
@@ -38,7 +42,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
--disable-ld-gc \
--disable-lto \
--disable-nls \
- --enable-more-warnings \
+ --disable-more-warnings \
--without-gnome \
--without-libnm-glib
@@ -55,10 +59,11 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
@$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
@$(call install_fixup, networkmanager-openvpn,DESCRIPTION, "networkmanager-openvpn")
- @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /etc/dbus-1/system.d/nm-openvpn-service.conf)
- @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
-
- @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
+ @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/libnm-vpn-plugin-openvpn.so)
+ @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
+ @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec)
@$(call install_finish, networkmanager-openvpn)
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [PATCH 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12
2020-08-23 13:42 ` [ptxdist] [PATCH 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12 Ladislav Michl
@ 2020-08-28 10:49 ` Michael Olbrich
2020-08-28 14:59 ` [ptxdist] [PATCH v2 " Ladislav Michl
0 siblings, 1 reply; 29+ messages in thread
From: Michael Olbrich @ 2020-08-28 10:49 UTC (permalink / raw)
To: ptxdist
On Sun, Aug 23, 2020 at 03:42:52PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> rules/networkmanager-openvpn.make | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/rules/networkmanager-openvpn.make b/rules/networkmanager-openvpn.make
> index 52dee7918..047ddefb5 100644
> --- a/rules/networkmanager-openvpn.make
> +++ b/rules/networkmanager-openvpn.make
> @@ -14,13 +14,17 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += networkmanager-openvpn
> #
> # Paths and names
> #
> -NETWORKMANAGER_OPENVPN_VERSION := 1.8.4
> -NETWORKMANAGER_OPENVPN_MD5 := db5bee5160da14ee76e9f8cf287ab9ec
> +NETWORKMANAGER_OPENVPN_VERSION := 1.8.12
> +NETWORKMANAGER_OPENVPN_MD5 := e8b1210011ece18d0278310fbff45af5
> NETWORKMANAGER_OPENVPN := NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
> NETWORKMANAGER_OPENVPN_SUFFIX := tar.xz
> -NETWORKMANAGER_OPENVPN_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> +NETWORKMANAGER_OPENVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/$(basename $(NETWORKMANAGER_OPENVPN_VERSION))/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> NETWORKMANAGER_OPENVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
> +NETWORKMANAGER_OPENVPN_LICENSE := GPL-2.0-or-later
> +NETWORKMANAGER_OPENVPN_LICENSE_FILES := \
> + file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c \
> + file://src/nm-openvpn-service.c;startline=4;endline=16;md5=dc133184bee887456e34cd179e2e9549
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -29,8 +33,8 @@ NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
> #
> # autoconf
> #
> -NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
> -NETWORKMANAGER_OPENVPN_CONF_OPT := \
> +NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
> +NETWORKMANAGER_OPENVPN_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --enable-shared \
> --disable-static \
> @@ -38,7 +42,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
> --disable-ld-gc \
> --disable-lto \
> --disable-nls \
> - --enable-more-warnings \
> + --disable-more-warnings \
> --without-gnome \
> --without-libnm-glib
>
> @@ -55,10 +59,11 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
> @$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> @$(call install_fixup, networkmanager-openvpn,DESCRIPTION, "networkmanager-openvpn")
>
> - @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /etc/dbus-1/system.d/nm-openvpn-service.conf)
This file is now in /usr/share/dbus-1. I think it is still needed.
Michael
> - @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> -
> - @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
> + @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/libnm-vpn-plugin-openvpn.so)
> + @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> + @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec)
>
> @$(call install_finish, networkmanager-openvpn)
>
> --
> 2.28.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH v2 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12
2020-08-28 10:49 ` Michael Olbrich
@ 2020-08-28 14:59 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-28 14:59 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v2: install dbus policy config
rules/networkmanager-openvpn.make | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/rules/networkmanager-openvpn.make b/rules/networkmanager-openvpn.make
index 52dee7918..3bea76379 100644
--- a/rules/networkmanager-openvpn.make
+++ b/rules/networkmanager-openvpn.make
@@ -14,13 +14,17 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += networkmanager-openvpn
#
# Paths and names
#
-NETWORKMANAGER_OPENVPN_VERSION := 1.8.4
-NETWORKMANAGER_OPENVPN_MD5 := db5bee5160da14ee76e9f8cf287ab9ec
+NETWORKMANAGER_OPENVPN_VERSION := 1.8.12
+NETWORKMANAGER_OPENVPN_MD5 := e8b1210011ece18d0278310fbff45af5
NETWORKMANAGER_OPENVPN := NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
NETWORKMANAGER_OPENVPN_SUFFIX := tar.xz
-NETWORKMANAGER_OPENVPN_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
+NETWORKMANAGER_OPENVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/$(basename $(NETWORKMANAGER_OPENVPN_VERSION))/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
NETWORKMANAGER_OPENVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
+NETWORKMANAGER_OPENVPN_LICENSE := GPL-2.0-or-later
+NETWORKMANAGER_OPENVPN_LICENSE_FILES := \
+ file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c \
+ file://src/nm-openvpn-service.c;startline=4;endline=16;md5=dc133184bee887456e34cd179e2e9549
# ----------------------------------------------------------------------------
# Prepare
@@ -29,8 +33,8 @@ NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
#
# autoconf
#
-NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
-NETWORKMANAGER_OPENVPN_CONF_OPT := \
+NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
+NETWORKMANAGER_OPENVPN_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
--enable-shared \
--disable-static \
@@ -38,7 +42,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
--disable-ld-gc \
--disable-lto \
--disable-nls \
- --enable-more-warnings \
+ --disable-more-warnings \
--without-gnome \
--without-libnm-glib
@@ -55,10 +59,13 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
@$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
@$(call install_fixup, networkmanager-openvpn,DESCRIPTION, "networkmanager-openvpn")
- @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /etc/dbus-1/system.d/nm-openvpn-service.conf)
- @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
-
- @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
+ @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/libnm-vpn-plugin-openvpn.so)
+ @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
+ @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec)
+ @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
+ /usr/share/dbus-1/system.d/nm-openvpn-service.conf)
@$(call install_finish, networkmanager-openvpn)
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [APPLIED] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12
2020-08-28 14:59 ` [ptxdist] [PATCH v2 " Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as 787b94ab5c89204ec2f34e24290d4f2f57d74c4d.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:23 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200828145947.GB9815@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/networkmanager-openvpn.make b/rules/networkmanager-openvpn.make
> index 52dee7918e90..3bea763792f6 100644
> --- a/rules/networkmanager-openvpn.make
> +++ b/rules/networkmanager-openvpn.make
> @@ -14,13 +14,17 @@ PACKAGES-$(PTXCONF_NETWORKMANAGER_OPENVPN) += networkmanager-openvpn
> #
> # Paths and names
> #
> -NETWORKMANAGER_OPENVPN_VERSION := 1.8.4
> -NETWORKMANAGER_OPENVPN_MD5 := db5bee5160da14ee76e9f8cf287ab9ec
> +NETWORKMANAGER_OPENVPN_VERSION := 1.8.12
> +NETWORKMANAGER_OPENVPN_MD5 := e8b1210011ece18d0278310fbff45af5
> NETWORKMANAGER_OPENVPN := NetworkManager-openvpn-$(NETWORKMANAGER_OPENVPN_VERSION)
> NETWORKMANAGER_OPENVPN_SUFFIX := tar.xz
> -NETWORKMANAGER_OPENVPN_URL := http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.8/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> +NETWORKMANAGER_OPENVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/$(basename $(NETWORKMANAGER_OPENVPN_VERSION))/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> NETWORKMANAGER_OPENVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_OPENVPN).$(NETWORKMANAGER_OPENVPN_SUFFIX)
> NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
> +NETWORKMANAGER_OPENVPN_LICENSE := GPL-2.0-or-later
> +NETWORKMANAGER_OPENVPN_LICENSE_FILES := \
> + file://COPYING;md5=100d5a599bead70ddcd70dcd73f2e29c \
> + file://src/nm-openvpn-service.c;startline=4;endline=16;md5=dc133184bee887456e34cd179e2e9549
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -29,8 +33,8 @@ NETWORKMANAGER_OPENVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_OPENVPN)
> #
> # autoconf
> #
> -NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
> -NETWORKMANAGER_OPENVPN_CONF_OPT := \
> +NETWORKMANAGER_OPENVPN_CONF_TOOL := autoconf
> +NETWORKMANAGER_OPENVPN_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> --enable-shared \
> --disable-static \
> @@ -38,7 +42,7 @@ NETWORKMANAGER_OPENVPN_CONF_OPT := \
> --disable-ld-gc \
> --disable-lto \
> --disable-nls \
> - --enable-more-warnings \
> + --disable-more-warnings \
> --without-gnome \
> --without-libnm-glib
>
> @@ -55,10 +59,13 @@ $(STATEDIR)/networkmanager-openvpn.targetinstall:
> @$(call install_fixup, networkmanager-openvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> @$(call install_fixup, networkmanager-openvpn,DESCRIPTION, "networkmanager-openvpn")
>
> - @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /etc/dbus-1/system.d/nm-openvpn-service.conf)
> - @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> -
> - @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec/)
> + @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/libnm-vpn-plugin-openvpn.so)
> + @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/VPN/nm-openvpn-service.name)
> + @$(call install_tree, networkmanager-openvpn, 0, 0, -, /usr/libexec)
> + @$(call install_copy, networkmanager-openvpn, 0, 0, 0644, -, \
> + /usr/share/dbus-1/system.d/nm-openvpn-service.conf)
>
> @$(call install_finish, networkmanager-openvpn)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
` (4 preceding siblings ...)
2020-08-23 13:42 ` [ptxdist] [PATCH 5/7] networkmanager-openvpn: version bump 1.8.4 -> 1.8.12 Ladislav Michl
@ 2020-08-23 13:43 ` Ladislav Michl
2020-08-23 19:56 ` Roland Hieber
2020-08-28 12:45 ` [ptxdist] [PATCH " Michael Olbrich
2020-08-23 13:43 ` [ptxdist] [PATCH 7/7] networkmanager-fortisslvpn: " Ladislav Michl
6 siblings, 2 replies; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:43 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
patches/openfortivpn-1.14.1/autogen.sh | 1 +
rules/openfortivpn.in | 25 +++++++++
rules/openfortivpn.make | 72 ++++++++++++++++++++++++++
3 files changed, 98 insertions(+)
create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
create mode 100644 rules/openfortivpn.in
create mode 100644 rules/openfortivpn.make
diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/openfortivpn-1.14.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
new file mode 100644
index 000000000..e18643322
--- /dev/null
+++ b/rules/openfortivpn.in
@@ -0,0 +1,25 @@
+## SECTION=networking
+
+menuconfig OPENFORTIVPN
+ tristate
+ prompt "openfortivpn "
+ select LIBC_PTHREAD
+ select LIBC_UTIL
+ select OPENSSL
+ select PPP
+ select SYSTEMD if OPENFORTIVPN_SYSTEMD
+ help
+ openfortivpn is a client for PPP+SSL VPN tunnel services.
+ It spawns a pppd process and operates the communication between
+ the gateway and this process.
+
+ It is compatible with Fortinet VPNs.
+
+if OPENFORTIVPN
+
+config OPENFORTIVPN_SYSTEMD
+ bool
+ default INITMETHOD_SYSTEMD
+
+endif
+
diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
new file mode 100644
index 000000000..4fb6c6e62
--- /dev/null
+++ b/rules/openfortivpn.make
@@ -0,0 +1,72 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
+
+#
+# Paths and names
+#
+OPENFORTIVPN_VERSION := 1.14.1
+OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
+OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
+OPENFORTIVPN_SUFFIX := tar.gz
+OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
+OPENFORTIVPN_LICENSE := GPL-3.0-or-later
+OPENFORTIVPN_LICENSE_FILES := \
+ file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
+ file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+OPENFORTIVPN_CONF_TOOL := autoconf
+OPENFORTIVPN_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-proc \
+ --enable-resolvconf \
+ --with-rt_dst \
+ --without-ppp \
+ --with-pppd=/usr/sbin/pppd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/openfortivpn.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, openfortivpn)
+ @$(call install_fixup, openfortivpn,PRIORITY,optional)
+ @$(call install_fixup, openfortivpn,SECTION,base)
+ @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
+ @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
+
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
+
+ @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
+
+ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, \
+ usr/lib/systemd/system/openfortivpn@.service)
+endif
+
+ @$(call install_finish, openfortivpn)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-23 13:43 ` [ptxdist] [PATCH 6/7] openfortivpn: new package Ladislav Michl
@ 2020-08-23 19:56 ` Roland Hieber
2020-08-24 8:22 ` Ladislav Michl
2020-08-28 12:45 ` [ptxdist] [PATCH " Michael Olbrich
1 sibling, 1 reply; 29+ messages in thread
From: Roland Hieber @ 2020-08-23 19:56 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
On Sun, Aug 23, 2020 at 03:43:16PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> patches/openfortivpn-1.14.1/autogen.sh | 1 +
> rules/openfortivpn.in | 25 +++++++++
> rules/openfortivpn.make | 72 ++++++++++++++++++++++++++
> 3 files changed, 98 insertions(+)
> create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
> create mode 100644 rules/openfortivpn.in
> create mode 100644 rules/openfortivpn.make
>
> diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> new file mode 120000
> index 000000000..9f8a4cb7d
> --- /dev/null
> +++ b/patches/openfortivpn-1.14.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> new file mode 100644
> index 000000000..e18643322
> --- /dev/null
> +++ b/rules/openfortivpn.in
> @@ -0,0 +1,25 @@
> +## SECTION=networking
> +
> +menuconfig OPENFORTIVPN
> + tristate
> + prompt "openfortivpn "
> + select LIBC_PTHREAD
> + select LIBC_UTIL
> + select OPENSSL
> + select PPP
> + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> + help
> + openfortivpn is a client for PPP+SSL VPN tunnel services.
> + It spawns a pppd process and operates the communication between
> + the gateway and this process.
> +
> + It is compatible with Fortinet VPNs.
> +
> +if OPENFORTIVPN
> +
> +config OPENFORTIVPN_SYSTEMD
> + bool
> + default INITMETHOD_SYSTEMD
> +
> +endif
> +
> diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> new file mode 100644
> index 000000000..4fb6c6e62
> --- /dev/null
> +++ b/rules/openfortivpn.make
> @@ -0,0 +1,72 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> +
> +#
> +# Paths and names
> +#
> +OPENFORTIVPN_VERSION := 1.14.1
> +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> +OPENFORTIVPN_SUFFIX := tar.gz
> +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> +OPENFORTIVPN_LICENSE := GPL-3.0-or-later
> +OPENFORTIVPN_LICENSE_FILES := \
> + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
There is an exception at the end, which SPDX doesn't know about. I think
we should specify this as "GPL-3.0-or-later WITH unknown-exception" to
distinguish it from the plain GPL-3.0.
> + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
Also there is LICENSE.OpenSSL, is this used anywhere?
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +OPENFORTIVPN_CONF_TOOL := autoconf
> +OPENFORTIVPN_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-resolvconf \
> + --with-rt_dst \
> + --without-ppp \
> + --with-pppd=/usr/sbin/pppd \
> + --with-systemdsystemunitdir=/usr/lib/systemd/system
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/openfortivpn.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, openfortivpn)
> + @$(call install_fixup, openfortivpn,PRIORITY,optional)
> + @$(call install_fixup, openfortivpn,SECTION,base)
> + @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> + @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
> +
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
> +
> + @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
> +
> +ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, \
> + usr/lib/systemd/system/openfortivpn@.service)
Missing / at the start of the file name.
- Roland
> +endif
> +
> + @$(call install_finish, openfortivpn)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.28.0
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-23 19:56 ` Roland Hieber
@ 2020-08-24 8:22 ` Ladislav Michl
2020-08-24 9:05 ` Roland Hieber
0 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-24 8:22 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
On Sun, Aug 23, 2020 at 09:56:31PM +0200, Roland Hieber wrote:
> On Sun, Aug 23, 2020 at 03:43:16PM +0200, Ladislav Michl wrote:
> > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > ---
> > patches/openfortivpn-1.14.1/autogen.sh | 1 +
> > rules/openfortivpn.in | 25 +++++++++
> > rules/openfortivpn.make | 72 ++++++++++++++++++++++++++
> > 3 files changed, 98 insertions(+)
> > create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
> > create mode 100644 rules/openfortivpn.in
> > create mode 100644 rules/openfortivpn.make
> >
> > diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> > new file mode 120000
> > index 000000000..9f8a4cb7d
> > --- /dev/null
> > +++ b/patches/openfortivpn-1.14.1/autogen.sh
> > @@ -0,0 +1 @@
> > +../autogen.sh
> > \ No newline at end of file
> > diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> > new file mode 100644
> > index 000000000..e18643322
> > --- /dev/null
> > +++ b/rules/openfortivpn.in
> > @@ -0,0 +1,25 @@
> > +## SECTION=networking
> > +
> > +menuconfig OPENFORTIVPN
> > + tristate
> > + prompt "openfortivpn "
> > + select LIBC_PTHREAD
> > + select LIBC_UTIL
> > + select OPENSSL
> > + select PPP
> > + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> > + help
> > + openfortivpn is a client for PPP+SSL VPN tunnel services.
> > + It spawns a pppd process and operates the communication between
> > + the gateway and this process.
> > +
> > + It is compatible with Fortinet VPNs.
> > +
> > +if OPENFORTIVPN
> > +
> > +config OPENFORTIVPN_SYSTEMD
> > + bool
> > + default INITMETHOD_SYSTEMD
> > +
> > +endif
> > +
> > diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> > new file mode 100644
> > index 000000000..4fb6c6e62
> > --- /dev/null
> > +++ b/rules/openfortivpn.make
> > @@ -0,0 +1,72 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> > +
> > +#
> > +# Paths and names
> > +#
> > +OPENFORTIVPN_VERSION := 1.14.1
> > +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> > +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> > +OPENFORTIVPN_SUFFIX := tar.gz
> > +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> > +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> > +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> > +OPENFORTIVPN_LICENSE := GPL-3.0-or-later
> > +OPENFORTIVPN_LICENSE_FILES := \
> > + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
>
> There is an exception at the end, which SPDX doesn't know about. I think
> we should specify this as "GPL-3.0-or-later WITH unknown-exception" to
> distinguish it from the plain GPL-3.0.
This "unknown-exception" seems to be OpenSSL, so we get:
OPENFORTIVPN_LICENSE := GPL-3.0-or-later AND OpenSSL
> > + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
>
> Also there is LICENSE.OpenSSL, is this used anywhere?
Yes, I overlooked its use in two files: tunnel.c and openssl_hostname_validation.c
which is ifdefed out. What about:
OPENFORTIVPN_LICENSE_FILES := \
file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
One more question before v2: package is lacking configure script and autogen.sh
is expected to be run. I solved this creating empty patch directory with symlink.
Any other preferred solution?
ladis
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-24 8:22 ` Ladislav Michl
@ 2020-08-24 9:05 ` Roland Hieber
2020-08-24 9:14 ` Roland Hieber
` (2 more replies)
0 siblings, 3 replies; 29+ messages in thread
From: Roland Hieber @ 2020-08-24 9:05 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
On Mon, Aug 24, 2020 at 10:22:13AM +0200, Ladislav Michl wrote:
> On Sun, Aug 23, 2020 at 09:56:31PM +0200, Roland Hieber wrote:
> > On Sun, Aug 23, 2020 at 03:43:16PM +0200, Ladislav Michl wrote:
> > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> > > ---
> > > patches/openfortivpn-1.14.1/autogen.sh | 1 +
> > > rules/openfortivpn.in | 25 +++++++++
> > > rules/openfortivpn.make | 72 ++++++++++++++++++++++++++
> > > 3 files changed, 98 insertions(+)
> > > create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
> > > create mode 100644 rules/openfortivpn.in
> > > create mode 100644 rules/openfortivpn.make
> > >
> > > diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> > > new file mode 120000
> > > index 000000000..9f8a4cb7d
> > > --- /dev/null
> > > +++ b/patches/openfortivpn-1.14.1/autogen.sh
> > > @@ -0,0 +1 @@
> > > +../autogen.sh
> > > \ No newline at end of file
> > > diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> > > new file mode 100644
> > > index 000000000..e18643322
> > > --- /dev/null
> > > +++ b/rules/openfortivpn.in
> > > @@ -0,0 +1,25 @@
> > > +## SECTION=networking
> > > +
> > > +menuconfig OPENFORTIVPN
> > > + tristate
> > > + prompt "openfortivpn "
> > > + select LIBC_PTHREAD
> > > + select LIBC_UTIL
> > > + select OPENSSL
> > > + select PPP
> > > + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> > > + help
> > > + openfortivpn is a client for PPP+SSL VPN tunnel services.
> > > + It spawns a pppd process and operates the communication between
> > > + the gateway and this process.
> > > +
> > > + It is compatible with Fortinet VPNs.
> > > +
> > > +if OPENFORTIVPN
> > > +
> > > +config OPENFORTIVPN_SYSTEMD
> > > + bool
> > > + default INITMETHOD_SYSTEMD
> > > +
> > > +endif
> > > +
> > > diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> > > new file mode 100644
> > > index 000000000..4fb6c6e62
> > > --- /dev/null
> > > +++ b/rules/openfortivpn.make
> > > @@ -0,0 +1,72 @@
> > > +# -*-makefile-*-
> > > +#
> > > +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> > > +#
> > > +# For further information about the PTXdist project and license conditions
> > > +# see the README file.
> > > +#
> > > +
> > > +#
> > > +# We provide this package
> > > +#
> > > +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> > > +
> > > +#
> > > +# Paths and names
> > > +#
> > > +OPENFORTIVPN_VERSION := 1.14.1
> > > +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> > > +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> > > +OPENFORTIVPN_SUFFIX := tar.gz
> > > +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> > > +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> > > +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> > > +OPENFORTIVPN_LICENSE := GPL-3.0-or-later
> > > +OPENFORTIVPN_LICENSE_FILES := \
> > > + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> >
> > There is an exception at the end, which SPDX doesn't know about. I think
> > we should specify this as "GPL-3.0-or-later WITH unknown-exception" to
> > distinguish it from the plain GPL-3.0.
>
> This "unknown-exception" seems to be OpenSSL, so we get:
> OPENFORTIVPN_LICENSE := GPL-3.0-or-later AND OpenSSL
I meant the exception at the end of LICENSE:
| Exception
|
| In addition, as a special exception, the copyright holders give permission
| to link the code of portions of this program with the OpenSSL library under
| certain conditions as described in each individual source file, and distribute
| linked combinations including the two.
| You must obey the GNU General Public License in all respects for all of the
| code used other than OpenSSL. If you modify file(s) with this exception, you
| may extend this exception to your version of the file(s), but you are not
| obligated to do so. If you do not wish to do so, delete this exception
| statement from your version. If you delete this exception statement from all
| source files in the program, then also delete it here.
This is not part of the GPL-3.0 license text, and the OpenSSL text is
different: <https://spdx.org/licenses/OpenSSL>
Putting "GPL-3.0-or-later AND OpenSSL" in SPDX syntax would mean that
there is code under GPL, and code under OpenSSL, which when linked
together would create an undistributable binary because the two licenses
are not compatible. But the exception here clearly allows this use case.
So I would classify it as an exception to the GPL-3.0, but since there
is no SPDX identifier for that exact wording yet, we can use "WITH
unknown-exception" as a placeholder, so any users who need to collect
licensing information will stumble upon it and are forced to investigate
further.
> > > + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
> >
> > Also there is LICENSE.OpenSSL, is this used anywhere?
>
> Yes, I overlooked its use in two files: tunnel.c and openssl_hostname_validation.c
> which is ifdefed out. What about:
> OPENFORTIVPN_LICENSE_FILES := \
> file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
> file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
> file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
Yes, this looks good to me.
> One more question before v2: package is lacking configure script and autogen.sh
> is expected to be run. I solved this creating empty patch directory with symlink.
> Any other preferred solution?
The autogen.sh symlink is fine. This just happens when the distributed
tarballs are created automatically by git-archive. I didn't see any
other official tarballs either.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-24 9:05 ` Roland Hieber
@ 2020-08-24 9:14 ` Roland Hieber
2020-08-24 10:08 ` Ladislav Michl
2020-08-25 7:40 ` [ptxdist] [PATCH v2 " Ladislav Michl
2 siblings, 0 replies; 29+ messages in thread
From: Roland Hieber @ 2020-08-24 9:14 UTC (permalink / raw)
To: ptxdist
On Mon, Aug 24, 2020 at 11:05:20AM +0200, Roland Hieber wrote:
> On Mon, Aug 24, 2020 at 10:22:13AM +0200, Ladislav Michl wrote:
> So I would classify it as an exception to the GPL-3.0, but since there
> is no SPDX identifier for that exact wording yet, we can use "WITH
> unknown-exception" as a placeholder, so any users who need to collect
> licensing information will stumble upon it and are forced to investigate
> further.
As a side note: the "true" SPDX way to express this would be to create a
separate SPDX document for the unknown exception, and with that document
assign a local identifier to it, like "LicenseRef-openfortivpn-OpenSSL-
exception". Then the full license identifier can be "OpenSSL AND
"GPL-3.0-or-later WITH LicenseRef-openfortivpn-OpenSSL-exception". But
we have no way of representing this workflow in PTXdist, since we're
only using the already existing SPDX license identifiers.
For background info, there was some discussion about this in
<https://github.com/spdx/license-list-XML/issues/939>.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-24 9:05 ` Roland Hieber
2020-08-24 9:14 ` Roland Hieber
@ 2020-08-24 10:08 ` Ladislav Michl
2020-08-24 15:35 ` Roland Hieber
2020-08-25 7:40 ` [ptxdist] [PATCH v2 " Ladislav Michl
2 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-24 10:08 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
On Mon, Aug 24, 2020 at 11:05:20AM +0200, Roland Hieber wrote:
> On Mon, Aug 24, 2020 at 10:22:13AM +0200, Ladislav Michl wrote:
[...]
> > This "unknown-exception" seems to be OpenSSL, so we get:
> > OPENFORTIVPN_LICENSE := GPL-3.0-or-later AND OpenSSL
>
> I meant the exception at the end of LICENSE:
>
> | Exception
> |
> | In addition, as a special exception, the copyright holders give permission
> | to link the code of portions of this program with the OpenSSL library under
> | certain conditions as described in each individual source file, and distribute
> | linked combinations including the two.
> | You must obey the GNU General Public License in all respects for all of the
> | code used other than OpenSSL. If you modify file(s) with this exception, you
> | may extend this exception to your version of the file(s), but you are not
> | obligated to do so. If you do not wish to do so, delete this exception
> | statement from your version. If you delete this exception statement from all
> | source files in the program, then also delete it here.
>
> This is not part of the GPL-3.0 license text, and the OpenSSL text is
> different: <https://spdx.org/licenses/OpenSSL>
>
> Putting "GPL-3.0-or-later AND OpenSSL" in SPDX syntax would mean that
> there is code under GPL, and code under OpenSSL, which when linked
> together would create an undistributable binary because the two licenses
> are not compatible. But the exception here clearly allows this use case.
> So I would classify it as an exception to the GPL-3.0, but since there
> is no SPDX identifier for that exact wording yet, we can use "WITH
> unknown-exception" as a placeholder, so any users who need to collect
> licensing information will stumble upon it and are forced to investigate
> further.
Ah, seems you already take an effort to solve this :)
https://github.com/spdx/license-list-XML/issues/939
Ready to send v2 "WITH unknown-exception", either separately or as whole
serie resend - I'll wait a bit more for eventual comments to show up.
> > > > + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
> > >
> > > Also there is LICENSE.OpenSSL, is this used anywhere?
> >
> > Yes, I overlooked its use in two files: tunnel.c and openssl_hostname_validation.c
> > which is ifdefed out. What about:
> > OPENFORTIVPN_LICENSE_FILES := \
> > file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> > file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
> > file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
> > file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
>
> Yes, this looks good to me.
>
> > One more question before v2: package is lacking configure script and autogen.sh
> > is expected to be run. I solved this creating empty patch directory with symlink.
> > Any other preferred solution?
>
> The autogen.sh symlink is fine. This just happens when the distributed
> tarballs are created automatically by git-archive. I didn't see any
> other official tarballs either.
>
> - Roland
>
> --
> Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-24 10:08 ` Ladislav Michl
@ 2020-08-24 15:35 ` Roland Hieber
0 siblings, 0 replies; 29+ messages in thread
From: Roland Hieber @ 2020-08-24 15:35 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
On Mon, Aug 24, 2020 at 12:08:14PM +0200, Ladislav Michl wrote:
> On Mon, Aug 24, 2020 at 11:05:20AM +0200, Roland Hieber wrote:
> > On Mon, Aug 24, 2020 at 10:22:13AM +0200, Ladislav Michl wrote:
> [...]
> > > This "unknown-exception" seems to be OpenSSL, so we get:
> > > OPENFORTIVPN_LICENSE := GPL-3.0-or-later AND OpenSSL
> >
> > I meant the exception at the end of LICENSE:
> >
> > | Exception
> > |
> > | In addition, as a special exception, the copyright holders give permission
> > | to link the code of portions of this program with the OpenSSL library under
> > | certain conditions as described in each individual source file, and distribute
> > | linked combinations including the two.
> > | You must obey the GNU General Public License in all respects for all of the
> > | code used other than OpenSSL. If you modify file(s) with this exception, you
> > | may extend this exception to your version of the file(s), but you are not
> > | obligated to do so. If you do not wish to do so, delete this exception
> > | statement from your version. If you delete this exception statement from all
> > | source files in the program, then also delete it here.
> >
> > This is not part of the GPL-3.0 license text, and the OpenSSL text is
> > different: <https://spdx.org/licenses/OpenSSL>
> >
> > Putting "GPL-3.0-or-later AND OpenSSL" in SPDX syntax would mean that
> > there is code under GPL, and code under OpenSSL, which when linked
> > together would create an undistributable binary because the two licenses
> > are not compatible. But the exception here clearly allows this use case.
> > So I would classify it as an exception to the GPL-3.0, but since there
> > is no SPDX identifier for that exact wording yet, we can use "WITH
> > unknown-exception" as a placeholder, so any users who need to collect
> > licensing information will stumble upon it and are forced to investigate
> > further.
>
> Ah, seems you already take an effort to solve this :)
> https://github.com/spdx/license-list-XML/issues/939
No, this issue was about two different exceptions. SPDX is not very
inclined to add licenses or exceptions whose wording is only used in one
single project...
- Roland
> Ready to send v2 "WITH unknown-exception", either separately or as whole
> serie resend - I'll wait a bit more for eventual comments to show up.
>
> > > > > + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
> > > >
> > > > Also there is LICENSE.OpenSSL, is this used anywhere?
> > >
> > > Yes, I overlooked its use in two files: tunnel.c and openssl_hostname_validation.c
> > > which is ifdefed out. What about:
> > > OPENFORTIVPN_LICENSE_FILES := \
> > > file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> > > file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
> > > file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
> > > file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
> >
> > Yes, this looks good to me.
> >
> > > One more question before v2: package is lacking configure script and autogen.sh
> > > is expected to be run. I solved this creating empty patch directory with symlink.
> > > Any other preferred solution?
> >
> > The autogen.sh symlink is fine. This just happens when the distributed
> > tarballs are created automatically by git-archive. I didn't see any
> > other official tarballs either.
> >
> > - Roland
> >
> > --
> > Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
> > Steuerwalder Str. 21 | https://www.pengutronix.de/ |
> > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH v2 6/7] openfortivpn: new package
2020-08-24 9:05 ` Roland Hieber
2020-08-24 9:14 ` Roland Hieber
2020-08-24 10:08 ` Ladislav Michl
@ 2020-08-25 7:40 ` Ladislav Michl
2020-08-25 11:04 ` Roland Hieber
2 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-25 7:40 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v2: fix license issue
patches/openfortivpn-1.14.1/autogen.sh | 1 +
rules/openfortivpn.in | 25 +++++++++
rules/openfortivpn.make | 74 ++++++++++++++++++++++++++
3 files changed, 100 insertions(+)
create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
create mode 100644 rules/openfortivpn.in
create mode 100644 rules/openfortivpn.make
diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/openfortivpn-1.14.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
new file mode 100644
index 000000000..e18643322
--- /dev/null
+++ b/rules/openfortivpn.in
@@ -0,0 +1,25 @@
+## SECTION=networking
+
+menuconfig OPENFORTIVPN
+ tristate
+ prompt "openfortivpn "
+ select LIBC_PTHREAD
+ select LIBC_UTIL
+ select OPENSSL
+ select PPP
+ select SYSTEMD if OPENFORTIVPN_SYSTEMD
+ help
+ openfortivpn is a client for PPP+SSL VPN tunnel services.
+ It spawns a pppd process and operates the communication between
+ the gateway and this process.
+
+ It is compatible with Fortinet VPNs.
+
+if OPENFORTIVPN
+
+config OPENFORTIVPN_SYSTEMD
+ bool
+ default INITMETHOD_SYSTEMD
+
+endif
+
diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
new file mode 100644
index 000000000..22a0d25ce
--- /dev/null
+++ b/rules/openfortivpn.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
+
+#
+# Paths and names
+#
+OPENFORTIVPN_VERSION := 1.14.1
+OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
+OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
+OPENFORTIVPN_SUFFIX := tar.gz
+OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
+OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception
+OPENFORTIVPN_LICENSE_FILES := \
+ file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
+ file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
+ file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
+ file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+OPENFORTIVPN_CONF_TOOL := autoconf
+OPENFORTIVPN_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-proc \
+ --enable-resolvconf \
+ --with-rt_dst \
+ --without-ppp \
+ --with-pppd=/usr/sbin/pppd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/openfortivpn.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, openfortivpn)
+ @$(call install_fixup, openfortivpn,PRIORITY,optional)
+ @$(call install_fixup, openfortivpn,SECTION,base)
+ @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
+ @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
+
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
+
+ @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
+
+ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, \
+ usr/lib/systemd/system/openfortivpn@.service)
+endif
+
+ @$(call install_finish, openfortivpn)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH v2 6/7] openfortivpn: new package
2020-08-25 7:40 ` [ptxdist] [PATCH v2 " Ladislav Michl
@ 2020-08-25 11:04 ` Roland Hieber
2020-08-25 13:14 ` [ptxdist] [PATCH v3 " Ladislav Michl
0 siblings, 1 reply; 29+ messages in thread
From: Roland Hieber @ 2020-08-25 11:04 UTC (permalink / raw)
To: Ladislav Michl; +Cc: ptxdist
On Tue, Aug 25, 2020 at 09:40:02AM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> CHANGES:
> -v2: fix license issue
>
> patches/openfortivpn-1.14.1/autogen.sh | 1 +
> rules/openfortivpn.in | 25 +++++++++
> rules/openfortivpn.make | 74 ++++++++++++++++++++++++++
> 3 files changed, 100 insertions(+)
> create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
> create mode 100644 rules/openfortivpn.in
> create mode 100644 rules/openfortivpn.make
>
> diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> new file mode 120000
> index 000000000..9f8a4cb7d
> --- /dev/null
> +++ b/patches/openfortivpn-1.14.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> new file mode 100644
> index 000000000..e18643322
> --- /dev/null
> +++ b/rules/openfortivpn.in
> @@ -0,0 +1,25 @@
> +## SECTION=networking
> +
> +menuconfig OPENFORTIVPN
> + tristate
> + prompt "openfortivpn "
> + select LIBC_PTHREAD
> + select LIBC_UTIL
> + select OPENSSL
> + select PPP
> + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> + help
> + openfortivpn is a client for PPP+SSL VPN tunnel services.
> + It spawns a pppd process and operates the communication between
> + the gateway and this process.
> +
> + It is compatible with Fortinet VPNs.
> +
> +if OPENFORTIVPN
> +
> +config OPENFORTIVPN_SYSTEMD
> + bool
> + default INITMETHOD_SYSTEMD
> +
> +endif
> +
> diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> new file mode 100644
> index 000000000..22a0d25ce
> --- /dev/null
> +++ b/rules/openfortivpn.make
> @@ -0,0 +1,74 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> +
> +#
> +# Paths and names
> +#
> +OPENFORTIVPN_VERSION := 1.14.1
> +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> +OPENFORTIVPN_SUFFIX := tar.gz
> +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> +OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception
> +OPENFORTIVPN_LICENSE_FILES := \
> + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> + file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
> + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
> + file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
Sorry, I was not clear enough on this one. There is still code under
OpenSSL license, so:
OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception AND OpenSSL
- Roland
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +OPENFORTIVPN_CONF_TOOL := autoconf
> +OPENFORTIVPN_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-resolvconf \
> + --with-rt_dst \
> + --without-ppp \
> + --with-pppd=/usr/sbin/pppd \
> + --with-systemdsystemunitdir=/usr/lib/systemd/system
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/openfortivpn.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, openfortivpn)
> + @$(call install_fixup, openfortivpn,PRIORITY,optional)
> + @$(call install_fixup, openfortivpn,SECTION,base)
> + @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> + @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
> +
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
> +
> + @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
> +
> +ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, \
> + usr/lib/systemd/system/openfortivpn@.service)
> +endif
> +
> + @$(call install_finish, openfortivpn)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.28.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH v3 6/7] openfortivpn: new package
2020-08-25 11:04 ` Roland Hieber
@ 2020-08-25 13:14 ` Ladislav Michl
0 siblings, 0 replies; 29+ messages in thread
From: Ladislav Michl @ 2020-08-25 13:14 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v2: fix license issue
-v3: fix yet another license issue
patches/openfortivpn-1.14.1/autogen.sh | 1 +
rules/openfortivpn.in | 25 +++++++++
rules/openfortivpn.make | 74 ++++++++++++++++++++++++++
3 files changed, 100 insertions(+)
create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
create mode 100644 rules/openfortivpn.in
create mode 100644 rules/openfortivpn.make
diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/openfortivpn-1.14.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
new file mode 100644
index 000000000..e18643322
--- /dev/null
+++ b/rules/openfortivpn.in
@@ -0,0 +1,25 @@
+## SECTION=networking
+
+menuconfig OPENFORTIVPN
+ tristate
+ prompt "openfortivpn "
+ select LIBC_PTHREAD
+ select LIBC_UTIL
+ select OPENSSL
+ select PPP
+ select SYSTEMD if OPENFORTIVPN_SYSTEMD
+ help
+ openfortivpn is a client for PPP+SSL VPN tunnel services.
+ It spawns a pppd process and operates the communication between
+ the gateway and this process.
+
+ It is compatible with Fortinet VPNs.
+
+if OPENFORTIVPN
+
+config OPENFORTIVPN_SYSTEMD
+ bool
+ default INITMETHOD_SYSTEMD
+
+endif
+
diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
new file mode 100644
index 000000000..8bf9367b6
--- /dev/null
+++ b/rules/openfortivpn.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
+
+#
+# Paths and names
+#
+OPENFORTIVPN_VERSION := 1.14.1
+OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
+OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
+OPENFORTIVPN_SUFFIX := tar.gz
+OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
+OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception AND OpenSSL
+OPENFORTIVPN_LICENSE_FILES := \
+ file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
+ file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
+ file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
+ file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+OPENFORTIVPN_CONF_TOOL := autoconf
+OPENFORTIVPN_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-proc \
+ --enable-resolvconf \
+ --with-rt_dst \
+ --without-ppp \
+ --with-pppd=/usr/sbin/pppd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/openfortivpn.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, openfortivpn)
+ @$(call install_fixup, openfortivpn,PRIORITY,optional)
+ @$(call install_fixup, openfortivpn,SECTION,base)
+ @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
+ @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
+
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
+
+ @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
+
+ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, \
+ usr/lib/systemd/system/openfortivpn@.service)
+endif
+
+ @$(call install_finish, openfortivpn)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [PATCH 6/7] openfortivpn: new package
2020-08-23 13:43 ` [ptxdist] [PATCH 6/7] openfortivpn: new package Ladislav Michl
2020-08-23 19:56 ` Roland Hieber
@ 2020-08-28 12:45 ` Michael Olbrich
2020-08-28 14:57 ` [ptxdist] [PATCH v4 " Ladislav Michl
1 sibling, 1 reply; 29+ messages in thread
From: Michael Olbrich @ 2020-08-28 12:45 UTC (permalink / raw)
To: ptxdist
On Sun, Aug 23, 2020 at 03:43:16PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
> patches/openfortivpn-1.14.1/autogen.sh | 1 +
> rules/openfortivpn.in | 25 +++++++++
> rules/openfortivpn.make | 72 ++++++++++++++++++++++++++
> 3 files changed, 98 insertions(+)
> create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
> create mode 100644 rules/openfortivpn.in
> create mode 100644 rules/openfortivpn.make
>
> diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> new file mode 120000
> index 000000000..9f8a4cb7d
> --- /dev/null
> +++ b/patches/openfortivpn-1.14.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> new file mode 100644
> index 000000000..e18643322
> --- /dev/null
> +++ b/rules/openfortivpn.in
> @@ -0,0 +1,25 @@
> +## SECTION=networking
> +
> +menuconfig OPENFORTIVPN
> + tristate
> + prompt "openfortivpn "
> + select LIBC_PTHREAD
> + select LIBC_UTIL
> + select OPENSSL
> + select PPP
> + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> + help
> + openfortivpn is a client for PPP+SSL VPN tunnel services.
> + It spawns a pppd process and operates the communication between
> + the gateway and this process.
> +
> + It is compatible with Fortinet VPNs.
> +
> +if OPENFORTIVPN
> +
> +config OPENFORTIVPN_SYSTEMD
> + bool
> + default INITMETHOD_SYSTEMD
> +
> +endif
> +
> diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> new file mode 100644
> index 000000000..4fb6c6e62
> --- /dev/null
> +++ b/rules/openfortivpn.make
> @@ -0,0 +1,72 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> +
> +#
> +# Paths and names
> +#
> +OPENFORTIVPN_VERSION := 1.14.1
> +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> +OPENFORTIVPN_SUFFIX := tar.gz
> +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> +OPENFORTIVPN_LICENSE := GPL-3.0-or-later
> +OPENFORTIVPN_LICENSE_FILES := \
> + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +OPENFORTIVPN_CONF_TOOL := autoconf
> +OPENFORTIVPN_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-resolvconf \
> + --with-rt_dst \
> + --without-ppp \
> + --with-pppd=/usr/sbin/pppd \
> + --with-systemdsystemunitdir=/usr/lib/systemd/system
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/openfortivpn.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, openfortivpn)
> + @$(call install_fixup, openfortivpn,PRIORITY,optional)
> + @$(call install_fixup, openfortivpn,SECTION,base)
> + @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> + @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
> +
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
> +
> + @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
> +
> +ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, \
> + usr/lib/systemd/system/openfortivpn@.service)
/usr/lib/systemd/system/openfortivpn@.service)
Michael
> +endif
> +
> + @$(call install_finish, openfortivpn)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
> --
> 2.28.0
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH v4 6/7] openfortivpn: new package
2020-08-28 12:45 ` [ptxdist] [PATCH " Michael Olbrich
@ 2020-08-28 14:57 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-28 14:57 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
CHANGES:
-v2: fix license issue
-v3: fix yet another license issue
-v4: fix missing leading slash in install path
patches/openfortivpn-1.14.1/autogen.sh | 1 +
rules/openfortivpn.in | 25 +++++++++
rules/openfortivpn.make | 74 ++++++++++++++++++++++++++
3 files changed, 100 insertions(+)
create mode 120000 patches/openfortivpn-1.14.1/autogen.sh
create mode 100644 rules/openfortivpn.in
create mode 100644 rules/openfortivpn.make
diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
new file mode 120000
index 000000000..9f8a4cb7d
--- /dev/null
+++ b/patches/openfortivpn-1.14.1/autogen.sh
@@ -0,0 +1 @@
+../autogen.sh
\ No newline at end of file
diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
new file mode 100644
index 000000000..e18643322
--- /dev/null
+++ b/rules/openfortivpn.in
@@ -0,0 +1,25 @@
+## SECTION=networking
+
+menuconfig OPENFORTIVPN
+ tristate
+ prompt "openfortivpn "
+ select LIBC_PTHREAD
+ select LIBC_UTIL
+ select OPENSSL
+ select PPP
+ select SYSTEMD if OPENFORTIVPN_SYSTEMD
+ help
+ openfortivpn is a client for PPP+SSL VPN tunnel services.
+ It spawns a pppd process and operates the communication between
+ the gateway and this process.
+
+ It is compatible with Fortinet VPNs.
+
+if OPENFORTIVPN
+
+config OPENFORTIVPN_SYSTEMD
+ bool
+ default INITMETHOD_SYSTEMD
+
+endif
+
diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
new file mode 100644
index 000000000..74e32ad50
--- /dev/null
+++ b/rules/openfortivpn.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
+
+#
+# Paths and names
+#
+OPENFORTIVPN_VERSION := 1.14.1
+OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
+OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
+OPENFORTIVPN_SUFFIX := tar.gz
+OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
+OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
+OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception AND OpenSSL
+OPENFORTIVPN_LICENSE_FILES := \
+ file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
+ file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
+ file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
+ file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+OPENFORTIVPN_CONF_TOOL := autoconf
+OPENFORTIVPN_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-proc \
+ --enable-resolvconf \
+ --with-rt_dst \
+ --without-ppp \
+ --with-pppd=/usr/sbin/pppd \
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/openfortivpn.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, openfortivpn)
+ @$(call install_fixup, openfortivpn,PRIORITY,optional)
+ @$(call install_fixup, openfortivpn,SECTION,base)
+ @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
+ @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
+
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
+
+ @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
+
+ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
+ @$(call install_alternative, openfortivpn, 0, 0, 0644, \
+ /usr/lib/systemd/system/openfortivpn@.service)
+endif
+
+ @$(call install_finish, openfortivpn)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [ptxdist] [APPLIED] openfortivpn: new package
2020-08-28 14:57 ` [ptxdist] [PATCH v4 " Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as dcda8ac7996e6aa2dfda6f5aa563bbc875b72ba3.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:23 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200828145745.GA9815@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/openfortivpn-1.14.1/autogen.sh b/patches/openfortivpn-1.14.1/autogen.sh
> new file mode 120000
> index 000000000000..9f8a4cb7ddcb
> --- /dev/null
> +++ b/patches/openfortivpn-1.14.1/autogen.sh
> @@ -0,0 +1 @@
> +../autogen.sh
> \ No newline at end of file
> diff --git a/rules/openfortivpn.in b/rules/openfortivpn.in
> new file mode 100644
> index 000000000000..e18643322982
> --- /dev/null
> +++ b/rules/openfortivpn.in
> @@ -0,0 +1,25 @@
> +## SECTION=networking
> +
> +menuconfig OPENFORTIVPN
> + tristate
> + prompt "openfortivpn "
> + select LIBC_PTHREAD
> + select LIBC_UTIL
> + select OPENSSL
> + select PPP
> + select SYSTEMD if OPENFORTIVPN_SYSTEMD
> + help
> + openfortivpn is a client for PPP+SSL VPN tunnel services.
> + It spawns a pppd process and operates the communication between
> + the gateway and this process.
> +
> + It is compatible with Fortinet VPNs.
> +
> +if OPENFORTIVPN
> +
> +config OPENFORTIVPN_SYSTEMD
> + bool
> + default INITMETHOD_SYSTEMD
> +
> +endif
> +
> diff --git a/rules/openfortivpn.make b/rules/openfortivpn.make
> new file mode 100644
> index 000000000000..74e32ad5029a
> --- /dev/null
> +++ b/rules/openfortivpn.make
> @@ -0,0 +1,74 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_OPENFORTIVPN) += openfortivpn
> +
> +#
> +# Paths and names
> +#
> +OPENFORTIVPN_VERSION := 1.14.1
> +OPENFORTIVPN_MD5 := 226472c18f0331491b42b4300e8bff7c
> +OPENFORTIVPN := openfortivpn-$(OPENFORTIVPN_VERSION)
> +OPENFORTIVPN_SUFFIX := tar.gz
> +OPENFORTIVPN_URL := https://github.com/adrienverge/openfortivpn/archive/v$(OPENFORTIVPN_VERSION).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_SOURCE := $(SRCDIR)/$(OPENFORTIVPN).$(OPENFORTIVPN_SUFFIX)
> +OPENFORTIVPN_DIR := $(BUILDDIR)/$(OPENFORTIVPN)
> +OPENFORTIVPN_LICENSE := GPL-3.0-or-later WITH unknown-exception AND OpenSSL
> +OPENFORTIVPN_LICENSE_FILES := \
> + file://LICENSE;md5=1d58d8f3da4c52035c4ad376ffabb44a \
> + file://LICENSE.OpenSSL;md5=f3317a38a556060e468331158cc43fe3 \
> + file://src/main.c;startline=4;endline=15;md5=2d74bd9c818c4c3009c1c8782aaa23e7 \
> + file://src/tunnel.c;startline=4;endline=26;md5=5454796bf6fd04c7e4ad6bd83a627e4f
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +OPENFORTIVPN_CONF_TOOL := autoconf
> +OPENFORTIVPN_CONF_OPT := \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-proc \
> + --enable-resolvconf \
> + --with-rt_dst \
> + --without-ppp \
> + --with-pppd=/usr/sbin/pppd \
> + --with-systemdsystemunitdir=/usr/lib/systemd/system
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/openfortivpn.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, openfortivpn)
> + @$(call install_fixup, openfortivpn,PRIORITY,optional)
> + @$(call install_fixup, openfortivpn,SECTION,base)
> + @$(call install_fixup, openfortivpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> + @$(call install_fixup, openfortivpn,DESCRIPTION,"Client for PPP+SSL VPN tunnel")
> +
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, /etc/openfortivpn/config)
> +
> + @$(call install_copy, openfortivpn, 0, 0, 0755, -, /usr/bin/openfortivpn)
> +
> +ifdef PTXCONF_OPENFORTIVPN_SYSTEMD
> + @$(call install_alternative, openfortivpn, 0, 0, 0644, \
> + /usr/lib/systemd/system/openfortivpn@.service)
> +endif
> +
> + @$(call install_finish, openfortivpn)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread
* [ptxdist] [PATCH 7/7] networkmanager-fortisslvpn: new package
2020-08-23 13:40 [ptxdist] [PATCH 0/7] NetworkManager stack update Ladislav Michl
` (5 preceding siblings ...)
2020-08-23 13:43 ` [ptxdist] [PATCH 6/7] openfortivpn: new package Ladislav Michl
@ 2020-08-23 13:43 ` Ladislav Michl
2020-10-06 8:18 ` [ptxdist] [APPLIED] " Michael Olbrich
6 siblings, 1 reply; 29+ messages in thread
From: Ladislav Michl @ 2020-08-23 13:43 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
rules/networkmanager-fortisslvpn.in | 9 ++++
rules/networkmanager-fortisslvpn.make | 74 +++++++++++++++++++++++++++
2 files changed, 83 insertions(+)
create mode 100644 rules/networkmanager-fortisslvpn.in
create mode 100644 rules/networkmanager-fortisslvpn.make
diff --git a/rules/networkmanager-fortisslvpn.in b/rules/networkmanager-fortisslvpn.in
new file mode 100644
index 000000000..dc546b5d6
--- /dev/null
+++ b/rules/networkmanager-fortisslvpn.in
@@ -0,0 +1,9 @@
+## SECTION=networkmanager_plugins
+
+config NETWORKMANAGER_FORTISSLVPN
+ tristate
+ select GLIB
+ select NETWORKMANAGER
+ select NETWORKMANAGER_PPP
+ select OPENFORTIVPN
+ prompt "fortisslvpn"
diff --git a/rules/networkmanager-fortisslvpn.make b/rules/networkmanager-fortisslvpn.make
new file mode 100644
index 000000000..e5f538f3c
--- /dev/null
+++ b/rules/networkmanager-fortisslvpn.make
@@ -0,0 +1,74 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NETWORKMANAGER_FORTISSLVPN) += networkmanager-fortisslvpn
+
+#
+# Paths and names
+#
+NETWORKMANAGER_FORTISSLVPN_VERSION := 1.2.10
+NETWORKMANAGER_FORTISSLVPN_MD5 := 4a4bc3aae826623620c2090753a7acee
+NETWORKMANAGER_FORTISSLVPN := NetworkManager-fortisslvpn-$(NETWORKMANAGER_FORTISSLVPN_VERSION)
+NETWORKMANAGER_FORTISSLVPN_SUFFIX := tar.xz
+NETWORKMANAGER_FORTISSLVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-fortisslvpn/$(basename $(NETWORKMANAGER_FORTISSLVPN_VERSION))/$(NETWORKMANAGER_FORTISSLVPN).$(NETWORKMANAGER_FORTISSLVPN_SUFFIX)
+NETWORKMANAGER_FORTISSLVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_FORTISSLVPN).$(NETWORKMANAGER_FORTISSLVPN_SUFFIX)
+NETWORKMANAGER_FORTISSLVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_FORTISSLVPN)
+NETWORKMANAGER_FORTISSLVPN_LICENSE := GPL-2.0-or-later
+NETWORKMANAGER_FORTISSLVPN_LICENSE_FILES := \
+ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+ file://src/nm-fortisslvpn-service.c;startline=6;endline=18;md5=dc133184bee887456e34cd179e2e9549
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+#
+# autoconf
+#
+NETWORKMANAGER_FORTISSLVPN_CONF_TOOL := autoconf
+NETWORKMANAGER_FORTISSLVPN_CONF_OPT = \
+ $(CROSS_AUTOCONF_USR) \
+ --enable-shared \
+ --disable-static \
+ --disable-absolute-paths \
+ --disable-nls \
+ --disable-rpath \
+ --disable-more-warnings \
+ --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH) \
+ --without-gnome \
+ --without-libnm-glib
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/networkmanager-fortisslvpn.targetinstall:
+ @$(call targetinfo)
+
+ @$(call install_init, networkmanager-fortisslvpn)
+ @$(call install_fixup, networkmanager-fortisslvpn,PRIORITY,optional)
+ @$(call install_fixup, networkmanager-fortisslvpn,SECTION,base)
+ @$(call install_fixup, networkmanager-fortisslvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
+ @$(call install_fixup, networkmanager-fortisslvpn,DESCRIPTION, "networkmanager-fortisslvpn")
+
+ @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
+ $(PPP_SHARED_INST_PATH)/nm-fortisslvpn-pppd-plugin.so)
+ @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/libnm-vpn-plugin-fortisslvpn.so)
+ @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
+ /usr/lib/NetworkManager/VPN/nm-fortisslvpn-service.name)
+ @$(call install_tree, networkmanager-fortisslvpn, 0, 0, -, /usr/libexec)
+
+ @$(call install_finish, networkmanager-fortisslvpn)
+
+ @$(call touch)
+
+# vim: syntax=make
--
2.28.0
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [ptxdist] [APPLIED] networkmanager-fortisslvpn: new package
2020-08-23 13:43 ` [ptxdist] [PATCH 7/7] networkmanager-fortisslvpn: " Ladislav Michl
@ 2020-10-06 8:18 ` Michael Olbrich
0 siblings, 0 replies; 29+ messages in thread
From: Michael Olbrich @ 2020-10-06 8:18 UTC (permalink / raw)
To: ptxdist
Thanks, applied as c5bcc8a29223ff6ccb7c95f6d6c11b48d4498395.
Michael
[sent from post-receive hook]
On Tue, 06 Oct 2020 10:18:24 +0200, Ladislav Michl <ladis@linux-mips.org> wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <20200823134356.GH482575@lenoch>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/networkmanager-fortisslvpn.in b/rules/networkmanager-fortisslvpn.in
> new file mode 100644
> index 000000000000..dc546b5d65bf
> --- /dev/null
> +++ b/rules/networkmanager-fortisslvpn.in
> @@ -0,0 +1,9 @@
> +## SECTION=networkmanager_plugins
> +
> +config NETWORKMANAGER_FORTISSLVPN
> + tristate
> + select GLIB
> + select NETWORKMANAGER
> + select NETWORKMANAGER_PPP
> + select OPENFORTIVPN
> + prompt "fortisslvpn"
> diff --git a/rules/networkmanager-fortisslvpn.make b/rules/networkmanager-fortisslvpn.make
> new file mode 100644
> index 000000000000..e5f538f3c3f8
> --- /dev/null
> +++ b/rules/networkmanager-fortisslvpn.make
> @@ -0,0 +1,74 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2020 by Ladislav Michl <ladis@linux-mips.org>
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_NETWORKMANAGER_FORTISSLVPN) += networkmanager-fortisslvpn
> +
> +#
> +# Paths and names
> +#
> +NETWORKMANAGER_FORTISSLVPN_VERSION := 1.2.10
> +NETWORKMANAGER_FORTISSLVPN_MD5 := 4a4bc3aae826623620c2090753a7acee
> +NETWORKMANAGER_FORTISSLVPN := NetworkManager-fortisslvpn-$(NETWORKMANAGER_FORTISSLVPN_VERSION)
> +NETWORKMANAGER_FORTISSLVPN_SUFFIX := tar.xz
> +NETWORKMANAGER_FORTISSLVPN_URL := https://ftp.gnome.org/pub/GNOME/sources/NetworkManager-fortisslvpn/$(basename $(NETWORKMANAGER_FORTISSLVPN_VERSION))/$(NETWORKMANAGER_FORTISSLVPN).$(NETWORKMANAGER_FORTISSLVPN_SUFFIX)
> +NETWORKMANAGER_FORTISSLVPN_SOURCE := $(SRCDIR)/$(NETWORKMANAGER_FORTISSLVPN).$(NETWORKMANAGER_FORTISSLVPN_SUFFIX)
> +NETWORKMANAGER_FORTISSLVPN_DIR := $(BUILDDIR)/$(NETWORKMANAGER_FORTISSLVPN)
> +NETWORKMANAGER_FORTISSLVPN_LICENSE := GPL-2.0-or-later
> +NETWORKMANAGER_FORTISSLVPN_LICENSE_FILES := \
> + file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
> + file://src/nm-fortisslvpn-service.c;startline=6;endline=18;md5=dc133184bee887456e34cd179e2e9549
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +#
> +# autoconf
> +#
> +NETWORKMANAGER_FORTISSLVPN_CONF_TOOL := autoconf
> +NETWORKMANAGER_FORTISSLVPN_CONF_OPT = \
> + $(CROSS_AUTOCONF_USR) \
> + --enable-shared \
> + --disable-static \
> + --disable-absolute-paths \
> + --disable-nls \
> + --disable-rpath \
> + --disable-more-warnings \
> + --with-pppd-plugin-dir=$(PPP_SHARED_INST_PATH) \
> + --without-gnome \
> + --without-libnm-glib
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/networkmanager-fortisslvpn.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, networkmanager-fortisslvpn)
> + @$(call install_fixup, networkmanager-fortisslvpn,PRIORITY,optional)
> + @$(call install_fixup, networkmanager-fortisslvpn,SECTION,base)
> + @$(call install_fixup, networkmanager-fortisslvpn,AUTHOR,"Ladislav Michl <ladis@linux-mips.org>")
> + @$(call install_fixup, networkmanager-fortisslvpn,DESCRIPTION, "networkmanager-fortisslvpn")
> +
> + @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
> + $(PPP_SHARED_INST_PATH)/nm-fortisslvpn-pppd-plugin.so)
> + @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/libnm-vpn-plugin-fortisslvpn.so)
> + @$(call install_copy, networkmanager-fortisslvpn, 0, 0, 0644, -, \
> + /usr/lib/NetworkManager/VPN/nm-fortisslvpn-service.name)
> + @$(call install_tree, networkmanager-fortisslvpn, 0, 0, -, /usr/libexec)
> +
> + @$(call install_finish, networkmanager-fortisslvpn)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 29+ messages in thread