765a0bc84d
Changelog: Tomcat 8.0.53 (violetagg) Catalina Fix: Treat the <mapped-name> element of a <env-entry> in web.xml in the same way as the mappedName element of the equivalent @Resource annotation. Both now attempt to set the mappedName property of the resource. (markt) Fix: Correct the processing of resources with <injection-target>s defined in web.xml. First look for a match using JavaBean property names and then, only if a match is not found, look for a match using fields. (markt) Fix: When restoring a saved request with a request body after FORM authentication, ensure that calls to the HttpServletRequest methods getRequestURI(), getQueryString() and getProtocol() are not corrupted by the processing of the saved request body. (markt) Fix: JNDI resources that are defined with injection targets but no value are now treated as if the resource is not defined. (markt) Fix: Ensure that JNDI names used for <lookup-name> entries in web.xml and for lookup elements of @Resource annotations specify a name with an explicit java: namespace. (markt) Code: Refactor the org.apache.naming package to reduce duplicate code. Duplicate code identified by the Simian tool. (markt) Fix: 50019: Add support for <lookup-name>. Based on a patch by Gurkan Erdogdu. (markt) Fix: 60490: Various formatting and layout improvements for the ErrorReportValve. Patch provided by Michael Osipov. (markt) Fix: 62343: Make CORS filter defaults more secure. This is the fix for CVE-2018-8014. (markt) Fix: Ensure that the web application resources implementation does not incorrectly cache results for resources that are only visible as class loader resources. (markt) Fix: Make all loggers associated with Tomcat provided Filters non-static to ensure that log messages are not lost when a web application is reloaded. (markt) Fix: Correct the manifest for the annotations-api.jar. The JAR implements the Common Annotations API 1.2 and the manifest should reflect that. (markt) Fix: Switch to non-static loggers where there is a possibility of a logger becoming associated with a web application class loader causing log messages to be lost if the web application is stopped. (markt) Add: 62389: Add the IPv6 loopback address to the default internalProxies regular expression. Patch by Craig Andrews. (markt) Fix: In the RemoteIpValve and RemoteIpFilter, correctly handle the case when the request passes through one or more trustedProxies but no internalProxies. Based on a patch by zhanhb. (markt) Fix: Correct the logic in MBeanFactory.removeConnector() to ensure that the correct Connector is removed when there are multiple Connectors using different addresses but the same port. (markt) Fix: Make JAASRealm mis-configuration more obvious by requiring the authenticated Subject to include at least one Principal of a type specified by userClassNames. (markt) Fix: 62476: Use GMT timezone for the value of Expires header as required by HTTP specification (RFC 7231, 7234). (kkolinko)
98 lines
2.8 KiB
Makefile
98 lines
2.8 KiB
Makefile
# $NetBSD: Makefile,v 1.18 2018/07/25 21:20:02 zafer Exp $
|
|
#
|
|
|
|
DISTNAME= apache-tomcat-${TOMCAT_VER}
|
|
CATEGORIES= www
|
|
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-8/v${TOMCAT_VER}/bin/}
|
|
|
|
MAINTAINER= pkgsrc-users@NetBSD.org
|
|
HOMEPAGE= http://tomcat.apache.org/
|
|
COMMENT= Implementation of Java Servlet and JavaServer Pages technologies
|
|
LICENSE= apache-2.0
|
|
|
|
CONFLICTS+= jakarta-tomcat55-[0-9]*
|
|
CONFLICTS+= jakarta-tomcat-[0-9]*
|
|
|
|
NO_BUILD= yes
|
|
USE_LANGUAGES= # none
|
|
USE_JAVA= run
|
|
USE_JAVA2= 7
|
|
USE_TOOLS+= pax
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
TOMCAT_VER= 8.0.53
|
|
TOMCAT_HOME= ${PREFIX}/share/tomcat
|
|
EGDIR= ${PREFIX}/share/examples/tomcat
|
|
DOCDIR= ${PREFIX}/share/doc/tomcat
|
|
RCD_SCRIPTS= tomcat
|
|
SMF_NAME= tomcat
|
|
TOMCAT_USER?= tomcat
|
|
TOMCAT_GROUP?= tomcat
|
|
PKG_GROUPS= ${TOMCAT_GROUP}
|
|
PKG_USERS= ${TOMCAT_USER}:${TOMCAT_GROUP}
|
|
PKG_GROUPS_VARS+= TOMCAT_GROUP
|
|
PKG_USERS_VARS+= TOMCAT_USER
|
|
PKG_HOME.tomcat= ${TOMCAT_HOME}
|
|
PKG_SHELL.tomcat= ${SH}
|
|
PKG_SYSCONFDIR.tomcat= ${TOMCAT_HOME}/conf
|
|
OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR.tomcat} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755
|
|
FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_HOME=${TOMCAT_HOME} \
|
|
TOMCAT_USER=${TOMCAT_USER} TOMCAT_GROUP=${TOMCAT_GROUP}
|
|
|
|
PRIVATE_EGFILES= server.xml tomcat-users.xml
|
|
PUBLIC_EGFILES= catalina.policy catalina.properties \
|
|
context.xml logging.properties web.xml
|
|
DOCFILES= LICENSE NOTICE RELEASE-NOTES RUNNING.txt
|
|
WORK_DIRS= work temp logs
|
|
|
|
.for f in ${PRIVATE_EGFILES}
|
|
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
|
|
${TOMCAT_USER} ${TOMCAT_GROUP} 0640
|
|
.endfor
|
|
|
|
.for f in ${PUBLIC_EGFILES}
|
|
CONF_FILES_PERMS+= ${EGDIR}/${f} ${PKG_SYSCONFDIR.tomcat}/${f} \
|
|
${TOMCAT_USER} ${TOMCAT_GROUP} 0644
|
|
.endfor
|
|
|
|
.for d in ${WORK_DIRS}
|
|
OWN_DIRS_PERMS+= ${TOMCAT_HOME}/${d} ${TOMCAT_USER} ${TOMCAT_GROUP} 0755
|
|
.endfor
|
|
|
|
INSTALLATION_DIRS+= ${TOMCAT_HOME} ${EGDIR} ${DOCDIR}
|
|
|
|
do-install:
|
|
.for d in ${WORK_DIRS}
|
|
${RM} -rf ${WRKSRC}/${d}
|
|
.endfor
|
|
|
|
.for f in ${DOCFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f}
|
|
${RM} -f ${WRKSRC}/${f}
|
|
.endfor
|
|
|
|
.for f in ${PRIVATE_EGFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
|
|
${RM} -f ${WRKSRC}/conf/${f}
|
|
.endfor
|
|
|
|
.for f in ${PUBLIC_EGFILES}
|
|
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${DESTDIR}${EGDIR}/${f}
|
|
${RM} -f ${WRKSRC}/conf/${f}
|
|
.endfor
|
|
|
|
${FIND} ${WRKSRC} -name \*.exe -type f -print | ${XARGS} ${RM} -f
|
|
${FIND} ${WRKSRC} -name \*.bat -type f -print | ${XARGS} ${RM} -f
|
|
|
|
cd ${WRKSRC} && ${PAX} -rw -pm . ${DESTDIR}${TOMCAT_HOME}
|
|
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type d -print | \
|
|
${XARGS} ${CHMOD} ${PKGDIRMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -print | \
|
|
${XARGS} ${CHMOD} ${SHAREMODE}
|
|
${FIND} ${DESTDIR}${TOMCAT_HOME} -type f -name \*.sh -print | \
|
|
${XARGS} ${CHMOD} ${BINMODE}
|
|
|
|
.include "../../mk/java-vm.mk"
|
|
.include "../../mk/bsd.pkg.mk"
|