Attachment 168409 Details for Bug 208149 – Patch File

[patch] Patch File

jetty9-9.3.8.diff (text/plain), 8.98 KB, created by David Harrigan on 2016-03-19 22:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Harrigan

Created: 2016-03-19 22:26:18 UTC

Size: 8.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 411420)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	jetty
>-PORTVERSION=	9.3.7
>+PORTVERSION=	9.3.8
> CATEGORIES=	www java
> MASTER_SITES=	ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist
> PKGNAMESUFFIX=	9
>@@ -18,7 +18,7 @@
> 
> CONFLICTS=	jetty-8.*
> 
>-JDVDATE=	v20160115
>+JDVDATE=	v20160314
> USE_JAVA=	yes
> NO_ARCH=	yes
> USES=		shebangfix
>@@ -50,7 +50,9 @@
> PLIST_SUB=	\
> 		APP_HOME=${APP_HOME} \
> 		APP_NAME=${APP_NAME} \
>-		WWWDIR=${WWWDIR}
>+		WWWDIR=${WWWDIR} \
>+		PORTVERSION=${PORTVERSION} \
>+		JDVDATE=${JDVDATE}
> 
> do-install:
> 		${MKDIR} ${STAGEDIR}${APP_HOME}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 411420)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (jetty-distribution-9.3.7.v20160115.tar.gz) = 624990a139ea455587dd681a5c15298e31bf60e6c8e1d742ce8500c8298887c3
>-SIZE (jetty-distribution-9.3.7.v20160115.tar.gz) = 11708339
>+SHA256 (jetty-distribution-9.3.8.v20160314.tar.gz) = fc4136c0abf8f86d99de1b11b3d2323bffda0d538a0f654bf741f5e84ea992bf
>+SIZE (jetty-distribution-9.3.8.v20160314.tar.gz) = 11750075
>Index: files/patch-bin_jetty.sh
>===================================================================
>--- files/patch-bin_jetty.sh	(revision 411420)
>+++ files/patch-bin_jetty.sh	(working copy)
>@@ -1,11 +1,11 @@
>---- bin/jetty.sh.orig	2015-12-06 15:19:52 UTC
>+--- bin/jetty.sh.orig	2016-03-19 21:43:53 UTC
> +++ bin/jetty.sh
>-@@ -166,7 +166,7 @@ then 
>+@@ -166,7 +166,7 @@ then
>    ETC=$HOME/etc
>  fi
>  
> -for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc; do
> +for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc /usr/local/etc/${NAME}/${NAME}{,9}; do
>-   if [ -f "$CONFIG" ] ; then 
>+   if [ -f "$CONFIG" ] ; then
>      readConfig "$CONFIG"
>    fi
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 411420)
>+++ pkg-plist	(working copy)
>@@ -18,6 +18,7 @@
> %%APP_HOME%%/%%ETCDIR%%-gcloud-sessions.xml
> %%APP_HOME%%/%%ETCDIR%%-gzip.xml
> %%APP_HOME%%/%%ETCDIR%%-http.xml
>+%%APP_NAME%%/%%ETCDIR%%-http-forwarded.xml
> %%APP_HOME%%/%%ETCDIR%%-http2.xml
> %%APP_HOME%%/%%ETCDIR%%-http2c.xml
> %%APP_HOME%%/%%ETCDIR%%-https.xml
>@@ -55,63 +56,67 @@
> %%APP_HOME%%/lib/annotations/asm-commons-5.0.1.jar
> %%APP_HOME%%/lib/annotations/javax.annotation-api-1.2.jar
> %%APP_HOME%%/lib/apache-jsp/org.eclipse.jdt.core.compiler.ecj-4.4.2.jar
>-%%APP_HOME%%/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.27.jar
> %%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.27.jar
> %%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar
> %%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar
>-%%APP_HOME%%/lib/cdi-core-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/cdi-servlet-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/cdi-websocket-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/cdi-core-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/cdi-servlet-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/cdi-websocket-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/ext/.donotdelete
>-%%APP_HOME%%/lib/fcgi/fcgi-client-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/fcgi/fcgi-server-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/http2/http2-common-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/http2/http2-hpack-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/http2/http2-server-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/fcgi/fcgi-client-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/fcgi/fcgi-server-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/http2/http2-common-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/http2/http2-hpack-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/http2/http2-server-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar
>-%%APP_HOME%%/lib/jetty-alpn-server-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-annotations-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-client-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-continuation-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-deploy-9.3.7.v20160115.jar
>-%%APP_NAME%%/lib/jetty-gcloud-session-manager-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-http-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-infinispan-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-io-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-jaas-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-jaspi-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-jmx-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-jndi-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-nosql-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-plus-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-proxy-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-quickstart-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-rewrite-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/jetty-alpn-server-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-annotations-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-client-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-continuation-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-deploy-9.3.8.v20160314.jar
>+%%APP_NAME%%/lib/jetty-gcloud-session-manager-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-http-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-infinispan-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-io-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-jaas-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-jaspi-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-jmx-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-jndi-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-nosql-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-plus-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-proxy-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-quickstart-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-rewrite-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/jetty-schemas-3.1.jar
>-%%APP_HOME%%/lib/jetty-security-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-server-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-servlet-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-servlets-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-util-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-webapp-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/jetty-xml-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/jetty-security-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-server-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-servlet-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-servlets-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-util-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-webapp-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/jetty-xml-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar
> %%APP_HOME%%/lib/jndi/javax.transaction-api-1.2.jar
>-%%APP_HOME%%/lib/monitor/jetty-monitor-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/monitor/jetty-monitor-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/servlet-api-3.1.jar
> %%APP_HOME%%/lib/setuid/jetty-setuid-java-1.0.3.jar
>-%%APP_HOME%%/lib/spring/jetty-spring-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/javax-websocket-client-impl-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/javax-websocket-server-impl-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/spring/jetty-spring-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/javax-websocket-client-impl-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/javax-websocket-server-impl-9.3.8.v20160314.jar
> %%APP_HOME%%/lib/websocket/javax.websocket-api-1.0.jar
>-%%APP_HOME%%/lib/websocket/websocket-api-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/websocket-client-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/websocket-common-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/websocket-server-9.3.7.v20160115.jar
>-%%APP_HOME%%/lib/websocket/websocket-servlet-9.3.7.v20160115.jar
>+%%APP_HOME%%/lib/websocket/websocket-api-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/websocket-client-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/websocket-common-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/websocket-server-9.3.8.v20160314.jar
>+%%APP_HOME%%/lib/websocket/websocket-servlet-9.3.8.v20160314.jar
> %%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_65.mod
> %%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_66.mod
>+%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_71.mod
>+%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_72.mod
>+%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_73.mod
>+%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_74.mod
> %%APP_HOME%%/license-eplv10-aslv20.html
> %%APP_HOME%%/logs/.donotdelete
> %%APP_HOME%%/modules/.donotdelete
>@@ -125,6 +130,7 @@
> %%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_45.mod
> %%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_51.mod
> %%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_60.mod
>+%%APP_NAME%%/modules/http-forwarded.mod
> %%APP_HOME%%/modules/alpn.mod
> %%APP_HOME%%/modules/annotations.mod
> %%APP_HOME%%/modules/apache-jsp.mod
>@@ -228,7 +234,7 @@
> %%WWWDIR%%/demo-base/etc/realm.properties
> %%WWWDIR%%/demo-base/etc/test-realm.xml
> %%WWWDIR%%/demo-base/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar
>-%%WWWDIR%%/demo-base/lib/ext/test-mock-resources-9.3.7.v20160115.jar
>+%%WWWDIR%%/demo-base/lib/ext/test-mock-resources-9.3.8.v20160314.jar
> %%WWWDIR%%/demo-base/start.d/http.ini
> %%WWWDIR%%/demo-base/start.d/https.ini
> %%WWWDIR%%/demo-base/start.d/jsp.ini

Flags:

dharrigan: maintainer-approval+

Actions: View | Diff

Attachments on bug 208149: 168409 | 168410 | 168411 | 168486 | 168487