Bug 188329 - [PATCH] www/tomcat6 tomcat 6.0.39
Summary: [PATCH] www/tomcat6 tomcat 6.0.39
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Alex Dupre
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-04-06 23:40 UTC by wombat
Modified: 2014-04-07 10:28 UTC (History)
0 users

See Also:


Attachments
file.diff (1.15 KB, patch)
2014-04-06 23:40 UTC, wombat
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description wombat 2014-04-06 23:40:00 UTC
Changes since 6.0.37

Tomcat 6.0.39 (markt)
Catalina
fix	55166: Fix regression that broke XML validation when running on some Java 5 JVMs. (kkolinko)
Coyote
fix	 Make the HTTP NIO connector tolerant of whitespace in the individual values used for the ciphers attribute. (markt)
fix	 Remove dependency introduced on the jsp-api.jar as part of the XML validation changes introduced in 6.0.38. (markt)
Jasper
fix	 Correct several errors in jspxml Schema and DTD. (kkolinko)
Cluster
code	 Remove an empty TestTwoPhaseCommit test from Tribes. (kkolinko)
Web applications
fix	 Fix broken link in Jasper How-To documentation. (markt)
fix	 Align index.html and index.jsp in ROOT web application. Correct links to specifications and to the Tomcat mailing lists. (kkolinko)
fix	 Remove second copy of RUNNING.txt from the full-docs distribution. Some unpacking utilities can't handle multiple copies of a file with the same name in a directory. (kkolinko)
Other
update	 Update sample Eclipse IDE project: use JUnit 4 library and prefer a Java 5 JDK when several JDKs are configured. Cleanup the Ant build files. (kkolinko)
fix	 Correct Maven dependencies for individual JAR files. (markt)
Tomcat 6.0.38 (markt)	not released
Catalina
fix	 Ensure that when Tomcat's anti-resource locking features are used that the temporary copy of the web application and not the original is removed when the web application stops. (markt/kkolinko)
fix	55019: Fix a potential exception when accessing JSPs while running under a SecurityManager. (jfclere)
fix	55052: Make JULI's LogManager to additionally look for logging properties without prefixes if the property cannot be found with a prefix. (kkolinko)
fix	55266: Ensure that the session ID is parsed from the request before any redirect as the session ID may need to be encoded as part of the redirect URL. (markt)
fix	55404: Log warnings about using security roles in web.xml as warnings. (markt)
fix	55268: Added optional --service-start-wait-time command-line option to change service start wait time from default of 10 seconds. (schultz)
fix	 Correctly associate the default resource bundle with the English locale so that requests that specify an Accept-Language of English ahead of French, Spanish or Japanese get the English messages they asked for. (markt)
fix	 Add missing JavaEE 5 XML schema definitions. (markt)
fix	 When Catalina parses TLD files, always use a namespace aware parser to be consistent with how Jasper parses TLD files. The tldNamespaceAware attribute of the Context is now ignored. (markt)
fix	 As per section SRV.14.4.3 of the Servlet 2.5 specification, a namespace aware, validating parser will be used when processing *.tld and web.xml files if the system property org.apache.catalina.STRICT_SERVLET_COMPLIANCE is set to true. (markt)
fix	 Ensure that sessions IDs are not parsed from URLs for Contexts where disableURLRewriting is true. (markt)
add	 Add an option to the Context to control the blocking of XML external entities when parsing XML configuration files and enable this blocking by default when a security manager is used. The block is implemented via a custom resolver to enable the logging of any blocked entities. (markt)
fix	56016: When loading resources for XML schema validation, take account of the possibility that servlet-api.jar and jsp-api.jar may not be loaded by the same class loader. Patch by Juan Carlos Estibariz. (markt)
Coyote
fix	52811: Fix parsing of Content-Type header in HttpServletResponse.setContentType(). Introduces a new HTTP header parser that follows RFC2616. (markt)
fix	54691: Add configuration attribute "sslEnabledProtocols" to HTTP connector and document it. (Internally this attribute has been already implemented but not documented, under names "protocols" and "sslProtocols". Those names of this attribute are now deprecated). (schultz)
fix	54947: Fix the HTTP NIO connector that incorrectly rejected a request if the CRLF terminating the request line was split across multiple packets. Patch by Konstantin Preißer. (markt)
fix	55228: Allow web applications to set a HTTP Date header. (markt)
fix	 Better adherence to RFC2616 for content-length headers. (markt)
fix	 Add support for limiting the size of chunk extensions when using chunked encoding. (markt)
fix	55749: Improve the error message when SSLEngine is disabled in the AprLifecycleListener and SSL is configured for an APR/native connector. (markt)
fix	 Avoid possible NPE if a content type is specified without a character set. (markt)
Jasper
fix	55198: Ensure attribute values in tagx files that include EL and quoted XML characters are correctly quoted in the output. (markt)
fix	55671: Consistently use the configuration option name genStringAsCharArray rather than a mixture of genStrAsCharArray and genStringAsCharArray but retain support for genStrAsCharArray as in initialisation parameter for the JSP servlet to retain backwards compatibility with existing configurations. (markt)
fix	55691: Fix javax.el.ArrayELResolver to correctly handle the case where the base object is an array of primitives. (markt)
fix	55973: Fix processing of XML schemas when validation is enabled in Jasper. (kkolinko)
Web applications
add	 Add documentation for o.a.c.tribes.group.interceptors.TcpFailureDetector. (kfujino)
add	 Complete the documentation for MessageDispatch15Interceptor. (kfujino)
add	 Add to cluster document a description of notifyLifecycleListenerOnFailure and heartbeatBackgroundEnabled. (kfujino)
fix	55746: Add documentation on the allRolesMode to the CombinedRealm and LockOutRealm. Patch by Cédric Couralet. (markt)
fix	 Fix the sample configuration of StaticMembershipInterceptor in order to prevent warning log. uniqueId must be 16 bytes. (kfujino)
fix	55119: Avoid CVE-2013-1571 when generating Javadoc. (markt)
Other
update	 Update Maven Central location used to download dependencies at build time to be repo.maven.apache.org. (kkolinko)
fix	55663: Minor correction to the wording of the NOTICE files to align them with the requirements for NOTICE files. (violetagg)
fix	 Add @since markers to the common annotations classes and fix a few specification compliance issues. (markt)
update	 Update to Eclipse JDT Compiler 4.3.1. (markt)
update	 Update the Apache Jakarta JSTL implementation used by the exmaples web application to 1.1.2. (markt)

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2014-04-06 23:40:04 UTC
Responsible Changed
From-To: freebsd-ports-bugs->ale

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2014-04-07 09:24:56 UTC
Author: ale
Date: Mon Apr  7 08:24:52 2014
New Revision: 350433
URL: http://svnweb.freebsd.org/changeset/ports/350433
QAT: https://qat.redports.org/buildarchive/r350433/

Log:
  Update to 6.0.39 release and stagify.
  
  PR:		ports/188329
  Submitted by:	Patrick Abeya <wombat@marsupial.org>

Modified:
  head/www/tomcat6/Makefile
  head/www/tomcat6/distinfo
  head/www/tomcat6/pkg-plist

Modified: head/www/tomcat6/Makefile
==============================================================================
--- head/www/tomcat6/Makefile	Mon Apr  7 08:21:23 2014	(r350432)
+++ head/www/tomcat6/Makefile	Mon Apr  7 08:24:52 2014	(r350433)
@@ -2,10 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	6.0.37
+PORTVERSION=	6.0.39
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
+PKGNAMESUFFIX=	6
 DISTNAME=	apache-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ale@FreeBSD.org
@@ -38,7 +39,6 @@ TOMCAT_CONF_FILES=	catalina.policy catal
 CONF_EXT=	sample
 PLIST_SUB=	T=${APP_HOME:S/^${PREFIX}\///} CONF_EXT=${CONF_EXT} \
 		WWWOWN=${TOMCAT_USER} WWWGRP=${TOMCAT_GROUP}
-LATEST_LINK=	${APP_SHORTNAME}
 
 SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		APP_HOME=${APP_HOME} \
@@ -53,7 +53,6 @@ SUB_LIST=	AJP_1_3_PORT=${AJP_1_3_PORT} \
 		TOMCAT_VERSION=${MAJOR_VER:S/.//} \
 		USER=${TOMCAT_USER}
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 pre-patch:
@@ -80,30 +79,17 @@ pre-install:
 
 do-install:
 	@${ECHO_MSG} -n ">> Creating destination directory..."
-	@${MKDIR} ${APP_HOME}
-	@${MKDIR} ${LOG_DIR}
-	@${MKDIR} ${APP_HOME}/endorsed
+	@${MKDIR} ${STAGEDIR}${APP_HOME}
+	@${MKDIR} ${STAGEDIR}${LOG_DIR}
+	@${MKDIR} ${STAGEDIR}${APP_HOME}/endorsed
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Copying files to destination directory..."
-	@${CP} -R ${WRKSRC}/* ${APP_HOME}
-	@${ECHO_MSG} " [ DONE ]"
-
-.for f in ${TOMCAT_CONF_FILES}
-.	if !exists(${APP_HOME}/conf/${f})
-		@${CP} ${APP_HOME}/conf/${f}.${CONF_EXT} ${APP_HOME}/conf/${f}
-.	else
-		@${ECHO_MSG} ">> Preserving local configuration file: ${f} [ DONE ]"
-.	endif
-.endfor
-
-	@${ECHO_MSG} -n ">> Fixing ownership settings..."
-	@${CHOWN} -R ${TOMCAT_USER}:${TOMCAT_GROUP} ${APP_HOME}/conf ${APP_HOME}/logs \
-		${APP_HOME}/temp ${APP_HOME}/webapps ${APP_HOME}/work
+	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${APP_HOME}
 	@${ECHO_MSG} " [ DONE ]"
 
 	@${ECHO_MSG} -n ">> Fixing permissions..."
-	@${FIND} ${APP_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
+	@${FIND} ${STAGEDIR}${APP_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
 	@${ECHO_MSG} " [ DONE ]"
 
 .include <bsd.port.post.mk>

Modified: head/www/tomcat6/distinfo
==============================================================================
--- head/www/tomcat6/distinfo	Mon Apr  7 08:21:23 2014	(r350432)
+++ head/www/tomcat6/distinfo	Mon Apr  7 08:24:52 2014	(r350433)
@@ -1,2 +1,2 @@
-SHA256 (apache-tomcat-6.0.37.tar.gz) = 3e91abc752bf2b6ca19df9c8644bccdd92ba837397a8c1a745d72f58d5301b00
-SIZE (apache-tomcat-6.0.37.tar.gz) = 6885442
+SHA256 (apache-tomcat-6.0.39.tar.gz) = debdeafe900f5eb85f8816ea235ab7e3e5261071b2ea01ac288241e794e911a7
+SIZE (apache-tomcat-6.0.39.tar.gz) = 7065481

Modified: head/www/tomcat6/pkg-plist
==============================================================================
--- head/www/tomcat6/pkg-plist	Mon Apr  7 08:21:23 2014	(r350432)
+++ head/www/tomcat6/pkg-plist	Mon Apr  7 08:24:52 2014	(r350433)
@@ -43,7 +43,7 @@
 %%T%%/lib/catalina-ha.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.2.2.jar
+%%T%%/lib/ecj-4.3.1.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Alex Dupre freebsd_committer 2014-04-07 10:28:27 UTC
State Changed
From-To: open->closed

Committed, thanks!