Commit Graph

225 Commits

Author SHA1 Message Date
Coty Sutherland
b14bf8b1a5 Disable failOnWarning so that javadoc won't fail the build 2018-03-15 13:52:10 -04:00
Coty Sutherland
bc28cc3bb0 Rebase to 8.5.29! Finally :) 2018-03-15 12:57:12 -04:00
Igor Gnatenko
8766ecaeb9
Escape macros in %changelog
Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-09 09:06:26 +01:00
Coty Sutherland
cf8509a357 The tomcat-native binary is no longer copied to bin. See http://svn.apache.org/r1818186 for more details 2018-02-01 10:09:27 -05:00
Coty Sutherland
586be331e6 Fix release for rebase 2018-02-01 08:54:42 -05:00
Coty Sutherland
f083e18135 Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/tomcat 2018-02-01 08:52:17 -05:00
Coty Sutherland
d28664612b Update to 8.0.49 2018-02-01 08:48:31 -05:00
Merlin Mathesius
56956f7ea7 Cleanup spec file conditionals 2017-12-12 09:14:28 -06:00
Troy Dawson
83edb0c5e8 Change "zip -u" to "zip"
Resolves: rhbz#1495241 [tomcat] zip -u in spec file causes race condition
2017-10-24 10:12:21 -05:00
Coty Sutherland
f62ae76aa7 Update to 8.0.47
Resolves: rhbz#1497682 CVE-2017-12617 tomcat: Remote Code Execution bypass for CVE-2017-12615
2017-10-04 08:57:15 -04:00
Coty Sutherland
c154cf4359 Adding temporary workaround for add_maven_depmap deprecation 2017-08-21 11:28:50 -04:00
Coty Sutherland
95abd8ee71 Release 1 instead of 2 2017-08-21 10:54:20 -04:00
Coty Sutherland
623e2f2fe0 Resolves: rhbz#1480620 CVE-2017-7674 tomcat: Cache Poisoning 2017-08-21 10:36:47 -04:00
Fedora Release Engineering
ac7bc260a5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 20:25:50 +00:00
Coty Sutherland
85038a7beb Resolves: rhbz#1459160 CVE-2017-5664 tomcat: Security constrained bypass in error page mechanism 2017-06-09 15:39:00 -04:00
Coty Sutherland
ed0c45ddd8 Update to 8.0.43 2017-04-11 09:03:00 -04:00
Coty Sutherland
0f6fb39098 Update to 8.0.42 2017-03-31 09:28:51 -04:00
Coty Sutherland
bcf38b1abe Resolves: rhbz#1403825 CVE-2016-8745 tomcat: information disclosure due to incorrect Processor sharing
Update to 8.0.41
2017-02-16 15:34:48 -05:00
Fedora Release Engineering
e0f6e3167b - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 16:07:14 +00:00
Coty Sutherland
71d81d1e1e Resolves: rhbz#1397493 CVE-2016-6816 CVE-2016-6817 CVE-2016-8735 tomcat: various flaws
Update to 8.0.39
2016-11-29 17:28:09 -05:00
Coty Sutherland
387c0999f6 Update to 8.0.38 2016-10-25 11:04:12 -04:00
Coty Sutherland
ca7279eaa6 I forgot to bump the release 2016-10-23 19:33:16 -04:00
Coty Sutherland
6452f0b23b Resolves: rhbz#1383216 CVE-2016-6325 tomcat: tomcat writable config files allow privilege escalation 2016-10-23 19:11:56 -04:00
Coty Sutherland
ca41eb1168 Resolves: rhbz#1382310 CVE-2016-5425 tomcat: Local privilege escalation via systemd-tmpfiles service 2016-10-13 05:00:29 -04:00
Coty Sutherland
55c043f429 Resolves: rhbz#1370262 catalina.out is no longer in use in the main package, but still gets rotated 2016-09-13 14:44:55 -04:00
Coty Sutherland
fe6d560133 Resolves: rhbz#1375581 CVE-2016-5388 CGI sets environmental variable based on user supplied Proxy request header 2016-09-13 13:03:04 -04:00
Coty Sutherland
d5efee4acc Related: rhbz#1349469 Correct typo in changelog entry 2016-08-11 14:05:55 -04:00
Coty Sutherland
d64bf2e904 Resolves: asfbz#59960 Building javadocs with java8 fails 2016-08-08 17:34:21 -04:00
Coty Sutherland
2b099c582b Resolves: rhbz#1359737 Missing maven depmap for the following artifacts: org.apache.tomcat:tomcat-websocket, org.apache.tomcat:tomcat-websocket-api 2016-08-08 16:38:52 -04:00
Coty Sutherland
ea624b1371 Resolves: rhbz#1341850 tomcat-jsvc.service has TOMCAT_USER value hard-coded 2016-08-08 15:37:15 -04:00
Coty Sutherland
b6ffa60f91 Resolves: rhbz#1341853 rpm -V tomcat fails on /var/log/tomcat/catalina.out 2016-08-08 15:36:36 -04:00
Coty Sutherland
4dc51a6a96 Resolves: rhbz#1347835 The security manager doesn't work correctly (JSPs cannot be compiled) 2016-08-08 15:34:21 -04:00
Coty Sutherland
5d682aa9e1 Resolves: rhbz#1347864 The systemd service unit does not allow tomcat to shut down gracefully 2016-08-08 15:32:57 -04:00
Coty Sutherland
50c91f3fe2 Resolves: rhbz#1349469 CVE-2016-3092 tomcat: Usage of vulnerable FileUpload package can result in denial of service (updates to 8.0.36) 2016-08-08 15:31:26 -04:00
Coty Sutherland
43760819ea Resolves: rhbz#1363884 The tomcat-tool-wrapper script is broken 2016-08-08 15:27:41 -04:00
Coty Sutherland
6bc593d2cc Resolves: rhbz#1364056 The command tomcat-digest doesn't work 2016-08-08 15:25:59 -04:00
Ivan Afonichev
7d21a720d9 Add /etc/tomcat/conf.d/ with shell expansion support, resolves rhbz#1293636 2016-03-02 20:53:07 +03:00
Ivan Afonichev
ef1b76e880 Fix non-service use and default datasource factory
- Load sysconfig from tomcat.conf, resolves: rhbz#1311771, rhbz#1311905
- Set default javax.sql.DataSource factory to apache commons one, resolves rhbz#1214381
- Fix changelog
2016-02-27 18:26:53 +03:00
Ivan Afonichev
d6fc5df332 [rhbz#1308685] Fix symlinks from $CATALINA_HOME/lib perspective 2016-02-21 23:53:01 +03:00
Ivan Afonichev
65e6257e50 Add Recommends: tomcat-native 2016-02-14 01:44:02 +03:00
Ivan Afonichev
7977e008b9 Updated to 8.0.32
- Remove log4j support. It has never been working actually. See rhbz#1236297
2016-02-14 01:08:21 +03:00
Coty Sutherland
669936a5b8 Resolves: rhbz-1302718 Program /bin/nologin does not exist 2016-02-13 23:57:57 +03:00
Coty Sutherland
4f6d837abc Resolves: rhbz#1286800 Failed to start component due to wrong allowLinking=true in context.xml 2016-02-13 23:56:56 +03:00
Fedora Release Engineering
6f36935bb4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-05 01:46:06 +00:00
Robert Scheck
dc47b586d3 CATALINA_OPTS are only read when SECURITY_MANAGER is true (#1147105) 2015-11-17 23:42:26 +01:00
Alexander Kurtakov
872c469097 Update to 8.0.26. 2015-08-27 10:57:42 +03:00
Alexander Kurtakov
3a20f845cd Update to 8.0.24. 2015-07-10 11:07:03 +03:00
Alexander Kurtakov
6d77b87550 Drop javax.el:el-api alias.
XMvn ignores duplicated provides and glassfish-el-api provides it too
but has fewer deps so is better match for default.
2015-06-19 19:36:40 +03:00
Alexander Kurtakov
b2dda77052 Update to 8.0.23. 2015-06-18 15:28:42 +03:00
Alexander Kurtakov
a599bc57f3 Drop jetty alias for servlet.
XMvn ignores duplicate provides so better to drop the jetty alias.
2015-06-18 14:54:27 +03:00
Michal Srb
62f8d6a913 Fix metadata for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} 2015-06-10 07:49:59 +02:00
Alexander Kurtakov
c2e91f9ffc Update to tomcat 8.0.20. 2015-03-06 12:01:37 +02:00
Alexander Kurtakov
07e2fb497b Rebuild against tomcat-taglibs-standard. 2015-03-05 21:46:43 +02:00
Alexander Kurtakov
a7f5683fd0 Drop old provides. 2015-03-04 08:33:30 +02:00
Stephen Gallagher
bdf0d75b2e Bump epoch to maintain upgrade path from Fedora 22 2015-03-03 15:20:56 -05:00
Michal Srb
d6cc435f66 Install POM files for org.apache.tomcat:{tomcat-jni,tomcat-util-scan} 2015-02-16 15:50:26 +01:00
Ivan Afonichev
1001f00e0d Updated to 8.0.18 2015-02-16 00:43:27 +03:00
Ivan Afonichev
53dd1361b3 Updated to 8.0.12
Substitute libnames in catalina-tasks.xml, resolves: rhbz#1126439
Use CATALINA_OPTS only on start, resolves: rhbz#1051194
2014-09-21 04:11:01 +04:00
Michal Srb
be711a2ff6 jsp-api requires el-api
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
2014-06-16 10:30:03 +02:00
Dennis Gilmore
084db1837c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-08 03:44:23 -05:00
Alexander Kurtakov
995a509b88 Fix compile with xmvn 2.0. 2014-06-05 15:29:45 +03:00
Alexander Kurtakov
b5a9b72e6c Update to upstream 7.0.54 - fixes compile with Java 8. 2014-06-05 11:29:46 +03:00
Alexander Kurtakov
7290014b82 Drop servlet/el api provides to reduce user machines ending with both. 2014-05-21 15:16:36 +03:00
Ivan Afonichev
4bbbd3e6c6 Don't provide maven javax.jsp:jsp-api and javax.servlet.jsp:javax.servlet.jsp-api resolves: rhbz#1076949 2014-03-31 00:10:23 +04:00
Ivan Afonichev
e4eaf9df8e Revert "Removed log4j sub-package with bundled log4j (replaced by system symlink)"
This reverts commit 5746174c03.

Conflicts:
	tomcat6.spec
2014-03-28 02:46:09 +04:00
Ivan Afonichev
cee7beed0a Updated to 7.0.52
- Rewrite jsvc implementation, resolves: rhbz#1051743
- Switch to java-headless R, resolves: rhbz#1068566
- Create and own %{_localstatedir}/lib/tomcats, resolves: rhbz#1026741
- Add pom for tomcat-jdbc, resolves: rhbz#1011003
2014-03-26 03:34:21 +04:00
Mikolaj Izdebski
22a6d96475 Fix installation of Maven metadata for tomcat-juli.jar
- Resolves: rhbz#1033664
2014-01-21 15:02:19 +01:00
Stanislav Ochotnicky
3b876f481c Rebuild for bug #1033664 2014-01-15 14:51:06 +01:00
Ivan Afonichev
2e1950e71c Updated to 7.0.47
Fix java.security.policy
2013-11-04 00:04:06 +04:00
Dennis Gilmore
53df09c777 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 23:17:53 -05:00
Ivan Afonichev
1ff9d5ff80 Remove jpackage-utils R 2013-07-12 00:44:06 +04:00
squallsama
4bc1f14d04 update to 7.0.42 2013-07-11 12:31:04 +03:00
Paul P. Komkoff
0543334466 Enable multiple instances on same installation.
This keeps the default tomcat.service unchanged (except for internals),
and adds template for tomcat@name.service services.

In the new world, if you need an instance, you'll create a directory
/var/lib/tomcats/name, create {conf temp work webapps} in it, and then
systemctl enable tomcat@name.service.

This commit doesn't contain anything related to jsvc.
2013-06-11 21:35:03 +04:00
Ivan Afonichev
004db978af Remove ant-nodeps BR 2013-05-11 21:08:22 +04:00
Ivan Afonichev
06021af326 Fix changelog order 2013-05-11 20:17:45 +04:00
Ivan Afonichev
b7e10ec545 Merge branch 'f18' of ssh://pkgs.fedoraproject.org/tomcat into f19
Conflicts:
	tomcat.spec
2013-05-11 19:51:28 +04:00
Ivan Afonichev
6df24b614d Updated to 7.0.40
Resolves: rhbz 956569 added missing commons-pool link

Conflicts:
	sources
	tomcat.spec
2013-05-11 19:28:01 +04:00
Ivan Afonichev
9c1682a1b2 Updated to 7.0.39 2013-03-29 00:57:39 +04:00
Mikolaj Izdebski
9b14c45888 Add depmaps for org.eclipse.jetty.orbit
- Resolves: rhbz#917626
2013-03-04 15:16:21 +01:00
Ivan Afonichev
c9c2c4a8ba Updated to 7.0.37 2013-02-20 01:28:28 +04:00
Ivan Afonichev
b2b5f77833 Updated to 7.0.35
systemd SuccessExitStatus=143 for proper stop exit code processing
2013-02-04 02:29:10 +04:00
Ivan Afonichev
40dbe1d286 Add ecj epoch 2013-02-04 01:58:19 +04:00
Ivan Afonichev
a91e144155 Updated to 7.0.34
- ecj >= 4.2.1 now required
- Resolves: rhbz 889395 concat classpath correctly; chdir to $CATALINA_HOME
2012-12-24 02:24:16 +04:00
Ivan Afonichev
50ce272e2f Resolves: rhbz 883806 refix logdir ownership 2012-12-08 00:35:45 +04:00
Ivan Afonichev
7b951af810 Updated to 7.0.33
- Resolves: rhbz 873620 need chkconfig for update-alternatives
2012-12-02 02:20:24 +04:00
Ivan Afonichev
ad8bfffe2f - Updated to 7.0.32
- Resolves: rhbz 842620 symlinks to taglibs
2012-10-17 02:28:32 +04:00
Ivan Afonichev
18fb32c606 - Updated to 7.0.29
- Add pidfile as tmpfile
- Use systemd for running as unprivileged user
- Resolves: rhbz 847751 upgrade path was broken
- Resolves: rhbz 850343 use new systemd-rpm macros

Merge branch 'f17' of ssh://pkgs.fedoraproject.org/tomcat

Conflicts:
	tomcat.spec
2012-08-25 01:48:20 +04:00
Ivan Afonichev
5955ecc8dd Updated to 7.0.29 2012-07-26 00:43:31 +04:00
Dennis Gilmore
24d9982b34 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-21 18:44:00 -05:00
Ivan Afonichev
c29844a941 Updated to 7.0.28
Resolves: rhbz 820119 Remove bundled apache-commons-dbcp
Resolves: rhbz 814900 Added tomcat-coyote POM
Resolves: rhbz 810775 Remove systemv stuff from %post scriptlet
Remove redhat-lsb R
2012-07-02 02:42:34 +04:00
Ivan Afonichev
607cf32755 Fix tomcat-native check 2012-04-10 01:07:18 +04:00
Ivan Afonichev
ceaa841e80 Fixed native download hack 2012-04-09 02:04:25 +04:00
Ivan Afonichev
4133172860 - Updated to 7.0.27
- Fixed jakarta-taglibs-standard BR and R
2012-04-08 00:39:19 +04:00
Ivan Afonichev
d0ed2d74c2 Merge pom changes 2012-04-07 02:12:32 +04:00
Juan Hernandez
907740188d Add POM files for tomcat-api and tomcat-util (#803495)
Signed-off-by: Ivan Afonichev <ivan.afonichev@gmail.com>
2012-04-07 02:01:56 +04:00
Stanislav Ochotnicky
37c11cfb2c Add more depmaps to J2EE apis to help jetty/glassfish updates 2012-03-21 17:15:10 +01:00
Ivan Afonichev
5d4b042f0c Updated to 7.0.26
Bug 790334: Change ownership of logdir for logrotate
2012-02-22 21:16:21 +04:00
Krzysztof Daniel
38aa2517e8 Bug 790694: Priorities of jsp, servlet and el packages updated. 2012-02-16 09:15:36 +01:00
Krzysztof Daniel
1daf3ea73c Dropped indirect dependency to tomcat5. 2012-02-08 12:01:47 +01:00
Ivan Afonichev
56bee3dd5e Added hack for maven depmap of tomcat-juli absolute link [ -f ] pass correctly 2012-01-22 03:47:15 +04:00
Ivan Afonichev
a7d085a852 - Updated to 7.0.25
- Removed EntityResolver patch (changes already in upstream sources)
- Place poms and depmaps in the same package as jars
- Added javax.servlet.descriptor to export-package of servlet-api
- Move several chkconfig actions and reqs to systemv subpackage
- New maven depmaps generation method
- Add patch to support java7. (patch sent upstream).
- Require java >= 1:1.6.0
2012-01-22 01:52:19 +04:00
Ivan Afonichev
4bfdca2593 Added Krzysztof's changes to changelog 2012-01-21 22:46:52 +04:00
Ivan Afonichev
94b7c9627f Move jsvc support to subpackage 2012-01-12 02:58:04 +04:00
Ivan Afonichev
86b2d177cf Fix Merge 2012-01-12 01:55:49 +04:00
Joseph D. Wagner
a4cdf56b82 support jsvc for starting tomcat 2012-01-12 01:28:30 +04:00
Alexander Kurtakov
2178fabdb4 Add EntityResolver setter patch to jasper for jetty's need. (patch sent
upstream).
2012-01-11 12:40:54 +02:00
Ivan Afonichev
4cfe7cc5cd Updated to 7.0.23 2011-11-28 21:30:16 +04:00
Ivan Afonichev
ddfc98c4f4 +- Drop %%update_maven_depmap as in tomcat6
+- Provide native systemd unit file ported from tomcat6
2011-11-11 01:48:56 +04:00
Roland Grunberg
4b23f91d22 Move tomcat-juli.jar to lib package 2011-11-10 22:44:19 +04:00
Ivan Afonichev
7998554215 Updated to 7.0.22 2011-10-06 01:06:06 +04:00
Rex Dieter
8c286ad89d rebuild (java), rel-eng#4932 2011-10-03 15:07:17 -05:00
Ivan Afonichev
2c71edb76a Fix basedir mode (Fixes Bug 741250) 2011-09-26 21:37:13 +04:00
Roland Grunberg
46a16ccb3a Add manifests for el-api, jasper-el, jasper, tomcat, and tomcat-juli.
Signed-off-by: Ivan Afonichev <ivan.afonichev@gmail.com>
2011-09-26 21:20:17 +04:00
Ivan Afonichev
5e7f3dea1b Updated to 7.0.21 2011-09-08 00:14:46 +04:00
Ivan Afonichev
31375978bd Require java = 1:1.6.0 2011-08-16 00:22:02 +04:00
Ivan Afonichev
009133147f Require java < 1.7.0 2011-08-15 23:28:31 +04:00
Ivan Afonichev
f0cf232913 Updated to 7.0.20 2011-08-15 21:27:41 +04:00
Ivan Afonichev
d07c057684 Updated to 7.0.19 2011-07-26 21:54:26 +04:00
Ivan Afonichev
bdc086f385 Updated to 7.0.16 2011-06-21 01:15:48 +04:00
Ivan Afonichev
ca271e5d85 - Added initial systemd service
- Fix some paths
2011-06-07 01:23:05 +04:00
Ivan Afonichev
5f0fcd834e - Fixed http source link
- Securify some permissions
- Added licenses for el-api and servlet-api
- Added dependency on jpackage-utils for the javadoc subpackage
2011-05-21 01:44:00 +04:00
Ivan Afonichev
b44b78b8a3 Switched to 7.0.14 2011-05-14 17:49:50 +04:00
Ivan Afonichev
31d304e3da - Provided local paths for libs
- Fixed dependencies
- Fixed update temp/work cleanup
2011-05-05 01:42:20 +04:00
Ivan Afonichev
468fdbab7f - Fixed package groups
- Fixed some permissions
- Fixed some links
- Removed old tomcat6 crap
2011-05-02 02:09:32 +04:00
Ivan Afonichev
5b34837704 - Package now named just tomcat instead of tomcat7
- Removed Provides:  %{name}-log4j
- Switched to apache-commons-* names instead of jakarta-commons-* .
- Remove the old changelog
- BR/R java >= 1:1.6.0 , same for java-devel
- Removed old tomcat6 crap
2011-04-28 09:35:45 +04:00