From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Fri, 10 Dec 2021 14:08:35 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1mvfdb-0024ef-Ge
	for lore@lore.pengutronix.de; Fri, 10 Dec 2021 14:08:35 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1mvfda-00074l-Lj; Fri, 10 Dec 2021 14:08:34 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1mvfcJ-0005Zl-V3; Fri, 10 Dec 2021 14:07:16 +0100
Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1mvfcJ-003mOg-V6; Fri, 10 Dec 2021 14:07:15 +0100
Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1mvfcI-00GNBW-IN; Fri, 10 Dec 2021 14:07:14 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Fri, 10 Dec 2021 14:07:14 +0100
Message-Id: <20211210130714.3902294-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211203100103.3476-3-ada@thorsis.com>
References: <20211203100103.3476-3-ada@thorsis.com>
MIME-Version: 1.0
Subject: Re: [ptxdist] [APPLIED] libmicrohttpd: Update license handling
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
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
Cc: Alexander Dahl <ada@thorsis.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
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.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 44dc6d6a3111c379afb2349abb3caa9fb92e2355.

Michael

[sent from post-receive hook]

On Fri, 10 Dec 2021 14:07:14 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> License options depend on whether gnutls is linked or not.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211203100103.3476-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make
> index 2a4700ead249..313a52c9b751 100644
> --- a/rules/libmicrohttpd.make
> +++ b/rules/libmicrohttpd.make
> @@ -22,7 +22,17 @@ LIBMICROHTTPD_SUFFIX	:= tar.gz
>  LIBMICROHTTPD_URL	:= $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX))
>  LIBMICROHTTPD_SOURCE	:= $(SRCDIR)/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)
>  LIBMICROHTTPD_DIR	:= $(BUILDDIR)/$(LIBMICROHTTPD)
> +
> +LIBMICROHTTPD_LICENSE_FILES := \
> +	file://README;startline=10;endline=11;md5=c6f1444a4efd67e04f3452dc1e97c24d \
> +	file://COPYING;md5=57d09285feac8a64efa878e692b14f36
> +ifdef PTXCONF_LIBMICROHTTPD_HTTPS
> +LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only
> +else
>  LIBMICROHTTPD_LICENSE	:= LGPL-2.1-only OR GPL-2.0-only WITH eCos-exception-2.0
> +LIBMICROHTTPD_LICENSE_FILES += \
> +	file://doc/ecos.texi;md5=2f39d254e3e5ed800a68ed0fc265b8a1
> +endif
>  
>  # ----------------------------------------------------------------------------
>  # Prepare

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de