SLFO-pool/reload4j
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main reload4j revision aa4b1488aeb20e9cc81812c44a127a47

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-04 00:05:11 +02:00
commit f346f0dcf6
7 changed files with 481 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

15
_service Normal file
View File

@ -0,0 +1,15 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/qos-ch/reload4j.git</param>
<param name="revision">v_1.2.25</param>
<param name="match-tag">v_*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v_(.*)</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="disabled"/>
</services>

BIN
reload4j-1.2.25.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

242
reload4j-build.xml Normal file
View File

@ -0,0 +1,242 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="reload4j" default="package" basedir=".">
<!-- ====================================================================== -->
<!-- Build environment properties -->
<!-- ====================================================================== -->
<property file="build.properties"/>
<property name="project.groupId" value="ch.qos.reload4j"/>
<property name="project.artifactId" value="reload4j"/>
<property name="project.version" value="1.2.25"/>
<property name="compiler.release" value="8"/>
<property name="compiler.source" value="1.${compiler.release}"/>
<property name="compiler.target" value="${compiler.source}"/>
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
<property name="build.dir" value="target"/>
<property name="build.outputDir" value="${build.dir}/classes"/>
<property name="build.srcDir" value="src/main/java"/>
<property name="build.resourceDir" value="src/main/resources"/>
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
<property name="build.testDir" value="src/test/java"/>
<property name="build.testResourceDir" value="src/test/resources"/>
<property name="test.reports" value="${build.dir}/test-reports"/>
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
<!-- ====================================================================== -->
<!-- Defining classpaths -->
<!-- ====================================================================== -->
<path id="build.classpath">
<fileset dir="lib">
<include name="**/*"/>
</fileset>
</path>
<path id="build.test.classpath">
<fileset dir="lib">
<include name="**/*"/>
</fileset>
</path>
<!-- ====================================================================== -->
<!-- Cleaning up target -->
<!-- ====================================================================== -->
<target name="clean" description="Clean the output directory">
<delete dir="${build.dir}"/>
</target>
<!-- ====================================================================== -->
<!-- Compilation target -->
<!-- ====================================================================== -->
<target name="compile" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
</src>
<classpath refid="build.classpath"/>
</javac>
<copy todir="${build.outputDir}">
<fileset dir="${build.resourceDir}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Test-compilation target -->
<!-- ====================================================================== -->
<target name="compile-tests"
depends="compile"
description="Compile the test code"
unless="test.skip">
<mkdir dir="${build.testOutputDir}"/>
<javac destdir="${build.testOutputDir}"
encoding="UTF-8"
nowarn="false"
debug="true"
optimize="false"
deprecation="true"
release="${compiler.release}"
target="${compiler.target}"
verbose="false"
fork="false"
source="${compiler.source}">
<src>
<pathelement location="${build.testDir}"/>
</src>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
</classpath>
</javac>
<copy todir="${build.testOutputDir}">
<fileset dir="${build.testResourceDir}"/>
</copy>
</target>
<!-- ====================================================================== -->
<!-- Run all tests -->
<!-- ====================================================================== -->
<target name="test"
depends="compile-tests, junit-missing"
unless="junit.skipped"
description="Run the test cases">
<mkdir dir="${test.reports}"/>
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
<sysproperty key="basedir" value="."/>
<formatter type="xml"/>
<formatter type="plain" usefile="false"/>
<classpath>
<path refid="build.test.classpath"/>
<pathelement location="${build.outputDir}"/>
<pathelement location="${build.testOutputDir}"/>
</classpath>
<batchtest todir="${test.reports}" unless="test">
<fileset dir="${build.testDir}">
<include name="**/Test*.java"/>
<include name="**/*Test.java"/>
<include name="**/*TestCase.java"/>
<exclude name="**/*Abstract*Test.java"/>
<exclude name="**/*Test*Constants.java"/>
</fileset>
</batchtest>
<batchtest todir="${test.reports}" if="test">
<fileset dir="${build.testDir}">
<include name="**/${test}.java"/>
<exclude name="**/*Abstract*Test.java"/>
<exclude name="**/*Test*Constants.java"/>
</fileset>
</batchtest>
</junit>
</target>
<target name="test-junit-present">
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
</target>
<target name="test-junit-status"
depends="test-junit-present">
<condition property="junit.missing">
<and>
<isfalse value="${junit.present}"/>
<isfalse value="${test.skip}"/>
</and>
</condition>
<condition property="junit.skipped">
<or>
<isfalse value="${junit.present}"/>
<istrue value="${test.skip}"/>
</or>
</condition>
</target>
<target name="junit-missing"
depends="test-junit-status"
if="junit.missing">
<echo>=================================== WARNING ===================================</echo>
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
<echo>===============================================================================</echo>
</target>
<!-- ====================================================================== -->
<!-- Javadoc target -->
<!-- ====================================================================== -->
<target name="javadoc" description="Generates the Javadoc of the application">
<javadoc sourcepath="${build.srcDir}"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
verbose="false"
encoding="UTF-8"
version="true"
use="true"
author="true"
splitindex="false"
nodeprecated="false"
nodeprecatedlist="false"
notree="false"
noindex="false"
nohelp="false"
nonavbar="false"
serialwarn="false"
charset="UTF-8"
linksource="false"
breakiterator="false"
source="${compiler.source}">
<classpath refid="build.classpath"/>
<header>&lt;![CDATA[&lt;a href=&quot;https://reload4j.qos.ch&quot;&gt;
&lt;img src=&quot;https://reload4j.qos.ch/images/logos/reload4j.jpg&quot; height=&quot;40&quot;/&gt;&lt;/a&gt;]]&gt;</header>
</javadoc>
</target>
<!-- ====================================================================== -->
<!-- Package target -->
<!-- ====================================================================== -->
<target name="package" depends="compile,test" description="Package the application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
basedir="${build.outputDir}"
excludes="**/package.html">
<manifest>
<attribute name="Automatic-Module-Name" value="${project.groupId}"/>
<attribute name="Bundle-Description" value="Reload4j revives EOLed log4j 1.x"/>
<attribute name="Bundle-DocURL" value="https://reload4j.qos.ch/"/>
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="${project.artifactId}"/>
<attribute name="Bundle-SymbolicName" value="org.apache.log4j"/>
<attribute name="Bundle-Vendor" value="QOS.CH Sarl (Switzerland)"/>
<attribute name="Bundle-Version" value="${project.version}"/>
<attribute name="Export-Package" value="org.apache.log4j.config;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j&quot;,org.apache.log4j.helpers;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.jdbc;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.net;version=&quot;${project.version}&quot;;uses:=&quot;javax.jms,javax.mail,javax.naming,org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.or.jms;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or.sax;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.or&quot;,org.apache.log4j.or;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.spi&quot;,org.apache.log4j.pattern;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.helpers,org.apache.log4j.spi&quot;,org.apache.log4j.rewrite;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi,org.apache.log4j.xml,org.w3c.dom&quot;,org.apache.log4j.spi;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.or&quot;,org.apache.log4j.varia;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j,org.apache.log4j.spi&quot;,org.apache.log4j.xml;version=&quot;${project.version}&quot;;uses:=&quot;javax.xml.parsers,org.apache.log4j,org.apache.log4j.config,org.apache.log4j.spi,org.w3c.dom,org.xml.sax&quot;,org.apache.log4j;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.log4j.helpers,org.apache.log4j.or,org.apache.log4j.spi&quot;"/>
<attribute name="Implementation-Title" value="${project.artifactId}"/>
<attribute name="Implementation-Vendor" value="QOS.CH Sarl (Switzerland)"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Import-Package" value="javax.jmdns;resolution:=optional,javax.jms;resolution:=optional,javax.mail.internet;resolution:=optional,javax.mail;resolution:=optional,javax.naming,javax.xml.parsers,org.w3c.dom,org.xml.sax,org.xml.sax.helpers"/>
<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
<attribute name="X-Compile-Source-JDK" value="${compiler.source}"/>
<attribute name="X-Compile-Target-JDK" value="${compiler.target}"/>
</manifest>
</jar>
</target>
</project>

13
reload4j-java1.patch Normal file
View File

@ -0,0 +1,13 @@
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;
Object tlm;

67
reload4j.changes Normal file
View File

@ -0,0 +1,67 @@
-------------------------------------------------------------------
Tue Oct 17 20:44:32 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- 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.
-------------------------------------------------------------------
Sat Mar 19 10:36:59 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with source/target levels 8
-------------------------------------------------------------------
Wed Feb 23 07:08:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* reload4j-java1.patch
+ Some projects using log4j12 expect the org.apache.log4j.MDC
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
transition smoothly out of log4j12-javadoc and log4j12-manual
-------------------------------------------------------------------
Tue Feb 22 08:12:11 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of reload4j 1.2.19

118
reload4j.spec Normal file
View File

@ -0,0 +1,118 @@
#
# spec file for package reload4j
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%bcond_with tests
Name: reload4j
Version: 1.2.25
Release: 0
Summary: Revival of EOLed log4j 1.x
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://reload4j.qos.ch/
Source0: %{name}-%{version}.tar.xz
Source1: %{name}-build.xml
Patch0: %{name}-java1.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: geronimo-jms-1_1-api
BuildRequires: java-devel >= 1.8
BuildRequires: javamail
BuildRequires: javapackages-local >= 6
Obsoletes: chainsaw < 2.1
Obsoletes: log4j < 1.3
Obsoletes: log4j-mini < 1.3
Obsoletes: log4j12 < %{version}
Obsoletes: log4j12-mini < %{version}
Obsoletes: logfactor5 < %{version}
Provides: log4j12 = %{version}
Provides: log4j12-mini = %{version}
Provides: mvn(log4j:log4j:1.2.12) = %{version}
Provides: mvn(log4j:log4j:1.2.14) = %{version}
Provides: mvn(log4j:log4j:1.2.16) = %{version}
Provides: mvn(log4j:log4j:1.2.17) = %{version}
Provides: mvn(log4j:log4j:12) = %{version}
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: geronimo-jaf-1_0_2-api
BuildRequires: h2database
%endif
%description
The reload4j project is a fork of Apache log4j version 1.2.17
in order to fix most pressing security issues. It is intended
as a drop-in replacement for log4j version 1.2.17; replacement
of log4j.jar with reload4j.jar in a build without needing to
make changes to source code.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
Obsoletes: log4j12-javadoc < %{version}
Obsoletes: log4j12-manual < %{version}
Provides: log4j12-javadoc = %{version}
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
cp %{SOURCE1} build.xml
mkdir -p lib
%build
build-jar-repository -s lib javamail geronimo-jms-1.1-api
%if %{with tests}
build-jar-repository -s lib geronimo-jaf-1.0.2-api h2database
%endif
%{ant} \
%if %{without tests}
-Dtest.skip=true \
%endif
package javadoc
%install
# jars
mkdir -p %{buildroot}%{_javadir}/%{name}
cp -a target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
mkdir -p %{buildroot}%{_javadir}/log4j12
for i in log4j-1.2.12 log4j-1.2.13 log4j-1.2.14 log4j-1.2.15 log4j-1.2.16 log4j-1.2.17 log4j-12; do
ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/log4j12/${i}.jar
done
#pom
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
%mvn_install_pom pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a log4j:log4j
# javadoc
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files -f .mfiles
%{_javadir}/log4j12
%license LICENSE
%doc NOTICE
%files javadoc
%{_javadocdir}/%{name}
%changelog