diff --git a/rhbz-1857043.patch b/rhbz-1857043.patch new file mode 100644 index 0000000..e78852e --- /dev/null +++ b/rhbz-1857043.patch @@ -0,0 +1,21 @@ +diff -up ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig ./res/bnd/tomcat-coyote.jar.tmp.bnd +--- ./res/bnd/tomcat-coyote.jar.tmp.bnd.orig 2020-07-20 15:14:12.469921562 -0400 ++++ ./res/bnd/tomcat-coyote.jar.tmp.bnd 2020-07-20 15:14:28.452941874 -0400 +@@ -35,11 +35,11 @@ Export-Package: \ + org.apache.tomcat.util.modeler,\ + org.apache.tomcat.util.net,\ + org.apache.tomcat.util.net.openssl,\ +- org.apache.tomcat.util.net.openssl.ciphers ++ org.apache.tomcat.util.net.openssl.ciphers,\ ++ org.apache.tomcat.util.modeler.modules,\ ++ org.apache.tomcat.util.net.jsse + + -includepackage: \ + org.apache.tomcat.util.bcel,\ + org.apache.tomcat.util.http.fileupload.impl,\ +- org.apache.tomcat.util.http.fileupload.util.mime,\ +- org.apache.tomcat.util.modeler.modules,\ +- org.apache.tomcat.util.net.jsse +\ No newline at end of file ++ org.apache.tomcat.util.http.fileupload.util.mime +\ No newline at end of file diff --git a/tomcat.spec b/tomcat.spec index a705c9a..e506e0d 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -59,7 +59,7 @@ Name: tomcat Epoch: 1 Version: %{major_version}.%{minor_version}.%{micro_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API License: ASL 2.0 @@ -82,6 +82,7 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.p Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch2: %{name}-build.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch +Patch4: rhbz-1857043.patch BuildArch: noarch @@ -210,6 +211,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name " %patch1 -p0 %patch2 -p0 %patch3 -p0 +%patch4 -p0 %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar @@ -620,6 +622,9 @@ fi %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out %changelog +* Mon Jul 20 2020 Coty Sutherland - 1:9.0.37-2 +- Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar + * Mon Jul 13 2020 Coty Sutherland - 1:9.0.37-1 - Update to 9.0.37