- up to 7.0.100; fixes CVE-2019-17563, CVE-2019-12418, CVE-2019-17569, CVE-2020-1935...

[packages/tomcat.git] / jcl.patch

diff --git a/jcl.patch b/jcl.patch
index 89c8709ea7fb7a3e94cc0e695fcec95adde8b9af..83cb394943cee6cb1acc25f916a65dbc5a2739d3 100644 (file)
--- a/jcl.patch
+++ b/jcl.patch
@@ -5,12 +5,13 @@ otherwise deps for jcl build don't get set
 
 --- tc7.0.x/build.xml~ 2015-07-26 22:42:44.873164872 +0300
 +++ tc7.0.x/build.xml  2015-07-26 22:53:44.930780044 +0300
-@@ -1613,7 +1613,7 @@
+@@ -1715,7 +1715,7 @@
  
      <ant antfile="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build2.xml"
           dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src"
--         inheritAll="false" target="compile" />
-+         inheritAll="true" target="compile" />
- 
-     <jar jarfile="${tomcat-juli-extras.jar}"
-          manifest="${tomcat.manifests}/default.manifest"
+-         inheritAll="false" target="compile" >
++         inheritAll="true" target="compile" >
+       <property name="source.version" value="${logging.compile.source}" />
+       <property name="target.version" value="${logging.compile.target}" />
+     </ant>
+