update to 9.3.11

5 files changed, 22 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index debced55184e..8ea44a35c187 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Wed Feb  3 16:13:15 UTC 2016
 pkgbase = jetty
 	pkgdesc = Jetty is a pure Java-based HTTP server and Java Servlet container
-	pkgver = 9.3.6
+	pkgver = 9.3.11
 	pkgrel = 1
 	url = http://www.eclipse.org/jetty/
 	install = jetty.install
@@ -11,16 +9,16 @@ pkgbase = jetty
 	license = EPL
 	depends = java-environment
 	options = !strip
-	source = jetty-distribution-9.3.6.v20151106.tar.gz::http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.3.6.v20151106.tar.gz&r=1
+	source = jetty-distribution-9.3.11.v20160721.tar.gz::http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.11.v20160721/jetty-distribution-9.3.11.v20160721.tar.gz
 	source = jetty.default
 	source = jetty.logrotate
 	source = jetty.service
 	source = rundir.patch
-	sha256sums = ad3086ca320843c99eb9e3dfc5aec784be44fb1339993e708112f871dc46248f
-	sha256sums = 51bc2d2931629eece6b70679d9e0a3d5695822c00dae02e67fd0216f482f040c
+	sha256sums = 6f720a39324ba02491c5dd598039f9cda1746d45c26594f8189692058f9f4264
+	sha256sums = e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d
 	sha256sums = da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb
 	sha256sums = 36266b7f4daf20871f4bf5636686e37fa5ffd173fd51303f2569fc8d453fa17a
-	sha256sums = 8e12ab99278363d52bc083de886ccc5e2fe48e59dd8c419ce531503b94ad02ba
+	sha256sums = 596bb12d69ec25eba94b911619597786b246c6c867e9ce1e75f1585cd93663bf
 
 pkgname = jetty
 
diff --git a/PKGBUILD b/PKGBUILD
index dd533e3fa374..65d97b25922f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Yegorius <yegorius@domic.us>
 
 pkgname=jetty
-pkgver=9.3.6
-_timestamp=v20151106
+pkgver=9.3.11
+_timestamp=v20160721
 pkgrel=1
 pkgdesc="Jetty is a pure Java-based HTTP server and Java Servlet container"
 arch=('any')
@@ -13,17 +13,17 @@ license=('Apache' 'EPL')
 depends=('java-environment')
 options=('!strip')
 _distname=jetty-distribution-$pkgver.$_timestamp
-_dluri="http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/$_distname.tar.gz&r=1"
+_dluri="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.11.v20160721/$_distname.tar.gz"
 source=("$_distname.tar.gz::$_dluri"
 	jetty.default
 	jetty.logrotate
 	jetty.service
 	rundir.patch)
-sha256sums=('ad3086ca320843c99eb9e3dfc5aec784be44fb1339993e708112f871dc46248f'
-            '51bc2d2931629eece6b70679d9e0a3d5695822c00dae02e67fd0216f482f040c'
+sha256sums=('6f720a39324ba02491c5dd598039f9cda1746d45c26594f8189692058f9f4264'
+            'e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d'
             'da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb'
             '36266b7f4daf20871f4bf5636686e37fa5ffd173fd51303f2569fc8d453fa17a'
-            '8e12ab99278363d52bc083de886ccc5e2fe48e59dd8c419ce531503b94ad02ba')
+            '596bb12d69ec25eba94b911619597786b246c6c867e9ce1e75f1585cd93663bf')
 install=$pkgname.install
 
 package() {
diff --git a/jetty.default b/jetty.default
index 3e585d84371c..6303b4fa8e5d 100644
--- a/jetty.default
+++ b/jetty.default
@@ -1,4 +1,4 @@
-#JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-7-openjdk/jre}
+#JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-8-openjdk/jre}
 #JAVA=$JAVA_HOME/bin/java
 #JAVA_OPTIONS=
 
diff --git a/jetty.install b/jetty.install
index 19aac207d6cb..708ca53af187 100644
--- a/jetty.install
+++ b/jetty.install
@@ -7,18 +7,18 @@ post_install() {
 }
 
 post_upgrade(){
-	getent group jetty > /dev/null 2>&1 || groupadd jetty &> /dev/null
-	getent passwd jetty > /dev/null 2>&1 || useradd -g jetty -d /usr/share/jetty -s /bin/false jetty &> /dev/null
+	getent group jetty &> /dev/null || groupadd jetty &> /dev/null
+	getent passwd jetty &> /dev/null || useradd -g jetty -d /usr/share/jetty -s /bin/false jetty &> /dev/null
 	chown -R jetty:jetty /usr/share/jetty
 	chown -R jetty:jetty /var/log/jetty
 	chown -R jetty:jetty /var/lib/jetty/webapps
 }
 
 post_remove() {
-	if getent passwd jetty > /dev/null 2>&1; then
+	if getent passwd jetty &> /dev/null; then
 		userdel jetty
 	fi
-	if getent group jetty > /dev/null 2>&1; then
+	if getent group jetty &> /dev/null; then
 		groupdel jetty
 	fi
 }
diff --git a/rundir.patch b/rundir.patch
index 16f0a2683437..71d5b9f2f654 100644
--- a/rundir.patch
+++ b/rundir.patch
@@ -1,21 +1,21 @@
---- a/jetty.sh	2015-09-04 00:09:38.125980578 +0300
-+++ b/jetty.sh	2015-09-04 00:09:38.149313264 +0300
+--- a/bin/jetty.sh	2016-07-22 05:00:44.000000000 +0300
++++ b/bin/jetty.sh	2016-08-05 14:22:39.241222381 +0300
 @@ -261,10 +261,8 @@
  #####################################################
  # Find a location for the pid file
  #####################################################
--if [ -z "$JETTY_RUN" ] 
+-if [ -z "$JETTY_RUN" ]
 -then
 -  JETTY_RUN=$(findDirectory -w /var/run /usr/var/run $JETTY_BASE /tmp)
 -fi
-+mkdir -p "$JETTY_RUN"
-+chown -R "$JETTY_USER":"$JETTY_USER" "$JETTY_RUN"
++mkdir -p $JETTY_RUN
++chown -R $JETTY_USER:$JETTY_USER $JETTY_RUN
  
  #####################################################
  # Find a pid and state file
 @@ -276,7 +274,7 @@
  
- if [ -z "$JETTY_STATE" ] 
+ if [ -z "$JETTY_STATE" ]
  then
 -  JETTY_STATE=$JETTY_BASE/${NAME}.state
 +  JETTY_STATE=$JETTY_RUN/${NAME}.state