Please mark also the following files as sample since they may be changed by the user, in fact, I have swapped authentication and roles for our manager installation and the daily report nags for wrong checksums. %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml This also applies to the other Tomcat ports.
Created attachment 195379 [details] Added requested files as samples and made small refactoring in Makefile Added requested files as samples and made small refactoring in Makefile. 8.5.32 coming soon.
(In reply to Michael Osipov from comment #0) > This also applies to the other Tomcat ports. I'm maintainer of the tomcat85 and tomcat9 only. Patch for the tomcat9 is here: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229973. Waiting somebody with commit bit to commit it. But I can't change other ports and the maintainer of the tomcat6/7/8 is low active - there is a patch for more than year without any response: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=218865.
(In reply to VVD from comment #2) Looks awesome. Thank you. There is no need to update/maintain Tomcat 6.0.x and Tomcat 8.0.x there are depreated/unmaintained anymore. Tomcat 7.0/8.5/9.0 are the only ones to go. PS: I am a Tomcat committer.
> There is no need to update/maintain Tomcat 6.0.x and Tomcat 8.0.x there are depreated/unmaintained anymore. Yes, but tomcat 6 and 8.0 are still exist in ports and no EXPIRATION_DATE set yet for both. And probably there are users of both. > PS: I am a Tomcat committer. BTW, are 9.0.11 and 8.5.33 soon? [-:
(In reply to VVD from comment #4) Given that 8.5.32 has been published a months ago and all known CVEs have been fixed, I don't expect anything before mid August, if not later.
A commit references this bug: Author: swills Date: Thu Jul 26 16:12:05 UTC 2018 New revision: 475384 URL: https://svnweb.freebsd.org/changeset/ports/475384 Log: www/tomcat85: mark additional config files with @sample PR: 229102 Submitted by: VVD <vvd@unislabs.com> (maintainer) Reported by: Michael Osipov <1983-01-06@gmx.net> Changes: head/www/tomcat85/Makefile head/www/tomcat85/pkg-plist
Committed, thanks!
Created attachment 195562 [details] Fixed use of @samle in optional components Found bug in last patch and fixed it.
Created attachment 195590 [details] Fixed use of @samle in optional components Updated PORTREVISION.
pkg-plist needs to be fixed
Last patch fixed (In reply to Danilo G. Baio from comment #10) > pkg-plist needs to be fixed Last patch fixed it.
Ping! It's fixed - commit my last patch.
A commit references this bug: Author: dbaio Date: Sun Aug 5 20:11:50 UTC 2018 New revision: 476471 URL: https://svnweb.freebsd.org/changeset/ports/476471 Log: www/tomcat85: Fix plist when using options HOST_MANAGER and MANAGER PR: 229102 Submitted by: VVD <vvd@unislabs.com> (maintainer) Changes: head/www/tomcat85/Makefile head/www/tomcat85/pkg-plist
Done, thanks!
A commit references this bug: Author: dbaio Date: Sat Aug 25 19:27:58 UTC 2018 New revision: 478084 URL: https://svnweb.freebsd.org/changeset/ports/478084 Log: www/tomcat[6|7|8]: Bring improvements from Tomcat[85|9] - Add options [1] Based on Apache Tomcat documentation guidance, the default web applications have varying degrees of risk, these options will permit users to select which of the web applications should be installed. - Remove start_precmd from rcfile in Tomcat7 and Tomcat8 [2] This is not being used, users can use ${name}_env to pass variables - Mark additional config files as @sample [3] PR: 218865 [1] PR: 228418 [2] PR: 229102 [3] Submitted by: Matt <fsbruva@yahoo.com> [1] Submitted by: VVD <vvd@unislabs.com> [2] [3] Reported by: Michael Osipov <1983-01-06@gmx.net> [2] [3] Approved by: maintainer timeout (ale, > 3 weeks) Differential Revision: https://reviews.freebsd.org/D16499 Changes: head/www/tomcat6/Makefile head/www/tomcat6/pkg-plist head/www/tomcat7/Makefile head/www/tomcat7/files/tomcat7.in head/www/tomcat7/pkg-plist head/www/tomcat8/Makefile head/www/tomcat8/files/tomcat8.in head/www/tomcat8/pkg-plist