41e00973b2
General
* Update Tomcat-Native to 1.1.22. (jim)
* Fix CVE-2011-2729. Update to Commons Daemon 1.0.7. (markt)
* 33262: When using the Windows installer, the monitor is now auto-started for
the current user rather than all users to be consistent with menu item
creation. (markt)
* 40510: Provide an option within the Windows installer to create menu entries
for the current user or all users. (markt)
* 50949: Add the ability to specify the AJP port and the shutdown port when
using the Windows installer. (markt)
* 51135: Fix auto-detection of JAVA_HOME for 64-bit Windows platforms that only
have a 32-bit JVM installed when using the Windows installer. (markt)
Catalina
* 27988: Improve reporting of missing files. (markt)
* 28852: Add URL encoding where missing to parameters in URLs presented by Ant
tasks to the Manager application. Based on a patch by Stephane Bailliez.
(mark)
* 41179: Return 404 rather than 400 for requests to the ROOT context when no
ROOT context has been deployed. (markt)
* 50189: Once the application has finished writing to the response, prevent
further reads from the request since this causes various problems in the
connectors which do not expect this. (markt)
* Fix CVE-2011-2204. Prevent user passwords appearing in log files if a
runtime exception (e.g. OOME) occurs while creating a new user for a
MemoryUserDatabase via JMX. (markt)
* 51042: Don't trigger session creation listeners when a session ID is changed
as part of the authentication process. (markt)
* 51324: Improve handling of exceptions when flushing the response buffer to
ensure that the doFlush flag does not get stuck in the enabled state. Patch
provided by Jeremy Norris. (kkolinko)
* 51403: Avoid NullPointerException in JULI FileHandler if formatter is
misconfigured. (kkolinko)
* 51473: Fix concatenation of values in SecurityConfig.setSecurityProperty()
when the value provided by JRE is null. (kkolinko)
* 51550: Internal errors in Tomcat components that process requests before they
are passed to a web application, such as Authenticators, now return a 500
response rather than a 200 response. (markt)
* Add additional configuration options to the DIGEST authenticator. (markt)
Coyote
* Fix CVE-2011-2526. Protect against crashes (HTTP APR) if sendfile is
configured to send more data than is available in the file. (markt)
* 50394: Return -1 from read operation instead of throwing an exception when
encountering an EOF with the HTTP APR connector. (kkolinko)
* 50744: Skip the SSL configuration check on platforms where an unbounded
socket cannot be created. (kkolinko)
* 51073: Throw an exception and do not start the APR connector if it is
configured for SSL and an invalid value is provided for SSLProtocol. (markt)
* 51698: Fix CVE-2011-3190. Prevent AJP message injection. (markt)
Jasper
* 36362: Handle the case where tag file attributes (which can use any valid XML
name) have a name which is not a Java identifier. (markt)
* Fix possible threading issue in JSP compilation when development mode is
enabled. (markt)
Cluster
* 48717: Ensure session activation events are fired. (markt)
* 50771: Ensure HttpServletRequest#getAuthType() returns the name of the
authentication scheme if request has already been authenticated. (kfujino)
* 51647: Fix session replication when a session attribute is a Java dynamic
proxy. Based on a patch by Tomasz Skutnik. (markt)
Webapps
* 41498: Add the allRolesMode attribute to the Realm configuration page in the
documentation web application. (markt)
* Configure Security Manager How-To to include a copy of the actual
conf/catalina.policy file when the documentation is built, rather than
maintaining a copy of its content. (kkolinko)
* 48997: Fixed some typos and improve cross-referencing to the HTTP Connector
and APR documentation with the SSL How-To page of the documentation web
application. (markt)
Other
* Align jpda settings in catalina.bat with catalina.sh, tc6.0.x, tc7.0.x and
trunk. (markt)
* Clarify error messages in *.sh files to mention that if a script is not found
it might be because execute permission is needed. (kkolinko)
87 lines
2.4 KiB
Makefile
87 lines
2.4 KiB
Makefile
# $NetBSD: Makefile,v 1.19 2011/09/25 08:53:37 obache Exp $
|
|
|
|
DISTNAME= apache-tomcat-${TOMCAT_VERSION}
|
|
CATEGORIES= www java
|
|
# The list of sites to download is generated by an apache website.
|
|
# The getsite.sh script parses the HTML and extracts the urls.
|
|
|
|
MAINTAINER= pkgsrc-users@NetBSD.org
|
|
HOMEPAGE= http://tomcat.apache.org/
|
|
COMMENT= The Apache Project's Java Servlet 2.4 and JSP 2.0 server
|
|
|
|
LICENSE= apache-2.0
|
|
|
|
PKG_DESTDIR_SUPPORT= user-destdir
|
|
|
|
TOMCAT_VERSION= 5.5.34
|
|
|
|
USE_JAVA= run
|
|
# This needs java 1.5 or higher.
|
|
USE_JAVA2= 1.5
|
|
|
|
USE_TOOLS+= pax
|
|
|
|
TOMCAT_LIB= ${PREFIX}/tomcat
|
|
CATALINA_DIR= Catalina/localhost
|
|
|
|
EGDIR= ${TOMCAT_LIB}/share/examples/apache-tomcat
|
|
EGDIR2= ${EGDIR}/${CATALINA_DIR}
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
# Work around a bug in NetBSD 2.0's pax-as-tar (bin/27228)
|
|
.if !empty(MACHINE_PLATFORM:MNetBSD-2.0*)
|
|
EXTRACT_USING= bsdtar
|
|
.endif
|
|
|
|
PKG_SYSCONFDIR.apache-tomcat= ${TOMCAT_LIB}/conf
|
|
MAKE_DIRS= ${PKG_SYSCONFDIR.apache-tomcat}/${CATALINA_DIR}
|
|
|
|
CONFLICTS+= jakarta-tomcat55-[0-9]*
|
|
CONFLICTS+= jakarta-tomcat-[0-9]*
|
|
|
|
RCD_SCRIPTS= tomcat
|
|
CFILES= server.xml web.xml tomcat-users.xml
|
|
CFILES+= catalina.policy catalina.properties
|
|
CF2FILES= manager.xml
|
|
|
|
CONF_FILES= # empty
|
|
.for f in ${CFILES}
|
|
CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
|
|
.endfor
|
|
.for f in ${CF2FILES}
|
|
CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f}
|
|
.endfor
|
|
|
|
FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q}
|
|
|
|
# If we were going to build jsvc, this would be a start
|
|
# post-extract:
|
|
# @(cd ${WRKSRC} && ${GZCAT} bin/jsvc.tar.gz | ${TAR} xf - )
|
|
#
|
|
# post-configure:
|
|
# @(cd ${WRKSRC}/jsvc-src ; ${SH} ./configure)
|
|
|
|
do-build:
|
|
${MV} ${WRKSRC}/conf ${WRKDIR}
|
|
|
|
INSTALLATION_DIRS+= ${EGDIR2} ${TOMCAT_LIB}
|
|
|
|
do-install:
|
|
.for f in ${CFILES}
|
|
${INSTALL_DATA} ${WRKDIR}/conf/${f} ${DESTDIR}${EGDIR}
|
|
.endfor
|
|
.for f in ${CF2FILES}
|
|
${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${DESTDIR}${EGDIR2}
|
|
.endfor
|
|
${RM} -rf ${WRKSRC}/temp/*
|
|
cd ${WRKSRC} && pax -rw -pm . ${DESTDIR}${TOMCAT_LIB}
|
|
|
|
${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.bat -print | ${XARGS} ${RM} -f
|
|
${FIND} ${DESTDIR}${TOMCAT_LIB} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_LIB} -type f -name \*.sh -print | \
|
|
${XARGS} ${CHMOD} ${BINMODE}
|
|
|
|
.include "../../mk/java-vm.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|