From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 28 Nov 2023 09:38:05 +0100
Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.96)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1r7tbZ-00Bvvd-0d
	for lore@lore.pengutronix.de;
	Tue, 28 Nov 2023 09:38:05 +0100
Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de)
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1r7tbZ-0004br-CZ; Tue, 28 Nov 2023 09:38:05 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1r7taR-00033f-BW; Tue, 28 Nov 2023 09:36:55 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1r7taQ-00C8AB-Uu; Tue, 28 Nov 2023 09:36:54 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1r7taQ-004P5j-2l;
 Tue, 28 Nov 2023 09:36:54 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Tue, 28 Nov 2023 09:36:54 +0100
Message-Id: <20231128083654.1049631-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231124114333.1839479-1-rhi@pengutronix.de>
References: <20231124114333.1839479-1-rhi@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] gnutls: add LGPL license text,
 add GPL-3.0 if built with openssl compat
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <https://metis.pengutronix.de/mailman/options/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <https://metis.pengutronix.de/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <https://metis.pengutronix.de/mailman/listinfo/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as f15305e1f7c24b8ad100d132dfbce3776e1c939f.

Michael

[sent from post-receive hook]

On Tue, 28 Nov 2023 09:36:54 +0100, Roland Hieber <rhi@pengutronix.de> wrote:
> ./LICENSE mentions that the openssl compat code is licensed under
> GPL-3.0, and references the full license texts in doc/.
> 
> Cc: Bruno Thomsen <bruno.thomsen@gmail.com>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20231124114333.1839479-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index d49fbd1b17d6..35df7f76c688 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -23,8 +23,16 @@ GNUTLS_SOURCE		:= $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
>  GNUTLS_DIR		:= $(BUILDDIR)/$(GNUTLS)
>  GNUTLS_LICENSE		:= LGPL-3.0-or-later
>  GNUTLS_LICENSE_FILES	:= \
> +	file://doc/COPYING.LESSER;md5=a6f89e2100d9b6cdffcea4f398e37343 \
>  	file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
>  
> +ifdef PTXCONF_GNUTLS_OPENSSL
> +GNUTLS_LICENSE 		+= AND GPL-3.0-or-later
> +GNUTLS_LICENSE_FILES	+= \
> +	file://extra/gnutls_openssl.c;startline=1;endline=19;md5=b8b99cb92b0fbb522912f20e3359913c \
> +	file://doc/COPYING;md5=c678957b0c8e964aa6c70fd77641a71e
> +endif
> +
>  # ----------------------------------------------------------------------------
>  # Prepare
>  # ----------------------------------------------------------------------------