pool/tomcat
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1128665 from home:RMestre:branches:Java:packages

Browse Source 
- replace prep setup and patches macro with autosetup

OBS-URL: https://build.opensuse.org/request/show/1128665
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=281
This commit is contained in:
Michele Bussolotto 2023-11-27 08:18:24 +00:00 committed by Git OBS Bridge
parent 0e5a696eed
commit 6c8547a641
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tomcat-9.0-bootstrap-MANIFEST.MF.patch
View File

@ -1,5 +1,7 @@
--- res/META-INF/bootstrap.jar.manifest.orig 2010-04-06 10:11:09.000000000 -0600 Index: apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
+++ res/META-INF/bootstrap.jar.manifest 2010-04-06 10:45:56.000000000 -0600 ===================================================================
--- apache-tomcat-9.0.82-src.orig/res/META-INF/bootstrap.jar.manifest
+++ apache-tomcat-9.0.82-src/res/META-INF/bootstrap.jar.manifest
@@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
Manifest-Version: 1.0 Manifest-Version: 1.0
Main-Class: org.apache.catalina.startup.Bootstrap Main-Class: org.apache.catalina.startup.Bootstrap

10
tomcat-9.0-sle.catalina.policy.patch
View File

@ -1,8 +1,8 @@
Index: conf/catalina.policy Index: apache-tomcat-9.0.82-src/conf/catalina.policy
=================================================================== ===================================================================
--- conf/catalina.policy.orig --- apache-tomcat-9.0.82-src.orig/conf/catalina.policy
+++ conf/catalina.policy +++ apache-tomcat-9.0.82-src/conf/catalina.policy
@@ -167,6 +167,9 @@ grant { @@ -171,6 +171,9 @@ grant {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
// Precompiled JSPs need access to these packages. // Precompiled JSPs need access to these packages.
@ -12,7 +12,7 @@ Index: conf/catalina.policy
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
permission java.lang.RuntimePermission permission java.lang.RuntimePermission
@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we @@ -220,6 +223,15 @@ grant codeBase "file:${catalina.home}/we
}; };

8
tomcat-9.0-tomcat-users-webapp.patch
View File

@ -1,8 +1,8 @@
Index: conf/tomcat-users.xml Index: apache-tomcat-9.0.82-src/conf/tomcat-users.xml
=================================================================== ===================================================================
--- conf/tomcat-users.xml.orig --- apache-tomcat-9.0.82-src.orig/conf/tomcat-users.xml
+++ conf/tomcat-users.xml +++ apache-tomcat-9.0.82-src/conf/tomcat-users.xml
@@ -41,4 +41,14 @@ @@ -53,4 +53,14 @@
<user username="both" password="<must-be-changed>" roles="tomcat,role1"/> <user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
<user username="role1" password="<must-be-changed>" roles="role1"/> <user username="role1" password="<must-be-changed>" roles="role1"/>
--> -->

5
tomcat.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 23 12:32:49 UTC 2023 - Ricardo Mestre <ricardo.mestre@suse.com>
- replace prep setup and patches macro with autosetup
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 13 11:12:07 UTC 2023 - Fridrich Strba <fstrba@suse.com> Fri Oct 13 11:12:07 UTC 2023 - Fridrich Strba <fstrba@suse.com>

11
tomcat.spec
View File

@ -241,20 +241,11 @@ Requires: jakarta-taglibs-standard >= 1.1
The ROOT and examples web applications for Apache Tomcat The ROOT and examples web applications for Apache Tomcat
%prep %prep
%setup -q -n %{packdname} -b33 %autosetup -p1 -n %{packdname} -b 33
# remove pre-built binaries and windows files # remove pre-built binaries and windows files
find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "*.gz" -o \
-name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete
%patch0
%patch1
%patch2
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
# remove date from docs # remove date from docs
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl