From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 22 Jun 2026 14:48:35 +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 1wbe4p-008eUd-0c for lore@lore.pengutronix.de; Mon, 22 Jun 2026 14:48:35 +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 1wbe4p-0007H2-0r; Mon, 22 Jun 2026 14:48:35 +0200 Received: from mail.thorsis.com ([2003:a:e28:26e4::10]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1wbe4b-0007D4-21 for ptxdist@pengutronix.de; Mon, 22 Jun 2026 14:48:21 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id E83431480791; Mon, 22 Jun 2026 14:48:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thorsis.com; s=dkim; t=1782132513; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=LjP05i8D7XKL9ZU9o1vf1afxMhjol2xV36PmCTNS43A=; b=YNL4wwPFR3G7uH54aesOJO/NK19JU+bpyVkuDa9y839AKXIxgs2xG8TM2K8ktZWuhJ/SIK GXfswUOUyYh/XrGnWHMWXZ4r4CCCoPd85AKBxokFqs3zSawTqP+Oid9O5IWt0JNIQpxtIw nOD2OEDHM0XHF3YXjPPgvVOd/OJk15+y9MQrOM/zeFIPqVToSENT1xGrDPUsH8yLO8jDBL spejuJLNL+8JFSTa7OfyoQC/NdqZUmAi8Vz4fxQ4+/x8OwtAhql4bDOKNHF7L2eR7Id9Bq V+0M0Zl3sXjVtqh4+TgtgRklkQV4XNHj3CTP7cgo0761KBJrTbrtHc7nUrTicQ== To: ptxdist@pengutronix.de Date: Mon, 22 Jun 2026 14:48:19 +0200 Message-ID: <20260622124819.2702603-1-ada@thorsis.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 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.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] 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: , From: Alexander Dahl via ptxdist Reply-To: ptxdist@pengutronix.de Cc: Alexander Dahl , Bernhard Sessler 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 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 --- Notes: I actually wrote this patch back in 2019 already. Not sure if I ever sent it for review, but I double checked it now and it is still correct for log4cplus 1.2.2 and applies after updating the md5sum of the license file (which was reformatted between 1.1.0 and 1.2.2 releases). rules/log4cplus.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/log4cplus.make b/rules/log4cplus.make index 75fdd923a..91d0b8039 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 base-commit: 3d185e7c01807e7a2f58a89fe811ed572d267099 -- 2.47.3