update to jakarta-tomcat 4.1.29
from Kurt Miller <truk at optonline dot net> this was discussed with reinhard@ (maintainer) during lock, was then forgotten and now he is unreachable
This commit is contained in:
sturm
parent
22b88ab1e5
commit
550c87ad20
@ -1,15 +1,16 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2003/05/12 18:02:45 sturm Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2003/12/15 21:21:18 sturm Exp $
|
||||
|
||||
COMMENT= "Java servlet 2.3 and Java server pages 1.2 server"
|
||||
|
||||
# Requires a JVM
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
V= 4.0.6
|
||||
V= 4.1.29
|
||||
DISTNAME= jakarta-tomcat-${V}
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${V}/bin/
|
||||
EXTRACT_SUFX= .zip
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_APACHE:=jakarta/tomcat-4/v$V/bin/} \
|
||||
http://archive.apache.org/dist/jakarta/tomcat-4/archive/v${V}/bin/
|
||||
|
||||
HOMEPAGE= http://jakarta.apache.org/
|
||||
|
||||
@ -17,6 +18,7 @@ MAINTAINER= Reinhard J. Sammer <reinhard@openbsd.org>
|
||||
|
||||
JDK_VERSION= 1.3.1-linux
|
||||
JAVA_HOME= ${LOCALBASE}/jdk${JDK_VERSION}
|
||||
BUILD_DEPENDS= ::archivers/gtar
|
||||
RUN_DEPENDS= :jdk-linux->1.3:devel/jdk/1.3-linux
|
||||
|
||||
# Apache Software License
|
||||
@ -25,32 +27,31 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
TAR= ${LOCALBASE}/bin/gtar
|
||||
|
||||
NO_BUILD= Yes
|
||||
NO_REGRESS= Yes
|
||||
|
||||
CONF_FILES=catalina.policy server-noexamples.xml.config server.xml \
|
||||
tomcat-users.xml web.xml
|
||||
CONFDIR= ${SYSCONFDIR}/tomcat
|
||||
DIRS= bin classes common conf lib server webapps
|
||||
DOCS=LICENSE RELEASE-NOTES-4.0-B1.txt RELEASE-NOTES-4.0-B2.txt \
|
||||
RELEASE-NOTES-4.0-B3.txt RELEASE-NOTES-4.0-B4.txt RELEASE-NOTES-4.0-B5.txt \
|
||||
RELEASE-NOTES-4.0-B6.txt RELEASE-NOTES-4.0-B7.txt RELEASE-NOTES-4.0-RC1.txt \
|
||||
RELEASE-NOTES-4.0-RC2.txt RELEASE-NOTES-4.0.1-B1.txt RELEASE-NOTES-4.0.1.txt \
|
||||
RELEASE-NOTES-4.0.txt RELEASE-PLAN-4.0.1.txt RELEASE-PLAN-4.0.txt RUNNING.txt
|
||||
DIRS= bin common conf server shared temp webapps work
|
||||
DOCS= LICENSE README.txt RELEASE-NOTES-4.1.txt RELEASE-PLAN-4.1.txt \
|
||||
RUNNING.txt
|
||||
TOMCATDIR= /var/tomcat
|
||||
SUBST_VARS= TOMCATDIR CONFDIR DISTNAME
|
||||
|
||||
post-patch:
|
||||
@cd ${WRKDIST}/conf && perl -pi -e 's,\r,,g' ${CONF_FILES}
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/${DISTNAME}
|
||||
cd ${WRKDIST} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${DISTNAME}
|
||||
cd ${WRKDIST}/bin && chmod +x *.sh # for .zip file
|
||||
cd ${WRKDIST} && \
|
||||
tar cf - ${DIRS} | (cd ${PREFIX}/${DISTNAME} && tar -xf -)
|
||||
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/${DISTNAME}/conf
|
||||
rm -f ${PREFIX}/${DISTNAME}/bin/catalina.sh.orig \
|
||||
${PREFIX}/${DISTNAME}/conf/server.xml.orig
|
||||
@sed -e 's,y0y0y0,${TRUEPREFIX}/${DISTNAME},' \
|
||||
-e 's,y0y0y1,${SYSCONFDIR},' \
|
||||
< ${FILESDIR}/README.OpenBSD \
|
||||
> ${PREFIX}/${DISTNAME}/conf/README.OpenBSD
|
||||
@sed -e 's,y0y0y0,${TRUEPREFIX}/${DISTNAME},' \
|
||||
-e 's,y0y0y1,${JAVA_HOME},' \
|
||||
< ${FILESDIR}/tomcat.rc > ${PREFIX}/${DISTNAME}/conf/tomcat.rc
|
||||
@perl -pi -e 's,y0y0y0,${SYSCONFDIR},' \
|
||||
${PREFIX}/${DISTNAME}/bin/setclasspath.sh
|
||||
|
||||
.include "bsd.port.mk"
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (jakarta-tomcat-4.0.6.zip) = 4a48932944d92dd5a23ffb83c0f3a2de
|
||||
RMD160 (jakarta-tomcat-4.0.6.zip) = b97d1786e3db5a1d4f918e20079440a04d092f4a
|
||||
SHA1 (jakarta-tomcat-4.0.6.zip) = 50dc6745fda253dac6663b9d09fcbd515d9bfa16
|
||||
MD5 (jakarta-tomcat-4.1.29.tar.gz) = 66b03ddd10fb4a9079fe26774436db09
|
||||
RMD160 (jakarta-tomcat-4.1.29.tar.gz) = 35be58f42ddadafdea44636b98b37fdcb3ee81bb
|
||||
SHA1 (jakarta-tomcat-4.1.29.tar.gz) = 3ed55a351d7a2782be0052a84a217f37235d0746
|
||||
|
||||
@ -1,6 +1,19 @@
|
||||
$OpenBSD: README.OpenBSD,v 1.2 2002/01/05 18:39:41 reinhard Exp $
|
||||
$OpenBSD: README.OpenBSD,v 1.3 2003/12/15 21:21:18 sturm Exp $
|
||||
|
||||
Jakarta Tomcat on OpenBSD uses `/etc/tomcat' for it's configuration files.
|
||||
Jakarta Tomcat on OpenBSD uses `y0y0y1/tomcat' for it's configuration files.
|
||||
The files in this directory are for reference and backup only.
|
||||
|
||||
With the following command tomcat is started as user `_tomcat':
|
||||
$ sudo -u _tomcat y0y0y0/bin/startup.sh
|
||||
|
||||
As `sudo' doesn't pass environment variables, you should define
|
||||
environment variables in `y0y0y1/tomcat/tomcat.rc'.
|
||||
|
||||
If you want Jakarta Tomcat to serve on privileged ports (e.g. 80),
|
||||
then either edit `y0y0y1/tomcat/server.xml' and change the Connector port
|
||||
to 80, or even more secure: redirect all tcp traffic to port 80
|
||||
to tomcat's default listener port 8080 using a pf.conf(5) rule like:
|
||||
|
||||
rdr on $NIC proto tcp from any to any port 80 -> 127.0.0.1 port 8080
|
||||
|
||||
`$CATALINA_BASE' (formerly `$TOMCAT_HOME') is `/var/tomcat'.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-bin_catalina_sh,v 1.2 2002/02/15 09:31:03 reinhard Exp $
|
||||
--- bin/catalina.sh.orig Sun Feb 10 11:09:22 2002
|
||||
+++ bin/catalina.sh Tue Feb 12 11:17:35 2002
|
||||
@@ -83,7 +83,7 @@ fi
|
||||
$OpenBSD: patch-bin_catalina_sh,v 1.3 2003/12/15 21:21:18 sturm Exp $
|
||||
--- bin/catalina.sh.orig 2003-07-31 13:29:54.000000000 -0400
|
||||
+++ bin/catalina.sh 2003-10-16 22:04:13.000000000 -0400
|
||||
@@ -104,7 +104,7 @@ fi
|
||||
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar
|
||||
|
||||
if [ -z "$CATALINA_BASE" ] ; then
|
||||
|
||||
@ -1,39 +1,12 @@
|
||||
$OpenBSD: patch-conf_server_xml,v 1.2 2002/02/15 09:31:03 reinhard Exp $
|
||||
--- conf/server.xml.orig Sun Feb 10 11:09:22 2002
|
||||
+++ conf/server.xml Tue Feb 12 11:27:09 2002
|
||||
@@ -156,7 +156,7 @@
|
||||
-->
|
||||
|
||||
<!-- Define the default virtual host -->
|
||||
- <Host name="localhost" debug="0" appBase="webapps" unpackWARs="true">
|
||||
+ <Host name="localhost" debug="0" appBase="/var/tomcat/webapps" unpackWARs="true">
|
||||
|
||||
<!-- Normally, users must authenticate themselves to each web app
|
||||
individually. Uncomment the following entry if you would like
|
||||
@@ -176,7 +176,7 @@
|
||||
(to $CATALINA_HOME) or absolute path to the desired directory.
|
||||
-->
|
||||
<Valve className="org.apache.catalina.valves.AccessLogValve"
|
||||
- directory="logs" prefix="localhost_access_log." suffix=".txt"
|
||||
+ directory="/var/tomcat/logs" prefix="localhost_access_log." suffix=".txt"
|
||||
pattern="common"/>
|
||||
|
||||
<!-- Logger shared by all Contexts related to this virtual host. By
|
||||
@@ -186,7 +186,7 @@
|
||||
relative (to $CATALINA_HOME) or absolute path to the desired
|
||||
directory.-->
|
||||
<Logger className="org.apache.catalina.logger.FileLogger"
|
||||
- directory="logs" prefix="localhost_log." suffix=".txt"
|
||||
+ directory="/var/tomcat/logs" prefix="localhost_log." suffix=".txt"
|
||||
timestamp="true"/>
|
||||
|
||||
<!-- Define properties for each web application. This is only needed
|
||||
@@ -311,7 +311,7 @@
|
||||
|
||||
<Connector className="org.apache.catalina.connector.warp.WarpConnector"
|
||||
port="8008" minProcessors="5" maxProcessors="75"
|
||||
- enableLookups="true" appBase="webapps"
|
||||
+ enableLookups="true" appBase="/var/tomcat/webapps"
|
||||
acceptCount="10" debug="0"/>
|
||||
|
||||
<!-- Replace "localhost" with what your Apache "ServerName" is set to -->
|
||||
$OpenBSD: patch-conf_server_xml,v 1.3 2003/12/15 21:21:18 sturm Exp $
|
||||
--- conf/server.xml.orig 2003-12-15 20:22:46.000000000 +0100
|
||||
+++ conf/server.xml 2003-12-15 20:23:08.000000000 +0100
|
||||
@@ -231,7 +231,7 @@
|
||||
-->
|
||||
|
||||
<!-- Define the default virtual host -->
|
||||
- <Host name="localhost" debug="0" appBase="webapps"
|
||||
+ <Host name="localhost" debug="0" appBase="/var/tomcat/webapps"
|
||||
unpackWARs="true" autoDeploy="true">
|
||||
|
||||
<!-- Normally, users must authenticate themselves to each web app
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/01/05 15:29:25 reinhard Exp $
|
||||
# $OpenBSD: DEINSTALL,v 1.2 2003/12/15 21:21:18 sturm Exp $
|
||||
#
|
||||
# De-installation setup of jakarta-tomcat
|
||||
|
||||
@ -10,6 +10,8 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
CONFIG_DIR=${SYSCONFDIR}/tomcat
|
||||
WORKDIR=${TOMCATDIR}
|
||||
TOMCATUSER=_tomcat
|
||||
TOMCATGROUP=_tomcat
|
||||
|
||||
# Function: tell the user what they need to do to delete the port completely
|
||||
#
|
||||
@ -20,8 +22,12 @@ do_notice()
|
||||
echo "| To completely deinstall the $1 package you need to perform"
|
||||
echo "| these steps as root:"
|
||||
echo "|"
|
||||
echo "| rm -rf ${CONFIG_DIR}"
|
||||
echo "| rm -rf ${WORKDIR}"
|
||||
echo "| userdel $TOMCATUSER"
|
||||
echo "| groupdel $TOMCATGROUP"
|
||||
if [ "$PKG_DELETE_EXTRA" != Yes ]; then
|
||||
echo "| rm -rf ${CONFIG_DIR}"
|
||||
echo "| rm -rf ${WORKDIR}"
|
||||
fi
|
||||
echo "|"
|
||||
echo "| Do not do this if you plan on re-installing $1"
|
||||
echo "| at some future time."
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
Tomcat is the Java Servlet / Java Server Page environment produced
|
||||
by the Apache Foundation's Jakarta Project. Tomcat can be run as a
|
||||
standalone web server with Servlet and JSP support, or using Apache
|
||||
Server as it's web server via the mod_webapp Apache module (the
|
||||
www/mod_webapp package).
|
||||
Server as it's web server via the mod_jk Apache module (the
|
||||
www/mod_jk package).
|
||||
|
||||
WWW: ${HOMEPAGE}
|
||||
See ${PREFIX}/${DISTNAME}/conf/README.OpenBSD for
|
||||
information on running Jakarta Tomcat on OpenBSD.
|
||||
|
||||
@ -1,44 +1,50 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL,v 1.2 2002/01/07 12:13:52 reinhard Exp $
|
||||
# $OpenBSD: INSTALL,v 1.3 2003/12/15 21:21:18 sturm Exp $
|
||||
#
|
||||
# Pre/post-installation setup of jakarta-tomcat
|
||||
|
||||
# exit on errors, use a sane path and install prefix
|
||||
# use a sane path and install prefix
|
||||
#
|
||||
set -e
|
||||
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
CONFIG_DIR=${CONFDIR}
|
||||
SAMPLE_CONFIG_DIR=$PREFIX/${DISTNAME}/conf
|
||||
CONF_FILES="catalina.policy server-noexamples.xml.config server.xml tomcat-users.xml web.xml"
|
||||
SAMPLE_WEBAPPS_DIR=$PREFIX/${DISTNAME}/webapps
|
||||
SAMPLE_CONFIG_DIR=${PREFIX}/${DISTNAME}/conf
|
||||
CONF_FILES="catalina.policy jk2.properties server-noexamples.xml.config server.xml tomcat.rc tomcat-users.xml web.xml"
|
||||
WEBAPP_DIRS="server webapps"
|
||||
TOMCATUSER=_tomcat
|
||||
TOMCATGROUP=_tomcat
|
||||
TOMCATID=526
|
||||
|
||||
# Function: install configuration files
|
||||
#
|
||||
do_install_conf()
|
||||
{
|
||||
install -d -o root -g wheel ${CONFIG_DIR}
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${CONFIG_DIR}
|
||||
cd ${SAMPLE_CONFIG_DIR}
|
||||
for i in ${CONF_FILES}; do
|
||||
install -o root -g wheel -m 0644 $i ${CONFIG_DIR}
|
||||
install -o ${TOMCATUSER} -g ${TOMCATGROUP} -m 0644 $i ${CONFIG_DIR}
|
||||
done
|
||||
|
||||
install -d -o root -g wheel ${TOMCATDIR}
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${TOMCATDIR}
|
||||
ln -sf ${CONFIG_DIR} ${TOMCATDIR}/conf
|
||||
install -d -o root -g wheel ${TOMCATDIR}/logs
|
||||
install -d -o root -g staff ${TOMCATDIR}/webapps
|
||||
cd ${SAMPLE_WEBAPPS_DIR}
|
||||
tar cf - . | (cd ${TOMCATDIR}/webapps && tar xf - )
|
||||
install -d -o root -g staff ${TOMCATDIR}/work
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${TOMCATDIR}/webapps
|
||||
cd ${PREFIX}/${DISTNAME}
|
||||
tar cf - ${WEBAPP_DIRS} | (cd ${TOMCATDIR} && tar xf -)
|
||||
cd ${TOMCATDIR} && chown -R ${TOMCATUSER}:${TOMCATGROUP} ${WEBAPP_DIRS}
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${TOMCATDIR}/logs
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${TOMCATDIR}/temp
|
||||
install -d -o ${TOMCATUSER} -g ${TOMCATGROUP} ${TOMCATDIR}/work
|
||||
|
||||
echo
|
||||
echo "+---------------"
|
||||
echo "| The $1 configuration files have"
|
||||
echo "| been installed in ${CONFIG_DIR}."
|
||||
echo "| Please view these files and change the configuration"
|
||||
echo "| Please review these files and change the configuration"
|
||||
echo "| to meet your needs."
|
||||
echo "|"
|
||||
echo "| \$CATALINA_BASE is ${TOMCATDIR}."
|
||||
echo "| Review \`${CONFIG_DIR}/tomcat.rc' to reflect your environment (e.g. \$JAVA_HOME)."
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
@ -55,10 +61,32 @@ do_notice_conf()
|
||||
echo "| as needed."
|
||||
echo "| The existing $1 files in ${TOMCATDIR}"
|
||||
echo "| have NOT been deleted."
|
||||
echo "|"
|
||||
echo "| If you are updating from a previous version of $1,"
|
||||
echo "| don't forget to wipe ${TOMCATDIR}/work/*."
|
||||
echo "| Update \`${TOMCATDIR}/tomcat.rc' to point to your \$JAVA_HOME. See"
|
||||
echo "| ${SAMPLE_CONFIG_DIR} for an example."
|
||||
echo "+---------------"
|
||||
echo
|
||||
}
|
||||
|
||||
do_usergroup_install()
|
||||
{
|
||||
# Create Tomcat user and group
|
||||
if groupinfo -e ${TOMCATGROUP}; then
|
||||
echo "===> Using \`${TOMCATGROUP}' group for Tomcat"
|
||||
else
|
||||
echo "===> Creating \`${TOMCATGROUP}' group for Tomcat"
|
||||
groupadd -g ${TOMCATID} ${TOMCATGROUP}
|
||||
fi
|
||||
if userinfo -e ${TOMCATUSER}; then
|
||||
echo "===> Using \`${TOMCATUSER}' user for Tomcat"
|
||||
else
|
||||
echo "===> Creating \`${TOMCATUSER}' user for Tomcat"
|
||||
useradd -g ${TOMCATGROUP} -d /nonexistent -L daemon -c 'Tomcat Account' -s /sbin/nologin -u ${TOMCATID} ${TOMCATUSER}
|
||||
fi
|
||||
}
|
||||
|
||||
# Verify proper execution
|
||||
#
|
||||
if [ $# -ne 2 ]; then
|
||||
@ -70,7 +98,7 @@ fi
|
||||
#
|
||||
case $2 in
|
||||
PRE-INSTALL)
|
||||
: nothing to pre-install for this port
|
||||
do_usergroup_install
|
||||
;;
|
||||
POST-INSTALL)
|
||||
if [ ! -d ${CONFIG_DIR} ]; then
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
For detailed instructions on how to run Tomcat see:
|
||||
${PREFIX}/${DISTNAME}/webapps/tomcat-docs/uguide/tomcat_ug.html
|
||||
${PREFIX}/${DISTNAME}/webapps/tomcat-docs/RUNNING.txt
|
||||
|
||||
For more information on application development with Tomcat, see
|
||||
${PREFIX}/${DISTNAME}/webapps/tomcat-docs/appdev/index.html
|
||||
${PREFIX}/${DISTNAME}/webapps/tomcat-docs/appdev/index.html
|
||||
|
||||
Note that Tomcat may be started with the following command:
|
||||
${PREFIX}/${DISTNAME}/bin/startup.sh
|
||||
$ sudo -u _tomcat ${PREFIX}/${DISTNAME}/bin/startup.sh
|
||||
|
||||
Configuration files are in `${SYSCONFDIR}/tomcat' (use tomcat.rc
|
||||
for setting environment variables like JAVA_HOME/JAVA_OPTS/...)
|
||||
|
||||
Configuration files are in `${SYSCONFDIR}/tomcat'.
|
||||
`$CATALINA_BASE' is `/var/tomcat'.
|
||||
|
||||
See also ${PREFIX}/${DISTNAME}/conf/README.OpenBSD for information
|
||||
on running Jakarta Tomcat on OpenBSD.
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user