From 28a60cec284be37f567dc05db07bf29e11d16a51fcb27a0e96d4d7ee43f23be5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:37:44 +0000 Subject: [PATCH 1/3] Accepting request 1114384 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114384 OBS-URL: https://build.opensuse.org/package/show/Java:packages/reload4j?expand=0&rev=20 --- reload4j.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/reload4j.spec b/reload4j.spec index 78207ae..a27f3fe 100644 --- a/reload4j.spec +++ b/reload4j.spec @@ -32,7 +32,7 @@ BuildRequires: fdupes BuildRequires: geronimo-jms-1_1-api BuildRequires: java-devel >= 1.8 BuildRequires: javamail -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 Obsoletes: chainsaw < 2.1 Obsoletes: log4j < 1.3 Obsoletes: log4j-mini < 1.3 @@ -99,7 +99,7 @@ done #pom install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a log4j:log4j # javadoc From c5b950c4fee359df5823340f09b90392e45a9d9fd8d6adc53c6295d8bc79e6bf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Oct 2023 20:38:51 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/reload4j?expand=0&rev=21 --- _service | 2 +- reload4j-1.2.20.tar.xz | 3 --- reload4j-1.2.25.tar.xz | 3 +++ reload4j-build.xml | 12 ++++++++---- reload4j-java1.patch | 10 ++++++---- reload4j.spec | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) delete mode 100644 reload4j-1.2.20.tar.xz create mode 100644 reload4j-1.2.25.tar.xz diff --git a/_service b/_service index a3387da..4a8320c 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/qos-ch/reload4j.git - v_1.2.20 + v_1.2.25 v_* @PARENT_TAG@ v_(.*) diff --git a/reload4j-1.2.20.tar.xz b/reload4j-1.2.20.tar.xz deleted file mode 100644 index efe9891..0000000 --- a/reload4j-1.2.20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bcfdd87448ae5316488ff58b21ea3e31c92d397112334fccc78bd79d582bbc46 -size 421624 diff --git a/reload4j-1.2.25.tar.xz b/reload4j-1.2.25.tar.xz new file mode 100644 index 0000000..6bb948e --- /dev/null +++ b/reload4j-1.2.25.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0bfceb8367939a5a69e9b63bdfb58fc27bde6bf12e27d80d580873d325cf46a +size 417736 diff --git a/reload4j-build.xml b/reload4j-build.xml index 1af8987..b97b886 100644 --- a/reload4j-build.xml +++ b/reload4j-build.xml @@ -10,9 +10,10 @@ - + - + + @@ -61,6 +62,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -90,6 +92,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -215,6 +218,7 @@ basedir="${build.outputDir}" excludes="**/package.html"> + @@ -227,8 +231,8 @@ - - + + diff --git a/reload4j-java1.patch b/reload4j-java1.patch index 99eb9d5..9230345 100644 --- a/reload4j-java1.patch +++ b/reload4j-java1.patch @@ -1,11 +1,13 @@ ---- reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:01.051452323 +0100 -+++ reload4j-1.2.19/src/main/java/org/apache/log4j/MDC.java 2022-02-23 08:05:39.546646231 +0100 -@@ -47,7 +47,7 @@ +diff --git a/src/main/java/org/apache/log4j/MDC.java b/src/main/java/org/apache/log4j/MDC.java +index 5805772..fdcfeed 100755 +--- a/src/main/java/org/apache/log4j/MDC.java ++++ b/src/main/java/org/apache/log4j/MDC.java +@@ -45,7 +45,7 @@ public class MDC { static final int HT_SIZE = 7; - // boolean java1; + boolean java1; - ThreadLocalMap tlm; + Object tlm; diff --git a/reload4j.spec b/reload4j.spec index a27f3fe..5bbdcc4 100644 --- a/reload4j.spec +++ b/reload4j.spec @@ -1,7 +1,7 @@ # # spec file for package reload4j # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %bcond_with tests Name: reload4j -Version: 1.2.20 +Version: 1.2.25 Release: 0 Summary: Revival of EOLed log4j 1.x License: Apache-2.0 From e006cfdc3f926a3794dd6c34065fe6237806d66b5ccd3bdfae4690a72e88bfa2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 17 Oct 2023 21:02:32 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/reload4j?expand=0&rev=22 --- reload4j.changes | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/reload4j.changes b/reload4j.changes index eae78e0..d6d11f8 100644 --- a/reload4j.changes +++ b/reload4j.changes @@ -1,10 +1,48 @@ +------------------------------------------------------------------- +Tue Oct 17 20:44:32 UTC 2023 - Fridrich Strba + +- Update to upstream version 1.2.25 + * Given that some users encountered problems with the changes + made in version 1.2.24, the thread context class loader (TCCL) + is now tried first under all JDK versions unless the + "log4j.ignoreTCL" system property is set to true. This was + intended behavior all along except that is was disabled in + JDK 9 and later due to a coding error. +- Update to upstream version 1.2.24 + * The loadClass and getResource methods in the Loader class are + used to search for resources and to load classes, typically + appenders or layouts. In this release, only the class loader + that loaded the Loader class itself is used. The thread context + class loader (TCCL) is no longer used. In previous releases, + this was already the case when running under JDK 9 and later + but not under JDK 8 or earlier. The change provides both more + consistent and also simpler behavior. It should be be + transparent to users. +- Update to upstream version 1.2.23 + * Added Automatic-Module-Name entry set to ch.qos.reload4j in + the MANIFEST.MF file. This should help in including reload4j + as a named dependency in Jigsaw modular projects. +- Update to upstream version 1.2.22 + * Fixed a newly discovered XXE vector vulnerability reported + against Chainsaw. +- Update to upstream version 1.2.21 + * The binary compatibility issue between earlier versions of + reload4j and slf4j-log4j12 has been fixed. Although it is + recommended that you use slf4j-reload4j as the preferred adapter + for the slf4j/reload4j combination, with reload4j version 1.2.21 + and later you can freely mix any version of slf4j-log4j12, if + you have to. +- Modified patch: + * reload4j-java1.patch + + rediff to changed context + ------------------------------------------------------------------- Mon Apr 11 13:51:49 UTC 2022 - Fridrich Strba - Update to upstream version 1.2.20 * For enabled logging statements, the performance of iterating on appenders attached to a logger has been significantly - improved. + improved. ------------------------------------------------------------------- Sat Mar 19 10:36:59 UTC 2022 - Fridrich Strba @@ -20,7 +58,7 @@ Wed Feb 23 07:08:03 UTC 2022 - Fridrich Strba class to have internal boolean variable java1. We add it there just to avoid runtime incompatibilities as a log4j12 drop-in replacement. -- Add Provides and Obsoletes to the javadoc package in order to +- Add Provides and Obsoletes to the javadoc package in order to transition smoothly out of log4j12-javadoc and log4j12-manual -------------------------------------------------------------------