diff --git a/tomcat.changes b/tomcat.changes index 719fa9c..b03dc9c 100644 --- a/tomcat.changes +++ b/tomcat.changes @@ -3,7 +3,7 @@ Wed Mar 17 16:16:52 UTC 2021 - Abid Mehmood - Log if file access is blocked due to symlinks: CVE-2021-24122 (bsc#1180947) - Added patch: - * tomcat-9.0-CVE-2021-24122 + * tomcat-9.0-CVE-2021-24122.patch ------------------------------------------------------------------- Wed Dec 16 12:17:22 UTC 2020 - Abid Mehmood diff --git a/tomcat.spec b/tomcat.spec index 10f9d04..37b8043 100644 --- a/tomcat.spec +++ b/tomcat.spec @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -163,7 +163,7 @@ The documentation of web application for Apache Tomcat. Summary: Expression Language v3.0 API Group: Development/Libraries/Java Requires(post): update-alternatives -Requires(preun): update-alternatives +Requires(preun):update-alternatives Provides: %{name}-el-%{elspec}-api = %{version}-%{release} Provides: el_3_0_api = %{version}-%{release} Provides: el_api = %{elspec} @@ -187,7 +187,7 @@ Group: Productivity/Networking/Web/Servers Requires: mvn(org.apache.tomcat:tomcat-el-api) Requires: mvn(org.apache.tomcat:tomcat-servlet-api) Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: %{name}-jsp-%{jspspec}-api Provides: jsp = %{jspspec} Provides: jsp23 @@ -215,7 +215,7 @@ Requires: %{name}-el-%{elspec}-api = %{version}-%{release} Requires: %{name}-jsp-%{jspspec}-api = %{version}-%{release} Requires: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Requires(post): ecj >= 4.4 -Requires(preun): coreutils +Requires(preun):coreutils Provides: jakarta-commons-dbcp-tomcat5 = 1.4 Obsoletes: jakarta-commons-dbcp-tomcat5 < 1.4 @@ -226,7 +226,7 @@ Libraries required to successfully run the Tomcat Web container Summary: Apache Tomcat Servlet API implementation classes Group: Productivity/Networking/Web/Servers Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Provides: %{name}-servlet-%{servletspec}-api = %{version}-%{release} Provides: servlet = %{servletspec} Provides: servlet31 @@ -636,17 +636,17 @@ update-alternatives --install %{_javadir}/servlet.jar servlet \ %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000 # Fix for bsc#1092163. # Keep the /usr/share/java/tomcat-servlet.jar symlink for compatibility. -# In case of update from an older version where /usr/share/java/tomcat-servlet.jar is an alternatives symlink +# In case of update from an older version where /usr/share/java/tomcat-servlet.jar is an alternatives symlink # the update-alternatives in the new version will cause a rename tomcat-servlet.jar -> servlet.jar. # This makes sure the tomcat-servlet.jar is recreated if it's missing because of the rename. -if [ ! -f %{_javadir}/%{name}-servlet.jar ]; then +if [ ! -f %{_javadir}/%{name}-servlet.jar ]; then echo "Recreating symlink %{_javadir}/%{name}-servlet.jar" ln -s %{_javadir}/%{name}-servlet-%{servletspec}-api.jar %{_javadir}/%{name}-servlet.jar fi %postun servlet-4_0-api if [ $1 -eq 0 ] ; then - if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then + if [ ! -f %{_sysconfdir}/alternatives/servlet ]; then # /etc/alternatives/servlet was removed on uninstall. # Create a broken symlink to make sure update-alternatives works correctly and falls back # to servletapi5 or servletapi4 if they're installed.