View | Details | Raw Unified | Return to bug 208149 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +5 lines)
Lines 1-7 Link Here
1 
# $FreeBSD$
 1 
# $FreeBSD$
2 

          2
          

        

        

          3
          
PORTNAME=	jetty

          3
          
PORTNAME=	jetty

        

          
            

              4
              
PORTVERSION=	9.3.7


              4
              
PORTVERSION=	9.3.8

            

        

          5
          
CATEGORIES=	www java

          5
          
CATEGORIES=	www java

        

        

          6
          
MASTER_SITES=	ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist

          6
          
MASTER_SITES=	ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist

        

        

          7
          
PKGNAMESUFFIX=	9

          7
          
PKGNAMESUFFIX=	9

        

  

    
      
            Lines 18-24
          
      
      
        Link Here
      
    
  

        

          18
          

          18
          

        

        

          19
          
CONFLICTS=	jetty-8.*

          19
          
CONFLICTS=	jetty-8.*

        

        

          20
          

          20
          

        

          
            

              21
              
JDVDATE=	v20160115


              21
              
JDVDATE=	v20160314

            

        

          22
          
USE_JAVA=	yes

          22
          
USE_JAVA=	yes

        

        

          23
          
NO_ARCH=	yes

          23
          
NO_ARCH=	yes

        

        

          24
          
USES=		shebangfix

          24
          
USES=		shebangfix

        

  

    
      
            Lines 50-56
          
      
      
        Link Here
      
    
  

        

          50
          
PLIST_SUB=	\

          50
          
PLIST_SUB=	\

        

        

          51
          
		APP_HOME=${APP_HOME} \

          51
          
		APP_HOME=${APP_HOME} \

        

        

          52
          
		APP_NAME=${APP_NAME} \

          52
          
		APP_NAME=${APP_NAME} \

        

          
            

              53
              
		WWWDIR=${WWWDIR}


              53
              
		WWWDIR=${WWWDIR} \

            

            

              
              

              54
              
		PORTVERSION=${PORTVERSION} \

            

            


              55
              
		JDVDATE=${JDVDATE}

            

        

          54
          

          56
          

        

        

          55
          
do-install:

          57
          
do-install:

        

        

          56
          
		${MKDIR} ${STAGEDIR}${APP_HOME}

          58
          
		${MKDIR} ${STAGEDIR}${APP_HOME}

        



(-)distinfo
      (-2 / +2 lines)




  

    
      
            Lines 1-2
          
      
      
        Link Here
      
    
  

          
            

              1
              
SHA256 (jetty-distribution-9.3.7.v20160115.tar.gz) = 624990a139ea455587dd681a5c15298e31bf60e6c8e1d742ce8500c8298887c3


              1
              
SHA256 (jetty-distribution-9.3.8.v20160314.tar.gz) = fc4136c0abf8f86d99de1b11b3d2323bffda0d538a0f654bf741f5e84ea992bf

            

            

              2
              
SIZE (jetty-distribution-9.3.7.v20160115.tar.gz) = 11708339


              2
              
SIZE (jetty-distribution-9.3.8.v20160314.tar.gz) = 11750075

            



(-)files/patch-bin_jetty.sh
      (-3 / +3 lines)




  

    
      
            Lines 1-11
          
      
      
        Link Here
      
    
  

          
            

              1
              
--- bin/jetty.sh.orig	2015-12-06 15:19:52 UTC


              1
              
--- bin/jetty.sh.orig	2016-03-19 21:43:53 UTC

            

        

          2
          
+++ bin/jetty.sh

          2
          
+++ bin/jetty.sh

        

          
            

              3
              
@@ -166,7 +166,7 @@ then 


              3
              
@@ -166,7 +166,7 @@ then

            

        

          4
          
   ETC=$HOME/etc

          4
          
   ETC=$HOME/etc

        

        

          5
          
 fi

          5
          
 fi

        

        

          6
          
 

          6
          
 

        

        

          7
          
-for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc; do

          7
          
-for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc; do

        

        

          8
          
+for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc /usr/local/etc/${NAME}/${NAME}{,9}; do

          8
          
+for CONFIG in {/etc,~/etc}/default/${NAME}{,9} $HOME/.${NAME}rc /usr/local/etc/${NAME}/${NAME}{,9}; do

        

          
            

              9
              
   if [ -f "$CONFIG" ] ; then 


              9
              
   if [ -f "$CONFIG" ] ; then

            

        

          10
          
     readConfig "$CONFIG"

          10
          
     readConfig "$CONFIG"

        

        

          11
          
   fi

          11
          
   fi

        



(-)pkg-plist
      (-44 / +50 lines)




  

    
      
            Lines 18-23
          
      
      
        Link Here
      
    
  

        

          18
          
%%APP_HOME%%/%%ETCDIR%%-gcloud-sessions.xml

          18
          
%%APP_HOME%%/%%ETCDIR%%-gcloud-sessions.xml

        

        

          19
          
%%APP_HOME%%/%%ETCDIR%%-gzip.xml

          19
          
%%APP_HOME%%/%%ETCDIR%%-gzip.xml

        

        

          20
          
%%APP_HOME%%/%%ETCDIR%%-http.xml

          20
          
%%APP_HOME%%/%%ETCDIR%%-http.xml

        

            

              
              
              21
              
%%APP_NAME%%/%%ETCDIR%%-http-forwarded.xml

            

        

          21
          
%%APP_HOME%%/%%ETCDIR%%-http2.xml

          22
          
%%APP_HOME%%/%%ETCDIR%%-http2.xml

        

        

          22
          
%%APP_HOME%%/%%ETCDIR%%-http2c.xml

          23
          
%%APP_HOME%%/%%ETCDIR%%-http2c.xml

        

        

          23
          
%%APP_HOME%%/%%ETCDIR%%-https.xml

          24
          
%%APP_HOME%%/%%ETCDIR%%-https.xml

        

  

    
      
            Lines 55-117
          
      
      
        Link Here
      
    
  

        

          55
          
%%APP_HOME%%/lib/annotations/asm-commons-5.0.1.jar

          56
          
%%APP_HOME%%/lib/annotations/asm-commons-5.0.1.jar

        

        

          56
          
%%APP_HOME%%/lib/annotations/javax.annotation-api-1.2.jar

          57
          
%%APP_HOME%%/lib/annotations/javax.annotation-api-1.2.jar

        

        

          57
          
%%APP_HOME%%/lib/apache-jsp/org.eclipse.jdt.core.compiler.ecj-4.4.2.jar

          58
          
%%APP_HOME%%/lib/apache-jsp/org.eclipse.jdt.core.compiler.ecj-4.4.2.jar

        

          
            

              58
              
%%APP_HOME%%/lib/apache-jsp/org.eclipse.jetty.apache-jsp-9.3.7.v20160115.jar


              59
              
%%APP_HOME%%/lib/apache-jsp/org.eclipse.jetty.apache-jsp-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          59
          
%%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.27.jar

          60
          
%%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-el-8.0.27.jar

        

        

          60
          
%%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.27.jar

          61
          
%%APP_HOME%%/lib/apache-jsp/org.mortbay.jasper.apache-jsp-8.0.27.jar

        

        

          61
          
%%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar

          62
          
%%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-impl-1.2.5.jar

        

        

          62
          
%%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar

          63
          
%%APP_HOME%%/lib/apache-jstl/org.apache.taglibs.taglibs-standard-spec-1.2.5.jar

        

          
            

              63
              
%%APP_HOME%%/lib/cdi-core-9.3.7.v20160115.jar


              64
              
%%APP_HOME%%/lib/cdi-core-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              64
              
%%APP_HOME%%/lib/cdi-servlet-9.3.7.v20160115.jar


              65
              
%%APP_HOME%%/lib/cdi-servlet-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              65
              
%%APP_HOME%%/lib/cdi-websocket-9.3.7.v20160115.jar


              66
              
%%APP_HOME%%/lib/cdi-websocket-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          66
          
%%APP_HOME%%/lib/ext/.donotdelete

          67
          
%%APP_HOME%%/lib/ext/.donotdelete

        

          
            

              67
              
%%APP_HOME%%/lib/fcgi/fcgi-client-9.3.7.v20160115.jar


              68
              
%%APP_HOME%%/lib/fcgi/fcgi-client-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              68
              
%%APP_HOME%%/lib/fcgi/fcgi-server-9.3.7.v20160115.jar


              69
              
%%APP_HOME%%/lib/fcgi/fcgi-server-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              69
              
%%APP_HOME%%/lib/http2/http2-common-9.3.7.v20160115.jar


              70
              
%%APP_HOME%%/lib/http2/http2-common-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              70
              
%%APP_HOME%%/lib/http2/http2-hpack-9.3.7.v20160115.jar


              71
              
%%APP_HOME%%/lib/http2/http2-hpack-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              71
              
%%APP_HOME%%/lib/http2/http2-server-9.3.7.v20160115.jar


              72
              
%%APP_HOME%%/lib/http2/http2-server-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          72
          
%%APP_HOME%%/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar

          73
          
%%APP_HOME%%/lib/jaspi/javax.security.auth.message-1.0.0.v201108011116.jar

        

          
            

              73
              
%%APP_HOME%%/lib/jetty-alpn-server-9.3.7.v20160115.jar


              74
              
%%APP_HOME%%/lib/jetty-alpn-server-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              74
              
%%APP_HOME%%/lib/jetty-annotations-9.3.7.v20160115.jar


              75
              
%%APP_HOME%%/lib/jetty-annotations-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              75
              
%%APP_HOME%%/lib/jetty-client-9.3.7.v20160115.jar


              76
              
%%APP_HOME%%/lib/jetty-client-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              76
              
%%APP_HOME%%/lib/jetty-continuation-9.3.7.v20160115.jar


              77
              
%%APP_HOME%%/lib/jetty-continuation-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              77
              
%%APP_HOME%%/lib/jetty-deploy-9.3.7.v20160115.jar


              78
              
%%APP_HOME%%/lib/jetty-deploy-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              78
              
%%APP_NAME%%/lib/jetty-gcloud-session-manager-9.3.7.v20160115.jar


              79
              
%%APP_NAME%%/lib/jetty-gcloud-session-manager-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              79
              
%%APP_HOME%%/lib/jetty-http-9.3.7.v20160115.jar


              80
              
%%APP_HOME%%/lib/jetty-http-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              80
              
%%APP_HOME%%/lib/jetty-infinispan-9.3.7.v20160115.jar


              81
              
%%APP_HOME%%/lib/jetty-infinispan-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              81
              
%%APP_HOME%%/lib/jetty-io-9.3.7.v20160115.jar


              82
              
%%APP_HOME%%/lib/jetty-io-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              82
              
%%APP_HOME%%/lib/jetty-jaas-9.3.7.v20160115.jar


              83
              
%%APP_HOME%%/lib/jetty-jaas-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              83
              
%%APP_HOME%%/lib/jetty-jaspi-9.3.7.v20160115.jar


              84
              
%%APP_HOME%%/lib/jetty-jaspi-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              84
              
%%APP_HOME%%/lib/jetty-jmx-9.3.7.v20160115.jar


              85
              
%%APP_HOME%%/lib/jetty-jmx-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              85
              
%%APP_HOME%%/lib/jetty-jndi-9.3.7.v20160115.jar


              86
              
%%APP_HOME%%/lib/jetty-jndi-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              86
              
%%APP_HOME%%/lib/jetty-nosql-9.3.7.v20160115.jar


              87
              
%%APP_HOME%%/lib/jetty-nosql-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              87
              
%%APP_HOME%%/lib/jetty-plus-9.3.7.v20160115.jar


              88
              
%%APP_HOME%%/lib/jetty-plus-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              88
              
%%APP_HOME%%/lib/jetty-proxy-9.3.7.v20160115.jar


              89
              
%%APP_HOME%%/lib/jetty-proxy-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              89
              
%%APP_HOME%%/lib/jetty-quickstart-9.3.7.v20160115.jar


              90
              
%%APP_HOME%%/lib/jetty-quickstart-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              90
              
%%APP_HOME%%/lib/jetty-rewrite-9.3.7.v20160115.jar


              91
              
%%APP_HOME%%/lib/jetty-rewrite-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          91
          
%%APP_HOME%%/lib/jetty-schemas-3.1.jar

          92
          
%%APP_HOME%%/lib/jetty-schemas-3.1.jar

        

          
            

              92
              
%%APP_HOME%%/lib/jetty-security-9.3.7.v20160115.jar


              93
              
%%APP_HOME%%/lib/jetty-security-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              93
              
%%APP_HOME%%/lib/jetty-server-9.3.7.v20160115.jar


              94
              
%%APP_HOME%%/lib/jetty-server-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              94
              
%%APP_HOME%%/lib/jetty-servlet-9.3.7.v20160115.jar


              95
              
%%APP_HOME%%/lib/jetty-servlet-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              95
              
%%APP_HOME%%/lib/jetty-servlets-9.3.7.v20160115.jar


              96
              
%%APP_HOME%%/lib/jetty-servlets-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              96
              
%%APP_HOME%%/lib/jetty-util-9.3.7.v20160115.jar


              97
              
%%APP_HOME%%/lib/jetty-util-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              97
              
%%APP_HOME%%/lib/jetty-webapp-9.3.7.v20160115.jar


              98
              
%%APP_HOME%%/lib/jetty-webapp-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              98
              
%%APP_HOME%%/lib/jetty-xml-9.3.7.v20160115.jar


              99
              
%%APP_HOME%%/lib/jetty-xml-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          99
          
%%APP_HOME%%/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar

          100
          
%%APP_HOME%%/lib/jndi/javax.mail.glassfish-1.4.1.v201005082020.jar

        

        

          100
          
%%APP_HOME%%/lib/jndi/javax.transaction-api-1.2.jar

          101
          
%%APP_HOME%%/lib/jndi/javax.transaction-api-1.2.jar

        

          
            

              101
              
%%APP_HOME%%/lib/monitor/jetty-monitor-9.3.7.v20160115.jar


              102
              
%%APP_HOME%%/lib/monitor/jetty-monitor-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          102
          
%%APP_HOME%%/lib/servlet-api-3.1.jar

          103
          
%%APP_HOME%%/lib/servlet-api-3.1.jar

        

        

          103
          
%%APP_HOME%%/lib/setuid/jetty-setuid-java-1.0.3.jar

          104
          
%%APP_HOME%%/lib/setuid/jetty-setuid-java-1.0.3.jar

        

          
            

              104
              
%%APP_HOME%%/lib/spring/jetty-spring-9.3.7.v20160115.jar


              105
              
%%APP_HOME%%/lib/spring/jetty-spring-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              105
              
%%APP_HOME%%/lib/websocket/javax-websocket-client-impl-9.3.7.v20160115.jar


              106
              
%%APP_HOME%%/lib/websocket/javax-websocket-client-impl-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              106
              
%%APP_HOME%%/lib/websocket/javax-websocket-server-impl-9.3.7.v20160115.jar


              107
              
%%APP_HOME%%/lib/websocket/javax-websocket-server-impl-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          107
          
%%APP_HOME%%/lib/websocket/javax.websocket-api-1.0.jar

          108
          
%%APP_HOME%%/lib/websocket/javax.websocket-api-1.0.jar

        

          
            

              108
              
%%APP_HOME%%/lib/websocket/websocket-api-9.3.7.v20160115.jar


              109
              
%%APP_HOME%%/lib/websocket/websocket-api-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              109
              
%%APP_HOME%%/lib/websocket/websocket-client-9.3.7.v20160115.jar


              110
              
%%APP_HOME%%/lib/websocket/websocket-client-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              110
              
%%APP_HOME%%/lib/websocket/websocket-common-9.3.7.v20160115.jar


              111
              
%%APP_HOME%%/lib/websocket/websocket-common-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              111
              
%%APP_HOME%%/lib/websocket/websocket-server-9.3.7.v20160115.jar


              112
              
%%APP_HOME%%/lib/websocket/websocket-server-%%PORTVERSION%%.%%JDVDATE%%.jar

            

            

              112
              
%%APP_HOME%%/lib/websocket/websocket-servlet-9.3.7.v20160115.jar


              113
              
%%APP_HOME%%/lib/websocket/websocket-servlet-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          113
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_65.mod

          114
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_65.mod

        

        

          114
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_66.mod

          115
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_66.mod

        

            

              
              
              116
              
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_71.mod

            

            

              117
              
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_72.mod

            

            

              118
              
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_73.mod

            

            

              119
              
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_74.mod

            

        

          115
          
%%APP_HOME%%/license-eplv10-aslv20.html

          120
          
%%APP_HOME%%/license-eplv10-aslv20.html

        

        

          116
          
%%APP_HOME%%/logs/.donotdelete

          121
          
%%APP_HOME%%/logs/.donotdelete

        

        

          117
          
%%APP_HOME%%/modules/.donotdelete

          122
          
%%APP_HOME%%/modules/.donotdelete

        

  

    
      
            Lines 125-130
          
      
      
        Link Here
      
    
  

        

          125
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_45.mod

          130
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_45.mod

        

        

          126
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_51.mod

          131
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_51.mod

        

        

          127
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_60.mod

          132
          
%%APP_HOME%%/modules/alpn-impl/alpn-1.8.0_60.mod

        

            

              
              
              133
              
%%APP_NAME%%/modules/http-forwarded.mod

            

        

          128
          
%%APP_HOME%%/modules/alpn.mod

          134
          
%%APP_HOME%%/modules/alpn.mod

        

        

          129
          
%%APP_HOME%%/modules/annotations.mod

          135
          
%%APP_HOME%%/modules/annotations.mod

        

        

          130
          
%%APP_HOME%%/modules/apache-jsp.mod

          136
          
%%APP_HOME%%/modules/apache-jsp.mod

        

  

    
      
            Lines 228-234
          
      
      
        Link Here
      
    
  

        

          228
          
%%WWWDIR%%/demo-base/etc/realm.properties

          234
          
%%WWWDIR%%/demo-base/etc/realm.properties

        

        

          229
          
%%WWWDIR%%/demo-base/etc/test-realm.xml

          235
          
%%WWWDIR%%/demo-base/etc/test-realm.xml

        

        

          230
          
%%WWWDIR%%/demo-base/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar

          236
          
%%WWWDIR%%/demo-base/lib/ext/javax.mail.glassfish-1.4.1.v201005082020.jar

        

          
            

              231
              
%%WWWDIR%%/demo-base/lib/ext/test-mock-resources-9.3.7.v20160115.jar


              237
              
%%WWWDIR%%/demo-base/lib/ext/test-mock-resources-%%PORTVERSION%%.%%JDVDATE%%.jar

            

        

          232
          
%%WWWDIR%%/demo-base/start.d/http.ini

          238
          
%%WWWDIR%%/demo-base/start.d/http.ini

        

        

          233
          
%%WWWDIR%%/demo-base/start.d/https.ini

          239
          
%%WWWDIR%%/demo-base/start.d/https.ini

        

        

          234
          
%%WWWDIR%%/demo-base/start.d/jsp.ini

          240
          
%%WWWDIR%%/demo-base/start.d/jsp.ini

        






  

  Return to bug 208149