From 8db0343ee9b0b10b669c602bb23264bc2af42816 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Thu, 3 Jun 2021 14:56:15 -0400
Subject: [PATCH] Remove examples webapps from subpackage

---
 tomcat.spec | 56 +++++++++--------------------------------------------
 1 file changed, 9 insertions(+), 47 deletions(-)

diff --git a/tomcat.spec b/tomcat.spec
index e8db2bd..7fce0f1 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
@@ -90,13 +90,8 @@ BuildRequires: ant
 BuildRequires: ecj >= 1:4.10
 BuildRequires: findutils
 BuildRequires: apache-commons-daemon
-BuildRequires: tomcat-taglibs-standard
 BuildRequires: java-devel >= 1:1.8.0
-%if 0%{?fedora} >= 27 || 0%{?rhel} > 7
-# add_maven_depmap is deprecated, using javapackages-local for now
-# See https://fedora-java.github.io/howto/latest/#_add_maven_depmap_macro
 BuildRequires: javapackages-local
-%endif
 BuildRequires: geronimo-jaxrpc
 BuildRequires: geronimo-saaj
 BuildRequires: aqute-bnd
@@ -194,12 +189,11 @@ Obsoletes: %{name}-el-2.2-api
 Apache Tomcat EL API Implementation Classes.
 
 %package webapps
-Summary: The ROOT and examples web applications for Apache Tomcat
+Summary: The ROOT web application for Apache Tomcat
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: tomcat-taglibs-standard >= 0:1.1
 
 %description webapps
-The ROOT and examples web applications for Apache Tomcat.
+The ROOT web application for Apache Tomcat.
 
 %prep
 %setup -q -n %{packdname}
@@ -213,9 +207,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %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
-
 %build
 export OPT_JAR_LIST="xalan-j2-serializer"
    # we don't care about the tarballs and we're going to replace
@@ -249,13 +240,9 @@ export OPT_JAR_LIST="xalan-j2-serializer"
 
     # remove some jars that we'll replace with symlinks later
     %{__rm} output/build/bin/commons-daemon.jar output/build/lib/ecj.jar
-pushd output/dist/src/webapps/docs/appdev/sample/src
-%{__mkdir_p} ../web/WEB-INF/classes
-%{javac} -cp ../../../../../../../../output/build/lib/servlet-api.jar -d ../web/WEB-INF/classes mypackage/Hello.java
-pushd ../web
-%{jar} cf ../../../../../../../../output/build/webapps/docs/appdev/sample/sample.war *
-popd
-popd
+    # Remove the example webapps per Apache Tomcat Security Considerations
+    # see https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html
+    %{__rm} -rf output/build/webapps/examples
 
 %install
 # build initial path structure
@@ -342,10 +329,6 @@ popd
 
 pushd output/build
     %{_bindir}/build-jar-repository lib ecj 2>&1
-    # need to use -p here with b-j-r otherwise the examples webapp fails to
-    # load with a java.io.IOException
-    %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \
-    tomcat-taglibs-standard/taglibs-standard-impl.jar tomcat-taglibs-standard/taglibs-standard-compat.jar 2>&1
 popd
 
 pushd ${RPM_BUILD_ROOT}%{libdir}
@@ -369,28 +352,6 @@ pushd ${RPM_BUILD_ROOT}%{homedir}
     %{__ln_s} %{workdir} work
 popd
 
-# install sample webapp
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/sample
-pushd ${RPM_BUILD_ROOT}%{appdir}/sample
-%{jar} xf ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
-popd
-%{__rm} ${RPM_BUILD_ROOT}%{appdir}/docs/appdev/sample/sample.war
-
-# Allow linking for example webapp
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
-pushd ${RPM_BUILD_ROOT}%{appdir}/examples/META-INF
-echo '<?xml version="1.0" encoding="UTF-8"?>' > context.xml
-echo '<Context>' >> context.xml
-echo '  <Resources allowLinking="true" />' >> context.xml
-echo '</Context>' >> context.xml
-popd
-
-pushd ${RPM_BUILD_ROOT}%{appdir}/examples/WEB-INF/lib
-%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) jstl.jar
-%{__ln_s} -f $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) standard.jar
-popd
-
-
 # Install the maven metadata
 %{__install} -d -m 0755 ${RPM_BUILD_ROOT}%{_mavenpomdir}
 pushd output/dist/src/res/maven
@@ -613,8 +574,6 @@ fi
 %files webapps
 %defattr(0644,tomcat,tomcat,0755)
 %{appdir}/ROOT
-%{appdir}/examples
-%{appdir}/sample
 
 %files jsvc
 %defattr(755,root,root,0755)
@@ -623,6 +582,9 @@ fi
 %attr(0660,tomcat,tomcat) %verify(not size md5 mtime) %{logdir}/catalina.out
 
 %changelog
+* Thu Jun 03 2021 Coty Sutherland <csutherl@redhat.com> 1:9.0.45-2
+- Remove examples webapps from subpackage
+
 * Thu Apr 22 2021 Hui Wang <huwang@redhat.com> - 1:9.0.45-1
 - Update to 9.0.45