[ptxdist] [PATCH] log4cplus: Fix licenses and add license file hash

[ptxdist] [PATCH] log4cplus: Fix licenses and add license file hash

[Alexander Dahl via ptxdist]

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 <ada@thorsis.com>
---

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

Re: [ptxdist] [APPLIED] log4cplus: Fix licenses and add license file hash

[Michael Olbrich]

Thanks, applied as 6e5f040f189917516df6bbe694f48b0e40129055.

Michael

[sent from post-receive hook]

On Thu, 25 Jun 2026 21:23:39 +0200, Alexander Dahl <ada@thorsis.com> 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 <ada@thorsis.com>
> Message-Id: <20260622124819.2702603-1-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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