rpms/tomcat
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: rhbz#1857043 Add patch to reinclude o.a.t.util.net.jsse and o.a.t.util.moduler.modules in tomcat-coyote.jar

Browse Source
This commit is contained in:
Coty Sutherland 2020-07-20 15:17:57 -04:00
parent 52bdf0a6d0
commit a8c5ea8561
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rhbz-1857043.patch Normal file
View File

@ -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

7
tomcat.spec
View File

@ -59,7 +59,7 @@
Name: tomcat Name: tomcat
Epoch: 1 Epoch: 1
Version: %{major_version}.%{minor_version}.%{micro_version} 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 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
License: ASL 2.0 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 Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
Patch2: %{name}-build.patch Patch2: %{name}-build.patch
Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch Patch3: %{name}-%{major_version}.%{minor_version}-catalina-policy.patch
Patch4: rhbz-1857043.patch
BuildArch: noarch BuildArch: noarch
@ -210,6 +211,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch3 -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-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 %{__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 %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
%changelog %changelog
* Mon Jul 20 2020 Coty Sutherland <csutherl@redhat.com> - 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 <csutherl@redhat.com> - 1:9.0.37-1 * Mon Jul 13 2020 Coty Sutherland <csutherl@redhat.com> - 1:9.0.37-1
- Update to 9.0.37 - Update to 9.0.37