Commit graph

64 commits

Author SHA1 Message Date
Sam Lawrance
b79dc1999f - Make sure the rc script creates and chowns the PID file before running
'daemon'.  No need for the port to create a PID file at install time
  (it would just be eaten by rc.d/cleanvar anyway).
- Use 'ps -o comm' to grab a suitable procname.  'ps -o command' is not
  reliable enough.
- Bump PORTREVISION since these changes fix broken rc script operation.

Approved by:	maintainer timeout (as part of previous update)
2006-02-08 13:35:17 +00:00
Sam Lawrance
314fa7a3d9 Since the procname of tomcat processes may vary due to javavmwrapper,
subvert the 'check_pid_file' procname check by setting it from the output
of 'ps'.

Remove the previous attempt at handling this problem, which was to put
a wildcard in procname.  I'll wear my pointy hat for that bogus hack.

Reported by:	Fritz Heinrichmeyer <Fritz.Heinrichmeyer@FernUni-Hagen.de>
2006-02-07 13:41:00 +00:00
Sam Lawrance
a0156c5c5b Clean up Tomcat 4, 4.1, 5, and 5.5 ports.
These changes apply to all ports, unless mentioned otherwise:

- Move jakarta-tomcat55 to tomcat55 (it is no longer a Jakarta project). [6]
- Improve the tomcat55 rc script.  Fix PID handling.  Improve the
  shutdown process.  Use USE_RC_SUBR to its full potential. [2]
- Backport tomcat55 rc script to the other tomcat ports.  This allows
  us to pass command line arguments to the JVM.  Noted in UPDATING.
  [1], [3], [4]
- Change ownership of installed files.  All files are now installed
  with default uid/gid (root:wheel) except for those in the conf/, logs/,
  temp/ and work/ directories. [5]
- No longer install tomcatXXctl binary.  rc scripts are more flexible
  and can be reconfigured without recompiling.
- Remove AUTO_START and STOP_TIMEOUT (replaced with rc tomcatXX_stop_timeout).
- Remove a long list of sed expressions in favour of SUB_LIST.
- Move pkg_{,de}install to files/pkg_{,de}install.in.  Add them to
  SUB_FILES.  Tidy up substitutions and remove hardcoded values.
- Some nonfunctional tidying and removal of Makefile cruft.

PR:		ports/38018 [1], ports/38020 [2], ports/74344 [3],
		ports/75143 [4], ports/83434 [5], ports/92692 [6]
Submitted by:	Ari Suutari <ari.suutari@syncrontech.com> [1] [2],
		SimpleRezo Team <freebsd@simplerezo.com> [3],
		Anton Yudin <toha@toha.org.ua> [4],
		Jan Grant <jan.grant@bristol.ac.uk> [5],
		lawrance [6]
Approved by:	Kang Liu <liukang@cn.freebsd.org> (maintainer) [6]
		Maintainer timeouts on [1], [2], [3], [4], [5]
Big thanks to:	hq for the initial tomcat55 script
		jasonb on FreeNode #tomcat for packaging advice
2006-02-07 08:50:09 +00:00
Herve Quiroz
9529a8acdc - Fix a patching problem in Tomcat ports
- Add a patch-dependency on jakarta-tomcat4

PR:		79052
Submitted by:	maintainer
Obtained from:	des (for jakarta-tomcat41)
2005-03-21 00:08:05 +00:00
Kirill Ponomarev
0c08ac6ac1 Remove hardcoded WRKDIRPREFIX.
Proposed by:	des
2005-03-19 18:44:29 +00:00
Herve Quiroz
adb71ad85d - Back up config files during deinstall
- Use ECHO_MSG rather than ECHO_CMD

PR:		43565
Submitted by:	maintainer, Brent Verner <brent@rcfile.org>
2004-12-19 04:04:26 +00:00
Herve Quiroz
dc02f52de0 - Update to version 4.1.31 [1]
- Update to bsd.java.mk 2.0 [1]
- Use MASTER_SITE_JAKARTA [1]
- Improved filename of manpage in Makefile [1]
- Added $FreeBSD$ tags where missing

PR:		74705 [1]
Submitted by:	maintainer [1]
2004-12-06 02:35:41 +00:00
Herve Quiroz
d32a583dd8 Assign all Jakarta Tomcat ports to the same maintainer, Kang Liu (already
maintainer of www/jakarta-tomcat5).
2004-12-03 14:20:04 +00:00
Herve Quiroz
e868aeb5e7 Reset znerd's ports maintainership:
- All JDK ports (and JDK documentation ports) that were formerly maintained by
  znerd have been assigned to java@FreeBSD.org
- I will handle some of the remaining ports (jakarta-commons-*, jdom, xalan-j
  and xmlenc)
- Everything else is reset to ports@FreeBSD.org

Approved by:	znerd (maintainer)
2004-12-03 01:01:33 +00:00
Ernst de Haan
ba82dd52df Set LATEST_LINK to ${APP_SHORTNAME}. LATEST_LINK was
previously already set to jakarta-tomcat[VERSION], but this
was not consistent with the jakarta-tomcat5 port.

PR:		63210
Submitted by:	Kang Liu <liukang@bjpu.edu.cn>
2004-04-03 11:22:22 +00:00
Ernst de Haan
3df24cd6c4 Update to Tomcat 4.1.30. 2004-03-08 10:06:08 +00:00
Ernst de Haan
9b953b2624 Set LATEST_LINK.
Reported by:	kris
2004-03-08 09:50:08 +00:00
Ernst de Haan
4c6b96197f Fixed name of PID file in pkg-deinstall.
Bumped PORTREVISION.

PR:		60781
Submitted by:	Kang Liu <liukang@bjpu.edu.cn>
2004-01-02 12:31:11 +00:00
Ernst de Haan
78f80cdd8f Fixed the MASTER_SITES.
Approved by:	portmgr (adamw)
2003-11-27 08:35:02 +00:00
Ernst de Haan
5278339f94 Fix last commit. PORTVERSION should be 4.1.29, not 4.1.27.
Noticed by:	ve@hardcore.lt
2003-11-21 12:14:02 +00:00
Trevor Johnson
f725dc8ef5 Use the FIND and XARGS macros introduced in bsd.port.mk 1.391. 2003-11-13 12:54:57 +00:00
Ernst de Haan
625625d0d3 Update to 4.1.27.
Tomcat 4.1.27 includes security fixes for:
. improper recycling of SSL client certificates with Coyote JK 2
. improper handling of invalid content lengths in requests, causing
  HTTP processors to be left in an invalid state in Coyote HTTP/1.1,
  causing a DoS condition
. URI normalization bug in Coyote
. improper handling of certain URLs in Coyote JK 2, causing a DoS
  condition

PR:		55362
Submitted by:	Kang Liu <lazykang@hotmail.com>
2003-08-11 11:00:04 +00:00
Ernst de Haan
eda40f3947 Upgrade to 4.1.24.
PR:		50241
Requested by:	Tony Harverson <Tony@epages.net>
		Jason Jenkins <socrates73@hotmail.com>
2003-03-27 07:35:34 +00:00
Ade Lovett
7e52725f2a Clear moonlight beckons.
Requiem mors pacem pkg-comment,
And be calm ports tree.

E Nomini Patri, E Fili, E Spiritu Sancti.
2003-03-07 06:14:21 +00:00
Ernst de Haan
4d0a685fbb Update to 4.1.18. 2003-01-03 14:03:32 +00:00
Ernst de Haan
aa1f22138c Fixed daemonctl control program to work with the FreeBSD JDK 1.3.1.
The fix consists of 2 lines at the beginning of the program:

	setuid(geteuid());
	setgid(getegid());

Bumped PORTREVISION of Orion, Tomcat and JBoss ports.

PR:		40470, 43679
Submitted by:	Ari Suutari <ari.suutari@syncrontech.com>
Reviewed by:	audit
Approved by:	Silence on -audit (since Sept 13, 2002)
2002-10-09 23:10:32 +00:00
Ernst de Haan
054458fd11 Changed target installation directory so it does not include
the minor version number anymore.

Bumped PORTREVISION.

PR:		43565
Requested by:	Andrew Gerweck <andy@gerweck.dyndns.org>
2002-10-09 22:37:54 +00:00
Ernst de Haan
30b7c3be35 Security fix: Upgrade to 4.1.12.
PR:	43504
2002-09-30 12:40:59 +00:00
Ernst de Haan
9a8fc42bf7 Upgrade to Tomcat 4.1.10 (stable). 2002-09-11 13:49:19 +00:00
Ernst de Haan
6844be8d51 New port: Jakarta Tomcat 4.1. This port is based on the Tomcat 4
port.
2002-09-03 09:47:01 +00:00
Ernst de Haan
cee03dba7d Changed WRKDIR definition. It is changed from
${.CURDIR}/work to ${WRKDIRPREFIX}${.CURDIR}/work.

PR:		39593
2002-08-10 10:42:48 +00:00
Ernst de Haan
e5490f30ef Improved the post-installation message.
Requested by:	phantom
2002-06-25 15:12:50 +00:00
Ernst de Haan
571a6e66a6 Upgrade to Tomcat 4.0.4.
For release notes, see:
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v4.0.4/RELEASE-NOTES
2002-06-24 07:17:40 +00:00
Ernst de Haan
156b71b59f Changed daemonctl program to check if the JAR file exists before
trying to start the JVM. This is a serious usability improvement.
Bumped PORTREVISION.
2002-05-08 22:00:04 +00:00
Ernst de Haan
15db7d6349 Improved the startup script. Always displaying a space first
before the name of the application being started/stopped. The
advantage is that if there is an error, then the message will
have a space prepended instead of being appended to the previous
application name.
When the application is 'stop'ped, the error messages, if any,
are now hidden. Instead the name of the application is just
shown.
Bumped PORTREVISION.
2002-05-08 21:54:06 +00:00
Ernst de Haan
98af9f9735 Now using generic startup.sh and daemonctl.c that will be
shared among other ports, like www/orion, www/jboss2 and
www/jakarta-tomcat3.

Now displaying installation settings in pre-patch phase.
Customizing files using ${SED} in post-patch phase.

Furthermore some small changes to promote consistency and
genericity. I'm attempting to make the result of

   $ diff -ruN --exclude=CVS jakarta-tomcat3 jakarta-tomcat4

as small as possible.

Bumped PORTREVISION to help portupgrade in doing what it
does best ;)
2002-04-15 21:34:42 +00:00
Ernst de Haan
d0d77b1ada Daemon control program now checks if process is really
terminated. If not, it will send the process a SIGKILL
after a certain time-out period. The time-out can be
passed to the port Makefile as a parameter.

Improved documentation a bit here and there.

Added some explicit casts to make lint(1) a bit
happier :-)

Applied some refactoring here and there. Moved some
functionality into a new function 'existsProcess'.

Slightly changed the output of the program.

Bumped PORTREVISION.
2002-04-08 21:50:23 +00:00
Ernst de Haan
f50f786a29 Made the daemon control program less verbose.
Bumped PORTREVISION.

Prompted by:	Kees Jan Koster <K.J.Koster@kpn.com>
2002-04-08 19:19:32 +00:00
Ernst de Haan
77a1003364 Now installs the shell scripts as well. They were previously
not installed because there was the control program tomcat4ctl
already. For some instances, however, tomcat4ctl is not
powerful enough. For instance when setting up multiple
instances of Tomcat, see
http://jakarta.apache.org/tomcat/tomcat-4.0-doc/RUNNING.txt.

Also added tools.jar to pkg-plist. It should have been added
previously.

Bumped PORTREVISION.

Prompted by:	Gavin Cameron <gavin@itworks.com.au>
2002-04-06 20:16:21 +00:00
Ernst de Haan
411b78699b Fixed a problem where the extracted files would
sometimes (?) be looked for in the directory
'work/work' instead of just 'work'.
Bumped PORTREVISION.
2002-04-04 22:48:18 +00:00
Ernst de Haan
92502db7fc Creating symlink to tools.jar. Bumped PORTREVISION.
Prompted by:	Calvin NG <calvinng@brel.com>
2002-04-04 22:03:26 +00:00
Ernst de Haan
2684781e36 Minor cleanup. 2002-04-03 21:28:50 +00:00
Ernst de Haan
d0f2cbece8 Now checking for the Java VM too in the control
program. Bumped PORTREVISION.
2002-04-03 20:42:07 +00:00
Ernst de Haan
144c6b62ca Little generalization and cleanup. Nothing
spectacular. Not bumped PORTREVISION.
2002-04-03 19:49:27 +00:00
Ernst de Haan
2297db65d5 Upgrade to Jakarta Tomcat 4.0.3. The Jakarta Tomcat 3
branch has moved to www/jakarta-tomcat3.

PR:	31096, 32022
2002-04-01 22:01:22 +00:00
Ernst de Haan
91dae29ec0 Changed a message to make it more generic. 2002-03-30 21:08:55 +00:00
Ernst de Haan
9380d814ea Replacing the man page title (in capitals) in order
to make the man page fully generic for jakarta-tomcat,
jakarta-tomcat4, orion and possibly others.

PORTREVISION is not bumped, since the resulting man
page is exactly the same.
2002-03-30 19:53:18 +00:00
Ernst de Haan
f8b311d639 Now replacing STARTUP_SCRIPT in man page. Bumped PORTREVISION again. 2002-03-30 18:51:01 +00:00
Ernst de Haan
fb6cc4416b Stopping the server from pkg-deinstall. Applying
replacements to server.xml. Bumped PORTREVISION.
2002-03-30 18:42:23 +00:00
Ernst de Haan
784972ffc4 Removed reference to workers.properties since it no
longer exists. Bumped PORTREVISION.
2002-03-30 18:15:21 +00:00
Ernst de Haan
5542a04479 Removed reference to non-existent ${FILESDIR}/MANIFEST.MF.
Bumped PORTREVISION.
2002-03-30 16:45:40 +00:00
Ernst de Haan
00af56ae88 Lot of changes: Using USE_JAVA infrastructure. Upgraded port
to 3.3.1. Using HTTP_PORT i.s.o. LISTEN_PORT. Using
daemonctl.c i.s.o. tomcatctl shell script. Displaying steps
i.s.o. commands being executed. Synced man page.
2002-03-30 14:51:12 +00:00
Ernst de Haan
b1b733982c Fixed the man page for tomcatctl. 2002-02-21 20:31:20 +00:00
Ernst de Haan
229c3f67eb Cleaned things up. Made things working :-) Both the startup script
in ${PREFIX}/etc/rc.d and the control script in ${PREFIX}/bin have
been refactored and now actually work very well.

Using the 'www' user and group, creating them if they don't exist.
I've used the same approach as www/apache13.

STDOUT_LOG and STDERR_LOG are now fixed (no ?= anymore) since the
package deinstall does not support a different location.

This fixes the first half of PR 28624.
See: http://www.freebsd.org/cgi/query-pr.cgi?pr=34931

Reported by:	Kees Jan Koster <k.j.koster@kpn.com>
2002-02-21 20:06:55 +00:00
Ernst de Haan
02e7b57e58 Upgraded from Jakarta 3.2.3 to 3.2.4.
Not using DIST_SUBDIR anymore.
2002-02-21 11:03:08 +00:00