From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 25 Jun 2026 21:24:08 +0200 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 ) id 1wcpgG-009omX-0x for lore@lore.pengutronix.de; Thu, 25 Jun 2026 21:24:08 +0200 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wcpgF-0001K5-Ou; Thu, 25 Jun 2026 21:24:07 +0200 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wcpfo-0007sY-10 for ptxdist@pengutronix.de; Thu, 25 Jun 2026 21:23:41 +0200 Received: from drehscheibe.grey.stw.pengutronix.de (drehscheibe.grey.stw.pengutronix.de [IPv6:2a0a:edc0:0:c01:1d::a2]) (Authenticated sender: relay-from-drehscheibe.grey.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id EA3682002FE; Thu, 25 Jun 2026 21:23:39 +0200 (CEST) Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1wcpfn-004dZh-2q; Thu, 25 Jun 2026 21:23:39 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1wcpfn-00000003Uec-3TGA; Thu, 25 Jun 2026 21:23:39 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 25 Jun 2026 21:23:39 +0200 Message-ID: <20260625192339.832811-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260622124819.2702603-1-ada@thorsis.com> References: <20260622124819.2702603-1-ada@thorsis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.7 required=4.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [APPLIED] log4cplus: Fix licenses and add license file hash X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl Sender: "ptxdist" 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 6e5f040f189917516df6bbe694f48b0e40129055. Michael [sent from post-receive hook] On Thu, 25 Jun 2026 21:23:39 +0200, Alexander Dahl wrote: > When introduced as package to ptxdist, log4cplus 1.1.0 README already > stated: > > > This library is licensed under the Apache Public License 2.0 and two > > clause BSD license. Please read the included LICENSE file for > > details. > > Actually some files are under Apache-2.0 and other files are under > BSD-2-Clause, so both apply. > > Fixes: 0ac556f6b55d ("log4cplus: Add new package") > Signed-off-by: Alexander Dahl > Message-Id: <20260622124819.2702603-1-ada@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/log4cplus.make b/rules/log4cplus.make > index 75fdd923a0ed..91d0b8039a1d 100644 > --- a/rules/log4cplus.make > +++ b/rules/log4cplus.make > @@ -22,7 +22,8 @@ LOG4CPLUS_SUFFIX := tar.xz > LOG4CPLUS_URL := $(call ptx/mirror, SF, log4cplus/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX)) > LOG4CPLUS_SOURCE := $(SRCDIR)/$(LOG4CPLUS).$(LOG4CPLUS_SUFFIX) > LOG4CPLUS_DIR := $(BUILDDIR)/$(LOG4CPLUS) > -LOG4CPLUS_LICENSE := Apache-2.0 > +LOG4CPLUS_LICENSE := Apache-2.0 AND BSD-2-Clause > +LOG4CPLUS_LICENSE_FILES := file://LICENSE;md5=cedaa287ececcb94f9f2880d9c4ef085 > > # ---------------------------------------------------------------------------- > # Prepare