4f32309eeb
Changelog: Tomcat 7.0.90 (violetagg) Catalina fix 62498: Correct a regression in the fix for CVE-2017-12617 that caused request failures for some requests when using the VirtualDirContext. (markt) fix Delete reference to removed class that prevented Tomcat from starting when running under a security manager. (markt) Tomcat 7.0.89 (violetagg) not released Catalina 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) add 51953: Add the RemoteCIDRFilter and RemoteCIDRValve that can be used to allow/deny requests based on IPv4 and/or IPv6 client address where the IP ranges are defined using CIDR notation. Based on a patch by Francis Galiegue. (markt) fix 62343: Make CORS filter defaults more secure. This is the fix for CVE-2018-8014. (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.1 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.37 2018/07/25 22:03:30 zafer Exp $
|
|
|
|
DISTNAME= apache-tomcat-${TOMCAT_VER}
|
|
CATEGORIES= www
|
|
MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-7/v${TOMCAT_VER}/bin/}
|
|
MASTER_SITES+= https://archive.apache.org/dist/tomcat/tomcat-7/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= 6
|
|
USE_TOOLS+= pax
|
|
|
|
.include "../../mk/bsd.prefs.mk"
|
|
|
|
TOMCAT_VER= 7.0.90
|
|
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"
|