Re: [ptxdist] [PATCH 6/7] openfortivpn: new package

[Ladislav Michl <ladis@linux-mips.org>]

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