Update to Jetty 11

7 files changed, 68 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f8f8c6e3276..dcb68913e275 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = jetty
+pkgbase = jetty11
 	pkgdesc = Jetty is a pure Java-based HTTP server and Java Servlet container
-	pkgver = 9.4.43
+	pkgver = 11.0.18
 	pkgrel = 1
 	url = http://www.eclipse.org/jetty/
 	arch = any
@@ -8,20 +8,20 @@ pkgbase = jetty
 	license = EPL
 	depends = java-environment
 	options = !strip
-	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.43.v20210629/jetty-distribution-9.4.43.v20210629.tar.gz
-	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.43.v20210629/jetty-distribution-9.4.43.v20210629.tar.gz.asc
+	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.18/jetty-home-11.0.18.tar.gz
+	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/11.0.18/jetty-home-11.0.18.tar.gz.asc
 	source = jetty.default
 	source = jetty.logrotate
 	source = jetty.service
 	source = jetty.sysusers
 	source = jetty.tmpfiles
 	validpgpkeys = 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4
-	sha256sums = 01fae654b09932e446019aa859e7af6e05e27dbade12b54cd7bae3249fc723d9
+	sha256sums = 1f1b4edabe985a8ebe300614824edd3523c3a90668c8ef6dffc35d239a4f90be
 	sha256sums = SKIP
-	sha256sums = e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d
-	sha256sums = da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb
-	sha256sums = b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66
-	sha256sums = 5664891275f3e489f85efd85b9740e36265f5ed3cf9512d245c500bdc31b568a
-	sha256sums = b421e99f731635a68e59dabab803d1bbaecf11d338f17837cf0bb37c6bf32e6e
+	sha256sums = 4517310a4ed94248403e68b96b1e984d39e7073c6cd1dd9e312d00b9f4d2ca0f
+	sha256sums = aef27b34d181f0f31a023e4b31c10347c711d0e45b89b9702e501709bd07689e
+	sha256sums = 56c318ce307726ffd667ec6024e1488266e70d0a1ed3802a2257e4edbbb0e61c
+	sha256sums = 425d9c157753129e7d003652ecbb746feb5591ba1a9abf0b4a8428c91b1511da
+	sha256sums = 66d8e095afc479484b9ee54d0cb48b1ad04236d487e59881622dbaf29f14f560
 
-pkgname = jetty
+pkgname = jetty11
diff --git a/PKGBUILD b/PKGBUILD
index 07596091bf5c..0ef330c96752 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
-# Maintainer: Holger Schramm <dev@strace.it>
+# Contributor: Holger Schramm <dev@strace.it>
 # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Yegorius <yegorius@domic.us>
 # Contributor: Sergey Shatunov <me@prok.pw>
 
-pkgname=jetty
-pkgver=9.4.43
-_timestamp=v20210629
+pkgname=jetty11
+pkgver=11.0.18
 pkgrel=1
 pkgdesc="Jetty is a pure Java-based HTTP server and Java Servlet container"
 arch=('any')
@@ -13,52 +12,52 @@ url="http://www.eclipse.org/jetty/"
 license=('Apache' 'EPL')
 depends=('java-environment')
 options=('!strip')
-_distname=jetty-distribution-$pkgver.$_timestamp
-source=(https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$pkgver.$_timestamp/$_distname.tar.gz{,.asc}
+_distname=jetty-home-$pkgver
+source=(https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/$pkgver/$_distname.tar.gz{,.asc}
         jetty.default
         jetty.logrotate
         jetty.service
         jetty.sysusers
         jetty.tmpfiles)
-sha256sums=('01fae654b09932e446019aa859e7af6e05e27dbade12b54cd7bae3249fc723d9'
+
+sha256sums=('1f1b4edabe985a8ebe300614824edd3523c3a90668c8ef6dffc35d239a4f90be'
             'SKIP'
-            'e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d'
-            'da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb'
-            'b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66'
-            '5664891275f3e489f85efd85b9740e36265f5ed3cf9512d245c500bdc31b568a'
-            'b421e99f731635a68e59dabab803d1bbaecf11d338f17837cf0bb37c6bf32e6e')
+            '4517310a4ed94248403e68b96b1e984d39e7073c6cd1dd9e312d00b9f4d2ca0f'
+            'aef27b34d181f0f31a023e4b31c10347c711d0e45b89b9702e501709bd07689e'
+            '56c318ce307726ffd667ec6024e1488266e70d0a1ed3802a2257e4edbbb0e61c'
+            '425d9c157753129e7d003652ecbb746feb5591ba1a9abf0b4a8428c91b1511da'
+            '66d8e095afc479484b9ee54d0cb48b1ad04236d487e59881622dbaf29f14f560')
 validpgpkeys=('5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4') # Joakim Erdfelt <joakim.erdfelt@gmail.com>
 
 
 package() {
-	cd "$srcdir/$_distname"
-
-	install -dm755 "$pkgdir/etc/jetty"
-	install -dm755 "$pkgdir/usr/bin"
-	install -dm755 "$pkgdir/var/log/jetty"
-	install -dm755 "$pkgdir/var/lib/jetty/webapps"
-
-	install -Dm755 bin/jetty.sh "$pkgdir/usr/share/jetty/bin/jetty.sh"
-	cp -r etc/* "$pkgdir/etc/jetty"
-	cp -r {resources,start.ini} "$pkgdir/etc/jetty/"
-	cp -r {lib,modules,start.jar,README.TXT} "$pkgdir/usr/share/jetty/"
-	cp -r webapps/README.TXT "$pkgdir/var/lib/jetty/webapps"
-
-	ln -s /etc/jetty "$pkgdir/usr/share/jetty/etc"
-	ln -s etc/start.d "$pkgdir/usr/share/jetty/start.d"
-	ln -s etc/start.ini "$pkgdir/usr/share/jetty/start.ini"
-	ln -s etc/resources "$pkgdir/usr/share/jetty/resources"
-	ln -s /usr/share/jetty/bin/jetty.sh "$pkgdir/usr/bin/jetty"
-	ln -s /var/lib/jetty/webapps "$pkgdir/usr/share/jetty/webapps"
-
-	install -Dm644 "$srcdir/jetty.default" "$pkgdir/etc/default/jetty"
-	install -Dm644 "$srcdir/jetty.logrotate" "$pkgdir/etc/logrotate.d/jetty"
-	install -Dm644 "$srcdir/jetty.service" "$pkgdir/usr/lib/systemd/system/jetty.service"
-	install -Dm644 "$srcdir/jetty.sysusers" "$pkgdir/usr/lib/sysusers.d/jetty.conf"
-	install -Dm644 "$srcdir/jetty.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/jetty.conf"
-
-	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"
+    cd "$srcdir/$_distname"
+
+    install -dm755 "$pkgdir/etc/$pkgname"
+    install -dm755 "$pkgdir/usr/bin"
+    install -dm755 "$pkgdir/var/log/$pkgname"
+    install -dm755 "$pkgdir/var/lib/$pkgname/webapps"
+
+    install -Dm755 bin/jetty.sh "$pkgdir/usr/share/$pkgname/bin/jetty.sh"
+    cp -r etc/* "$pkgdir/etc/$pkgname"
+    cp -r {lib,modules,start.jar,README.adoc} "$pkgdir/usr/share/$pkgname/"
+    install -dm755 "$pkgdir/etc/$pkgname/start.d"
+    install -dm755 "$pkgdir/etc/$pkgname/resources"
+    install -dm755 "$pkgdir/var/lib/$pkgname/webapps"
+
+    ln -s /etc/$pkgname "$pkgdir/usr/share/$pkgname/etc"
+    ln -s etc/start.d "$pkgdir/usr/share/$pkgname/start.d"
+    ln -s etc/resources "$pkgdir/usr/share/$pkgname/resources"
+    ln -s /usr/share/$pkgname/bin/jetty.sh "$pkgdir/usr/bin/$pkgname"
+    ln -s /var/lib/$pkgname/webapps "$pkgdir/usr/share/$pkgname/webapps"
+    ln -s /var/log/$pkgname "$pkgdir/usr/share/$pkgname/logs"
+
+    install -Dm644 "$srcdir/jetty.default" "$pkgdir/etc/default/$pkgname"
+    install -Dm644 "$srcdir/jetty.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+    install -Dm644 "$srcdir/jetty.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+    install -Dm644 "$srcdir/jetty.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
+    install -Dm644 "$srcdir/jetty.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+
+    sed -i 's|su - |su -s /bin/sh - |' "$pkgdir/usr/share/$pkgname/bin/jetty.sh"
 }
 
diff --git a/jetty.default b/jetty.default
index 6303b4fa8e5d..49564b7d1d70 100644
--- a/jetty.default
+++ b/jetty.default
@@ -1,14 +1,12 @@
-#JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-8-openjdk/jre}
+#JAVA_HOME=${JAVA_HOME:-/usr/lib/jvm/java-17-openjdk}
 #JAVA=$JAVA_HOME/bin/java
 #JAVA_OPTIONS=
 
 #JETTY_ARGS=
 JETTY_PORT=8080
-JETTY_USER=jetty
-JETTY_HOME=/usr/share/jetty
-JETTY_RUN=/run/jetty
-JETTY_LOGS=/var/log/jetty
-JETTY_CONSOLE=$JETTY_LOGS/console.log
+JETTY_USER=jetty11
+JETTY_HOME=/usr/share/jetty11
+JETTY_PID=/run/jetty11/jetty.pid
 
 # Autodetected variables:
 #JETTY_BASE=$JETTY_HOME
diff --git a/jetty.logrotate b/jetty.logrotate
index 3d24a262c717..660ff317537a 100644
--- a/jetty.logrotate
+++ b/jetty.logrotate
@@ -1,4 +1,4 @@
-/var/log/jetty/*.log {
+/var/log/jetty11/*.log {
     copytruncate
     weekly
     rotate 52
diff --git a/jetty.service b/jetty.service
index da7d96af9ae8..c200add57efe 100644
--- a/jetty.service
+++ b/jetty.service
@@ -5,18 +5,18 @@
 # future updates
 
 [Unit]
-Description=Jetty Web Application Server
+Description=Jetty 11 Web Application Server
 After=syslog.target network.target
 
 [Service]
 Type=forking
-ExecStart=/usr/bin/jetty start
-ExecStop=/usr/bin/jetty stop
-ExecReload=/usr/bin/jetty restart
-PIDFile=/run/jetty/jetty.pid
-RuntimeDirectory=jetty
-User=jetty
-Group=jetty
+ExecStart=/usr/bin/jetty11 start
+ExecStop=/usr/bin/jetty11 stop
+ExecReload=/usr/bin/jetty11 restart
+PIDFile=/run/jetty11/jetty.pid
+RuntimeDirectory=jetty11
+User=jetty11
+Group=jetty11
 
 [Install]
 WantedBy=multi-user.target
diff --git a/jetty.sysusers b/jetty.sysusers
index a8c26b78ffe1..3917703cdbd8 100644
--- a/jetty.sysusers
+++ b/jetty.sysusers
@@ -1,2 +1,2 @@
-u jetty - "jetty daemon user" /usr/share/jetty
+u jetty11 - "jetty11 daemon user" /usr/share/jetty11
 
diff --git a/jetty.tmpfiles b/jetty.tmpfiles
index dba2aa8e513a..130b5f6ba55f 100644
--- a/jetty.tmpfiles
+++ b/jetty.tmpfiles
@@ -1,4 +1,4 @@
-d /usr/share/jetty       0755 jetty jetty
-d /var/log/jetty         0755 jetty jetty
-d /var/lib/jetty/webapps 0755 jetty jetty
+d /usr/share/jetty11       0755 jetty11 jetty11
+d /var/log/jetty11         0755 jetty11 jetty11
+d /var/lib/jetty11/webapps 0755 jetty11 jetty11