From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from ptx.hi.pengutronix.de ([2001:67c:670:100:1d::c0])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>) id 1iKKFZ-0000ke-Ue
 for ptxdist@pengutronix.de; Tue, 15 Oct 2019 12:40:21 +0200
Received: from mol by ptx.hi.pengutronix.de with local (Exim 4.89)
 (envelope-from <mol@pengutronix.de>) id 1iKKFZ-0004E4-JH
 for ptxdist@pengutronix.de; Tue, 15 Oct 2019 12:40:21 +0200
Date: Tue, 15 Oct 2019 12:40:21 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
Message-ID: <20191015104021.y5motmmpvtbnd2p7@pengutronix.de>
References: <20191009143429.16809-1-h.feurstein@gmail.com>
 <20191009143429.16809-2-h.feurstein@gmail.com>
 <20191015103006.ilqloxqwaho5p5xz@pengutronix.de>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20191015103006.ilqloxqwaho5p5xz@pengutronix.de>
Subject: Re: [ptxdist] [PATCH 2/3] openvpn: add license identifier
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de

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.feurstein@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