[BACK]Return to Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / www / apache-tomcat8

File: [cvs.NetBSD.org] / pkgsrc / www / apache-tomcat8 / Makefile (download)

Revision 1.14, Mon Sep 4 13:53:49 2017 UTC (2 years, 10 months ago) by ryoon
Branch: MAIN
CVS Tags: pkgsrc-2017Q3-base
Branch point for: pkgsrc-2017Q3
Changes since 1.13: +2 -2 lines

Update to 8.0.46

Changelog:
Tomcat 8.0.46 (violetagg)
Catalina

    Fix: Additional permission for deleting files is granted to JULI as it is required by FileHandler when running under a Security Manager. The thread that cleans the log files is marked as daemon thread. (violetagg)
    Fix: 61229: Correct a regression in 8.0.44 that broke WebDAV handling for resources with names that included a & character. (markt)
    Fix: 61232: When log rotation is disabled only one separator will be used when generating the log file name. For example if the prefix is catalina. and the suffix is .log then the log file name will be catalina.log instead of catalina..log. Patch provided by Katya Stoycheva. (violetagg)
    Fix: Performance improvements for service loader look-ups (and look-ups of other class loader resources) when the web application is deployed in a packed WAR file. (markt)
    Fix: 61253: Add warn message when Digester.updateAttributes throws an exception instead of ignoring it. (csutherl)
    Fix: 61313: Make the read timeout configurable in the JNDIRealm and ensure that a read timeout will result in an attempt to fail over to the alternateURL. Based on patches by Peter Maloney and Felix Schumacher. (markt)
    Add: 61366: Add a new attribute, localDataSource, to the JDBCStore that allows the Store to be configured to use a DataSource defined by the web application rather than the default of using a globally defined DataSource. Patch provided by Jonathan Horowitz. (markt)

Coyote

    Fix: 61086: Ensure to explicitly signal an empty request body for HTTP 205 responses. Additional fix to r1795278. Based on a patch provided by Alexandr Saperov. (violetagg)
    Fix: 61322: Correct two regressions caused by the fix for 60319 when using BIO with an external Executor. Firstly, use the maxThreads setting from the Executor as the default for maxConnections if none is specified. Secondly, use maxThreads from the Executor when calculating the point at which to disable keep-alive. (markt)
    Fix: Prevent exceptions being thrown during normal shutdown of NIO connections. This enables TLS connections to close cleanly. (markt)

Jasper

    Add: 53031: Add support for the fork option when compiling JSPs with the Jasper Ant task and javac. (markt)

WebSocket

    Add: 57767: Add support to the WebSocket client for following redirects when attempting to establish a WebSocket connection. Patch provided by J Fernandez. (markt)

Web applications

    Fix: Remove references to the Loader attribute searchExternalFirst from the documentation since the attribute is no longer supported. (markt)
    Fix: Correct the documentation for how StandardRoot is configured. (markt)

Other

    Add: 52791: Add the ability to set the defaults used by the Windows installer from a configuration file. Patch provided by Sandra Madden. (markt)

# $NetBSD: Makefile,v 1.14 2017/09/04 13:53:49 ryoon 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.46
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"