On Tue, Oct 15, 2019 at 12:30:06PM +0200, Roland Hieber wrote: > On Wed, Oct 09, 2019 at 04:34:28PM +0200, Hubert Feurstein wrote: > > Signed-off-by: Hubert Feurstein <h.feurst...@gmail.com> > > --- > > rules/openvpn.make | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/rules/openvpn.make b/rules/openvpn.make > > index ad496d1a7..4035f453f 100644 > > --- a/rules/openvpn.make > > +++ b/rules/openvpn.make > > @@ -21,6 +21,10 @@ OPENVPN_SUFFIX := tar.xz > > OPENVPN_URL := > > http://swupdate.openvpn.org/community/releases/$(OPENVPN).$(OPENVPN_SUFFIX) > > OPENVPN_SOURCE := $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX) > > OPENVPN_DIR := $(BUILDDIR)/$(OPENVPN) > > +OPENVPN_LICENSE := GPL-2.0-only > > OPENVPN_LICENSE := GPL-2.0-only WITH openvpn-openssl-exception > AND BSD-2-Clause AND BSD-3-Clause > > The exception is mentioned in COPYING, and SPDX already knows this one :) > A few files like src/openvpn/base64.c carry BSD-3-Clause headers, and > the lz4 implementation in src/compat/ is BSD-2-Clause. > > > +OPENVPN_LICENSE_FILES := \ > > + file://COPYING;md5=7aee596ed2deefe3e8a861e24292abba \ > > + > > file://src/openvpn/openvpn.c;startline=1;endline=22;md5=1bb6a64be5c851a32fa98b8f9d6e33f9 > > > file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f > > file://src/compat/compat-lz4.c;startline=13;endline=38;md5=5f66cf078523624965e41518eed881e2
And COPYRIGHT.GPL, that contains the actual GPL license text. Michael -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
