cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update tomcat/v5 to 5.5.31, adjust README, switch to SUBST_CMD,

Browse Source 
kurt@ drops maintainership. From Daniel Dickman, "please commit" aja
This commit is contained in:
sthen 2010-11-29 21:26:01 +00:00
parent f5881573e2
commit 5aaf112216
10 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
www/tomcat/v5/Makefile
View File

@ -1,31 +1,26 @@
# $OpenBSD: Makefile,v 1.14 2010/11/22 08:36:54 espie Exp $
# $OpenBSD: Makefile,v 1.15 2010/11/29 21:26:01 sthen Exp $
COMMENT-main= Java servlet 2.4 and Java server pages 2.0 server
COMMENT-admin= administration web application
COMMENT-examples=example applications and documentation
V= 5.5.27
V= 5.5.31
DISTNAME= apache-tomcat-${V}
PKGNAME= tomcat-${V}
PKGNAME-main= tomcat-${V}
PKGNAME-admin= tomcat-admin-${V}
PKGNAME-examples=tomcat-examples-${V}
REVISION-main= 2
REVISION-admin= 0
REVISION-examples= 1
CATEGORIES= www
DISTFILES= ${DISTNAME}.tar.gz \
${DISTNAME}-admin.tar.gz \
${DISTNAME}-fulldocs.tar.gz
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-5/v$V/bin/} \
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-5/v${V}/bin/} \
http://archive.apache.org/dist/tomcat/tomcat-5/archive/v${V}/bin/
HOMEPAGE= http://tomcat.apache.org/
MAINTAINER= Kurt Miller <kurt@openbsd.org>
MULTI_PACKAGES= -main -admin -examples
MODULES= java
@ -76,12 +71,18 @@ do-install:
${INSTALL_DATA_DIR} ${WRKINST}/${CONFDIR}/Catalina/localhost
${INSTALL_DATA} ${WRKDIST}/conf/Catalina/localhost/* \
${WRKINST}/${CONFDIR}/Catalina/localhost
find ${WRKINST} -name \*.orig -or -name \*.bat -or -name \*.exe | \
xargs rm
@perl -pi -e 's,%%SYSCONFDIR%%,${SYSCONFDIR},' \
@${SUBST_CMD} -o ${BINOWN} -g ${BINGRP} \
${PREFIX}/tomcat/bin/setclasspath.sh
@sed -e 's,%%PREFIX%%,${TRUEPREFIX},' \
-e 's,%%CATALINA_BASE%%,${CATALINA_BASE},' \
< ${FILESDIR}/tomcat.rc > ${SAMPLEDIR}/tomcat.rc
@${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c \
${FILESDIR}/tomcat.rc \
${SAMPLEDIR}/tomcat.rc
rm -r ${PREFIX}/tomcat/bin/[xi]64
find ${WRKINST} \
-name \*.beforesubst -or \
-name \*.orig -or \
-name \*.bat -or \
-name \*.exe -or \
-name \*.dll \
| xargs rm
.include <bsd.port.mk>

30
www/tomcat/v5/distinfo
View File

@ -1,15 +1,15 @@
MD5 (apache-tomcat-5.5.27-admin.tar.gz) = npbHCZ0pfBt0G3RKMNtT2A==
MD5 (apache-tomcat-5.5.27-fulldocs.tar.gz) = aG7v4+PyLY6bE7kMs2t5VA==
MD5 (apache-tomcat-5.5.27.tar.gz) = 5Xb+2M5mwy7lKV1fdyexOA==
RMD160 (apache-tomcat-5.5.27-admin.tar.gz) = z8CgUsruyvHlYU3aTvuiAvG2QQI=
RMD160 (apache-tomcat-5.5.27-fulldocs.tar.gz) = RpfGwmaOiH2Qa0kwxKadm4T0rjY=
RMD160 (apache-tomcat-5.5.27.tar.gz) = VHm7fdnAovnjep7t1f78YqVxiKY=
SHA1 (apache-tomcat-5.5.27-admin.tar.gz) = sFjgxDYQx8upXSem8iKViAt/vkI=
SHA1 (apache-tomcat-5.5.27-fulldocs.tar.gz) = ZS8oD8pd0u3Wqa6sf6zi1lBuvVI=
SHA1 (apache-tomcat-5.5.27.tar.gz) = Zs9+GmfXpUw9MeW/RfBtQXOvjO4=
SHA256 (apache-tomcat-5.5.27-admin.tar.gz) = gmUcU8xEG/rWFx7IeVVng+Powj1IHk5JeSmGfdAucBQ=
SHA256 (apache-tomcat-5.5.27-fulldocs.tar.gz) = yz2pK2Yw4stvoC4m6jG4SY8syETVqdeGzwK+9IYCW5U=
SHA256 (apache-tomcat-5.5.27.tar.gz) = sfqIFogZY86UhrDUXtDZRsuYueBNvcb9MfxUtq83iro=
SIZE (apache-tomcat-5.5.27-admin.tar.gz) = 2401560
SIZE (apache-tomcat-5.5.27-fulldocs.tar.gz) = 3062903
SIZE (apache-tomcat-5.5.27.tar.gz) = 6478912
MD5 (apache-tomcat-5.5.31-admin.tar.gz) = ua1YTX1F+XWNo0PfkUyL+A==
MD5 (apache-tomcat-5.5.31-fulldocs.tar.gz) = rti7PlcAIZWDQzT8QckJOQ==
MD5 (apache-tomcat-5.5.31.tar.gz) = mrBzhuI/TD38OwpeKbX4VA==
RMD160 (apache-tomcat-5.5.31-admin.tar.gz) = 4kqzwGaBmTVKnrpcvUAGVKXQX9g=
RMD160 (apache-tomcat-5.5.31-fulldocs.tar.gz) = VQefm5OGK4jU0LwJ/LHjUilx6R8=
RMD160 (apache-tomcat-5.5.31.tar.gz) = xQtEQXLxWKhy2IxcHQ9jgSfWDBQ=
SHA1 (apache-tomcat-5.5.31-admin.tar.gz) = ifE348wjfedai5MPL80NvxYuJNQ=
SHA1 (apache-tomcat-5.5.31-fulldocs.tar.gz) = 9FtWOZyhAnoNfUJ3XK9g2KEzZbA=
SHA1 (apache-tomcat-5.5.31.tar.gz) = zgYRZ1gkkM4ZTDjw6EA5FVWzRhs=
SHA256 (apache-tomcat-5.5.31-admin.tar.gz) = bxPrDnvrkWIHCP2MbUEWJdRnlt4IyUFU+SEBeSEId88=
SHA256 (apache-tomcat-5.5.31-fulldocs.tar.gz) = Ob7B9ClNlz3OX+spPL2ADg1yxJuGzKyOvgDu9IAbUZM=
SHA256 (apache-tomcat-5.5.31.tar.gz) = nwL0fSzzUbz/TA0BOiU8llrQzA/AMF0Iby9lMCLM+oI=
SIZE (apache-tomcat-5.5.31-admin.tar.gz) = 2395782
SIZE (apache-tomcat-5.5.31-fulldocs.tar.gz) = 3131660
SIZE (apache-tomcat-5.5.31.tar.gz) = 8277017

10
www/tomcat/v5/files/tomcat.rc
View File

@ -1,8 +1,8 @@
# $OpenBSD: tomcat.rc,v 1.1.1.1 2006/10/25 18:10:18 kurt Exp $
# $OpenBSD: tomcat.rc,v 1.2 2010/11/29 21:26:01 sthen Exp $
#
# Define JAVA_HOME for _tomcat here
# Start tomcat with following command:
# $ sudo -u _tomcat %%PREFIX%%/tomcat/bin/startup.sh
# $ sudo -u _tomcat ${TRUEPREFIX}/tomcat/bin/startup.sh
#
# javaPathHelper will pickup JAVA_HOME from the env. if
@ -12,9 +12,9 @@ JAVA_HOME=$(javaPathHelper -h tomcat)
JAVA_OPTS=-server
# override other environment options:
#CATALINA_HOME=%%PREFIX%%/tomcat
#CATALINA_BASE=%%CATALINA_BASE%%
#CATALINA_TMPDIR=$CATALINA_BASE/temp
#CATALINA_HOME=${TRUEPREFIX}/tomcat
#CATALINA_BASE=${CATALINA_BASE}
#CATALINA_TMPDIR=${CATALINA_BASE}/temp
#JAVA_OPTS="-server -Djava.net.preferIPv4Stack=true"
#JPDA_TRANSPORT=
#JPDA_ADDRESS=

12
www/tomcat/v5/patches/patch-bin_catalina_sh
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-bin_catalina_sh,v 1.3 2008/02/13 13:48:22 kurt Exp $
--- bin/catalina.sh.orig Mon Jan 28 15:38:25 2008
+++ bin/catalina.sh Sun Feb 10 21:21:27 2008
@@ -137,7 +137,7 @@ fi
CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
$OpenBSD: patch-bin_catalina_sh,v 1.4 2010/11/29 21:26:01 sthen Exp $
--- bin/catalina.sh.orig Thu Jul 1 11:19:40 2010
+++ bin/catalina.sh Tue Aug 3 04:52:30 2010
@@ -156,7 +156,7 @@ fi
CLASSPATH="$CLASSPATH""$CATALINA_HOME"/bin/bootstrap.jar
if [ -z "$CATALINA_BASE" ] ; then
- CATALINA_BASE="$CATALINA_HOME"
+ CATALINA_BASE="/var/tomcat"
fi
if [ -z "$CATALINA_TMPDIR" ] ; then
if [ -z "$CATALINA_OUT" ] ; then

19
www/tomcat/v5/patches/patch-bin_setclasspath_sh
View File

@ -1,23 +1,22 @@
$OpenBSD: patch-bin_setclasspath_sh,v 1.2 2007/04/10 19:10:54 kurt Exp $
--- bin/setclasspath.sh.orig Mon Mar 5 10:26:01 2007
+++ bin/setclasspath.sh Tue Mar 27 13:37:25 2007
@@ -8,6 +8,11 @@
# First clear out the user classpath
CLASSPATH=
$OpenBSD: patch-bin_setclasspath_sh,v 1.3 2010/11/29 21:26:01 sthen Exp $
--- bin/setclasspath.sh.orig Thu Jul 1 11:19:40 2010
+++ bin/setclasspath.sh Tue Aug 3 04:52:30 2010
@@ -22,5 +22,10 @@
# -----------------------------------------------------------------------------
+# Read $JAVA_HOME - sudo doesn't pass environment variables
+if [ -r "%%SYSCONFDIR%%/tomcat/tomcat.rc" ]; then
+ . %%SYSCONFDIR%%/tomcat/tomcat.rc
+if [ -r "${SYSCONFDIR}/tomcat/tomcat.rc" ]; then
+ . ${SYSCONFDIR}/tomcat/tomcat.rc
+fi
+
# Make sure prerequisite environment variables are set
if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
# Bugzilla 37284
@@ -16,6 +21,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
@@ -29,6 +34,7 @@ if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
else
echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
echo "At least one of these environment variable is needed to run this program"
+ echo "Edit \`%%SYSCONFDIR%%/tomcat/tomcat.rc' to point to your \$JAVA_HOME"
+ echo "Edit \`${SYSCONFDIR}/tomcat/tomcat.rc' to point to your \$JAVA_HOME"
exit 1
fi
fi

3
www/tomcat/v5/pkg/DESCR-main
View File

@ -5,6 +5,3 @@ useful platform for developing and deploying web applications and
web services. Tomcat can be run as a standalone web server with
Servlet and JSP support, or using Apache HTTP Server as its web
server via the mod_jk Apache module (the www/mod_jk package).
See ${PREFIX}/tomcat/README.OpenBSD for
information on running Tomcat on OpenBSD.

3
www/tomcat/v5/pkg/PLIST-admin
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-admin,v 1.2 2008/02/13 13:48:22 kurt Exp $
@comment $OpenBSD: PLIST-admin,v 1.3 2010/11/29 21:26:01 sthen Exp $
share/examples/tomcat/admin.xml
tomcat/server/webapps/admin/
tomcat/server/webapps/admin/WEB-INF/
@ -40,7 +40,6 @@ tomcat/server/webapps/admin/images/ResourceLink.gif
tomcat/server/webapps/admin/images/Roles.gif
tomcat/server/webapps/admin/images/Server.gif
tomcat/server/webapps/admin/images/Service.gif
tomcat/server/webapps/admin/images/Thumbs.db
tomcat/server/webapps/admin/images/TomcatBanner.jpg
tomcat/server/webapps/admin/images/Users.gif
tomcat/server/webapps/admin/images/Valve.gif

3
www/tomcat/v5/pkg/PLIST-examples
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-examples,v 1.6 2010/11/15 10:45:53 sthen Exp $
@comment $OpenBSD: PLIST-examples,v 1.7 2010/11/29 21:26:01 sthen Exp $
@conflict jakarta-tomcat-examples-*
@pkgpath www/jakarta-tomcat/v5,-examples
@owner _tomcat
@ -802,6 +802,7 @@ webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/ResourceEntry.h
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoader.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/StandardClassLoaderMBean.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResource.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedFindResourceByName.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.PrivilegedGetClassLoader.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappClassLoader.html
webapps/tomcat-docs/catalina/docs/api/org/apache/catalina/loader/WebappLoader.html

6
www/tomcat/v5/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.6 2010/11/15 10:45:53 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.7 2010/11/29 21:26:01 sthen Exp $
@conflict jakarta-tomcat-*
@pkgpath www/jakarta-tomcat/v5
@pkgpath www/tomcat/v5
@ -88,12 +88,11 @@ tomcat/bin/
tomcat/bin/bootstrap.jar
tomcat/bin/catalina-tasks.xml
tomcat/bin/catalina.sh
tomcat/bin/commons-daemon-native.tar.gz
tomcat/bin/commons-daemon.jar
tomcat/bin/commons-logging-api-1.1.1.jar
tomcat/bin/digest.sh
tomcat/bin/jkstatus-tasks.xml
tomcat/bin/jmxaccessor-tasks.xml
tomcat/bin/jsvc.tar.gz
tomcat/bin/setclasspath.sh
tomcat/bin/shutdown.sh
tomcat/bin/startup.sh
@ -138,7 +137,6 @@ tomcat/server/lib/tomcat-ajp.jar
tomcat/server/lib/tomcat-apr.jar
tomcat/server/lib/tomcat-coyote.jar
tomcat/server/lib/tomcat-http.jar
tomcat/server/lib/tomcat-jkstatus-ant.jar
tomcat/server/lib/tomcat-util.jar
tomcat/server/webapps/
tomcat/server/webapps/host-manager/

13
www/tomcat/v5/pkg/README-main
View File

@ -1,19 +1,22 @@
$OpenBSD: README-main,v 1.1 2010/11/15 10:45:53 sthen Exp $
$OpenBSD: README-main,v 1.2 2010/11/29 21:26:01 sthen Exp $
Running Tomcat 5.5 on OpenBSD
=============================
The tomcat package does not install the example webapps, documentation
or admin webapp. You must supply your own webapps and configuration or
or admin webapp. You must supply your own webapps and configuration or
install the tomcat-examples package for the example webapps and
documentation. Sample config files for the host-manager and manager
documentation. Sample config files for the host-manager and manager
webapps can be found in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-admin package contains the admin webapp but you must supply
your own configuration for it or use the tomcat-examples package. A
your own configuration for it or use the tomcat-examples package. A
sample config file can be found in ${TRUEPREFIX}/share/examples/tomcat.
The tomcat-examples package includes the examples, full documentation
and localhost config files for admin, host-manager and manager webapps.
The packages are structured this way to facilate mantaining a server
The packages are structured this way to facilitate maintaining a server
which normally would not contain the examples and documentation webapp
and optionally contain the admin webapp.