9.4.3 release

3 files changed, 8 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 662935476bf8..dd16667b973b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = jetty
 	pkgdesc = Jetty is a pure Java-based HTTP server and Java Servlet container
-	pkgver = 9.3.13
+	pkgver = 9.4.3
 	pkgrel = 1
 	url = http://www.eclipse.org/jetty/
 	install = jetty.install
@@ -9,16 +9,14 @@ pkgbase = jetty
 	license = EPL
 	depends = java-environment
 	options = !strip
-	source = jetty-distribution-9.3.13.v20161014.tar.gz::http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.3.13.v20161014/jetty-distribution-9.3.13.v20161014.tar.gz
+	source = jetty-distribution-9.4.3.v20170317.tar.gz::http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.3.v20170317/jetty-distribution-9.4.3.v20170317.tar.gz
 	source = jetty.default
 	source = jetty.logrotate
 	source = jetty.service
-	source = rundir.patch
-	sha256sums = f10a8ef66cf1d24f06baeb8061d8fe2b6550921a1e5c05d94f59e269c267a515
+	sha256sums = d23be69b99c4178a15bda229ef45ca9a0b3b4e2e29445cfcd7e7f50ee22a15bb
 	sha256sums = e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d
 	sha256sums = da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb
 	sha256sums = 36266b7f4daf20871f4bf5636686e37fa5ffd173fd51303f2569fc8d453fa17a
-	sha256sums = 596bb12d69ec25eba94b911619597786b246c6c867e9ce1e75f1585cd93663bf
 
 pkgname = jetty
 
diff --git a/PKGBUILD b/PKGBUILD
index f2e847727c69..cd1ee6c05bc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Yegorius <yegorius@domic.us>
 
 pkgname=jetty
-pkgver=9.3.13
-_timestamp=v20161014
+pkgver=9.4.3
+_timestamp=v20170317
 pkgrel=1
 pkgdesc="Jetty is a pure Java-based HTTP server and Java Servlet container"
 arch=('any')
@@ -17,13 +17,11 @@ _dluri="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$pkgv
 source=("$_distname.tar.gz::$_dluri"
 	jetty.default
 	jetty.logrotate
-	jetty.service
-	rundir.patch)
-sha256sums=('f10a8ef66cf1d24f06baeb8061d8fe2b6550921a1e5c05d94f59e269c267a515'
+	jetty.service)
+sha256sums=('d23be69b99c4178a15bda229ef45ca9a0b3b4e2e29445cfcd7e7f50ee22a15bb'
             'e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d'
             'da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb'
-            '36266b7f4daf20871f4bf5636686e37fa5ffd173fd51303f2569fc8d453fa17a'
-            '596bb12d69ec25eba94b911619597786b246c6c867e9ce1e75f1585cd93663bf')
+            '36266b7f4daf20871f4bf5636686e37fa5ffd173fd51303f2569fc8d453fa17a')
 install=$pkgname.install
 
 package() {
@@ -51,7 +49,6 @@ package() {
 	install -Dm644 "$srcdir/jetty.logrotate" "$pkgdir/etc/logrotate.d/jetty"
 	install -Dm644 "$srcdir/jetty.service" "$pkgdir/usr/lib/systemd/system/jetty.service"
 
-	patch -Np1 -i "$srcdir/rundir.patch" "$pkgdir/usr/share/jetty/bin/jetty.sh"
 	sed -i 's|su - |su -s /bin/sh - |' "$pkgdir/usr/share/jetty/bin/jetty.sh"
 
 	rm "$pkgdir/usr/share/jetty/lib/setuid/libsetuid-osx.so"
diff --git a/rundir.patch b/rundir.patch
deleted file mode 100644
index 71d5b9f2f654..000000000000
--- a/rundir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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" ]
--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
- 
- #####################################################
- # Find a pid and state file
-@@ -276,7 +274,7 @@
- 
- if [ -z "$JETTY_STATE" ]
- then
--  JETTY_STATE=$JETTY_BASE/${NAME}.state
-+  JETTY_STATE=$JETTY_RUN/${NAME}.state
- fi
- 
- case "`uname`" in