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

Accepting request 448470 from Java:packages

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/448470
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2017-01-10 09:45:47 +00:00 committed by Git OBS Bridge
commit 259a3d3e67
9 changed files with 143 additions and 1057 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache-tomcat-8.0.36-src.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:36db67592adda575fc08dd5f0cd3532934d2edb117028e29bdd9f702bf31ab10
size 4988679

17
apache-tomcat-8.0.36-src.tar.gz.asc
View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJXWXaiAAoJEBDAHFovYFnnd+UP/jC73o3TxuIwRbds2l0mQBLR
uNoqysPJxl0B1dMKt10+9A6Bb24GG4P/SU9Qm6ahzAhZLYYuPyuEl6c4UPRtBfkM
Pwy9Wv+ftARybPNvzFYxBFh1QEu1pI0/qeruCQMr0gdiKVI/G82udm4WYuuWD9Ov
/z4rc03ytVg71ezlpZ/1vvj/4IPSZLUwherHEQKp4Pr++ilz/BYRALqVZoUGUz0Q
Ya5HFbdGUK6aCxAW3Ug3HhekN9Dc6drSUSIhTTA8S0lUOdpk9BOWKSYbckUu6rNm
DTH0yT+7kBewgADfKkKTHfsKRGLPPH9rfGva5atvJWP+sMb6AQI992M1FyC9vJOD
ZNR45stptfI9G6KpYvw8/eVrR/Z5JQwVrkb2qmdHOsjuOGvtbfL5mbHPh4v7LShu
ODO7YFA365tj9xpwdgRaVxQKtkBemQyz7rJ+pQ4cMYnL5CWFw/UNkRobBBpjoMMZ
fUAc7wjgy5gD2/jWf+MVIC1JDlIfggXfMUxRC16/288C/xktaQ8vVTAAc8N7iCQT
ZSLVJTz1yd87/hfKRlUEIPHwKgr5sBLP+aUdEk6IFBWpsIY2TbZkWWr8kz8RKnCA
aR+sda99xC4//rDMRMFjaFiSBb60c57+8OZP3bvEojsSlhWypIA3oExkA4+D0/cS
xdePdPLMBsQd8u/UD1+V
=NYlx
-----END PGP SIGNATURE-----

3
apache-tomcat-8.0.39-src.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:566bf43a50f42af9c5b46be60f68e571a56c41f8e93647cf9f68e5f93870be96
size 5019148

17
apache-tomcat-8.0.39-src.tar.gz.asc Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCgAGBQJYIuU/AAoJECCLCrHWMBHH1usP/iTtFh9NCCs9bm+NIegril6O
+leAntUGTKwNex55CmhWIjPt3qR3211FpJyfzOuwE/gNzNqRJcSOi+YwDKBhdw7b
qj6wtCTARHzo26hmFhxYVuXNMKIiWKHCX6x2Hfs4JoRtsM+GAMO6ZvBJ5QnDDni0
ShtTZiMUvCb6LvCO2KLG2QKYD521SRQhIjhAb9jxuPL2pZ0qa0GttTeBcUxdVToT
kV+s8ueT5MMwijqbhDHIrRfuqTvAyYFi5utzoNtp3T5Ee2SZ4WVwJ15xgOrCpePI
S9iN75yV5mjrFchyekzQmFht/8r4Pfw9wbzu9z4RHxQSMZypPT4ILBTF/kQcFeBY
rzHXTeMXQJqgSGRI7ek7yCzJ7ZRhgoaZQZp2XDuEynoYp7PYDaE4rj63Mh+zrzKv
zgDbtBmpGU2FQBh+vZWUrmdMxCBa0umLKXwgtdfv7iXI6JNWDcnmlB/fw7gk0qyL
rIEZPLLxog+etY7xGeshmpnJiIkdik4C3aLPx8E5kDo8lGsY6Ixz3XJgu3dUJhnO
ASvKpGSzb3tJMNPt/w3HelVBG2Giz/0ZJUvFwvc62d4g2G2VnlcLJj6kTxlwIDcj
dDxcC3TqXaBZo5Cerc+qTlJAPDBe9wKMsQzEcPmhMifNhfnz8GdlRamL5phqMZpp
eyQ9Ce/df9TxmOFxKE0r
=cVEt
-----END PGP SIGNATURE-----

27
tomcat-7.0-sle.catalina.policy.patch
View File

@ -1,7 +1,8 @@
diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-src.new/conf/catalina.policy
--- apache-tomcat-7.0.55-src/conf/catalina.policy 2014-07-18 16:49:04.000000000 +0200
+++ apache-tomcat-7.0.55-src.new/conf/catalina.policy 2014-09-16 17:49:07.963129705 +0200
@@ -95,6 +95,7 @@
Index: apache-tomcat-8.0.39-src/conf/catalina.policy
===================================================================
--- apache-tomcat-8.0.39-src.orig/conf/catalina.policy 2016-11-09 09:57:55.000000000 +0100
+++ apache-tomcat-8.0.39-src/conf/catalina.policy 2016-12-21 22:48:00.587422333 +0100
@@ -100,6 +100,7 @@ grant codeBase "file:${catalina.home}/bi
// ${file.separator}classes${file.separator}logging.properties", "read";
};
@ -9,7 +10,7 @@ diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-sr
// These permissions apply to the server startup code
grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
permission java.security.AllPermission;
@@ -107,7 +108,6 @@
@@ -112,7 +113,6 @@ grant codeBase "file:${catalina.home}/li
permission java.security.AllPermission;
};
@ -17,7 +18,7 @@ diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-sr
// If using a per instance lib directory, i.e. ${catalina.base}/lib,
// then the following permission will need to be uncommented
// grant codeBase "file:${catalina.base}/lib/-" {
@@ -162,6 +162,9 @@
@@ -167,6 +167,9 @@ grant {
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
// Precompiled JSPs need access to these packages.
@ -27,7 +28,7 @@ diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-sr
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
permission java.lang.RuntimePermission
@@ -214,6 +217,15 @@
@@ -216,6 +219,15 @@ grant codeBase "file:${catalina.home}/we
permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.util";
};
@ -43,8 +44,18 @@ diff -Naur apache-tomcat-7.0.55-src/conf/catalina.policy apache-tomcat-7.0.55-sr
// You can assign additional permissions to particular web applications by
// adding additional "grant" entries here, based on the code base for that
// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
@@ -245,4 +257,3 @@
@@ -247,7 +259,6 @@ grant codeBase "file:${catalina.home}/we
// grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
// permission java.net.SocketPermission "*.noaa.gov:80", "connect";
// };
-
// To grant permissions for web applications using packed WAR files, use the
// Tomcat specific WAR url scheme.
//
@@ -257,4 +268,4 @@ grant codeBase "file:${catalina.home}/we
//
// The permissions granted to a specific JAR
// grant codeBase "war:file:${catalina.base}/webapps/examples.war*/WEB-INF/lib/foo.jar" {
-// };
\ No newline at end of file
+// };

21
tomcat-8.0.36-jar-scanner-loop.patch
View File

@ -1,21 +0,0 @@
diff --git a/java/org/apache/tomcat/util/scan/StandardJarScanner.java b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
index a217571..992eb88 100644
--- a/java/org/apache/tomcat/util/scan/StandardJarScanner.java
+++ b/java/org/apache/tomcat/util/scan/StandardJarScanner.java
@@ -269,6 +269,7 @@ public class StandardJarScanner implements JarScanner {
log.debug(sm.getString("jarScan.classloaderJarScan", url));
}
try {
+ processedURLs.add(url);
process(scanType, callback, url, null, isWebapp, classPathUrlsToProcess);
} catch (IOException ioe) {
log.warn(sm.getString("jarScan.classloaderFail", url), ioe);
@@ -412,7 +413,7 @@ public class StandardJarScanner implements JarScanner {
public ClassPathEntry(URL url) {
String path = url.getPath();
- int end = path.indexOf(Constants.JAR_EXT);
+ int end = path.lastIndexOf(Constants.JAR_EXT);
if (end != -1) {
jar = true;
int start = path.lastIndexOf('/', end);

16
tomcat.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Dec 21 21:49:10 UTC 2016 - astieger@suse.com
- update to 8.0.39: (boo#1003911)
* Improve handling of I/O errors with async processing
* Fail earlier on invalid HTTP request
- includes changes from 8.0.38:
* Refactoring the non-container thread Async complete()/dispatch()
handling to remove the possibility of deadlock
* Improved UTF-8 handling for the RewriteValve
- includes changes from 8.0.37:
* Treat paths used to obtain a request dispatcher as encoded
(configurable)
* Various jdbc-pool fixes
- drop tomcat-8.0.36-jar-scanner-loop.patch, upstream
-------------------------------------------------------------------
Thu Sep 29 12:26:30 UTC 2016 - tchvatal@suse.com

1091
tomcat.keyring
View File

File diff suppressed because it is too large Load Diff

5
tomcat.spec
View File

@ -22,7 +22,7 @@
%define elspec 3.0
%define major_version 8
%define minor_version 0
%define micro_version 36
%define micro_version 39
%define packdname apache-tomcat-%{version}-src
# FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
%global basedir /srv/%{name}
@ -77,8 +77,6 @@ Patch2: tomcat-8.0.9-property-build.windows.patch
Patch3: tomcat-8.0.33-JDTCompiler-java.patch
# PATCH-FIX-SLE: Change security manager default policies bnc#891264
Patch4: tomcat-7.0-sle.catalina.policy.patch
# PATCH-FIX-SLE: SLES 12 SP2 tomcat8.0.36 rpms are not working properly mainly while compiling JSP's with org.apache.jasper.JspC class (bnc#993862)
Patch5: tomcat-8.0.36-jar-scanner-loop.patch
BuildRequires: ant >= 1.8.1
BuildRequires: ant-antlr
BuildRequires: apache-commons-collections
@ -244,7 +242,6 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch2 -p1
%patch3
%patch4 -p1
%patch5 -p1
# remove date from docs
sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl