Update to 9.4.26.v20200117, use https for source tarball, add pgp key verifying

2 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33d8b7ab9c3a..283342340d0a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,23 @@
 pkgbase = jetty
 	pkgdesc = Jetty is a pure Java-based HTTP server and Java Servlet container
-	pkgver = 9.4.19
-	pkgrel = 2
+	pkgver = 9.4.26
+	pkgrel = 1
 	url = http://www.eclipse.org/jetty/
 	arch = any
 	license = Apache
 	license = EPL
 	depends = java-environment
 	options = !strip
-	source = jetty-distribution-9.4.19.v20190610.tar.gz::http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.19.v20190610/jetty-distribution-9.4.19.v20190610.tar.gz
+	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.26.v20200117/jetty-distribution-9.4.26.v20200117.tar.gz
+	source = https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/9.4.26.v20200117/jetty-distribution-9.4.26.v20200117.tar.gz.asc
 	source = jetty.default
 	source = jetty.logrotate
 	source = jetty.service
 	source = jetty.sysusers
 	source = jetty.tmpfiles
-	sha256sums = 9a8b3dab90a33598010eb6a4be5328930a5b839806d0b2db557f027ad8d784a3
+	validpgpkeys = 5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4
+	sha256sums = 31a157c493687e9b7be7366a5dc4ee7ef9cae1663ea279cd9fcf4070d53ef071
+	sha256sums = SKIP
 	sha256sums = e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d
 	sha256sums = da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb
 	sha256sums = b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66
diff --git a/PKGBUILD b/PKGBUILD
index 54923a4e4724..ad8b7fc9f415 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # Maintainer: Sergey Shatunov <me@prok.pw>
 
 pkgname=jetty
-pkgver=9.4.19
-_timestamp=v20190610
-pkgrel=2
+pkgver=9.4.26
+_timestamp=v20200117
+pkgrel=1
 pkgdesc="Jetty is a pure Java-based HTTP server and Java Servlet container"
 arch=('any')
 url="http://www.eclipse.org/jetty/"
@@ -14,19 +14,20 @@ license=('Apache' 'EPL')
 depends=('java-environment')
 options=('!strip')
 _distname=jetty-distribution-$pkgver.$_timestamp
-_dluri="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$pkgver.$_timestamp/$_distname.tar.gz"
-source=("$_distname.tar.gz::$_dluri"
-	jetty.default
-	jetty.logrotate
-	jetty.service
+source=(https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/$pkgver.$_timestamp/$_distname.tar.gz{,.asc}
+        jetty.default
+        jetty.logrotate
+        jetty.service
         jetty.sysusers
         jetty.tmpfiles)
-sha256sums=('9a8b3dab90a33598010eb6a4be5328930a5b839806d0b2db557f027ad8d784a3'
+sha256sums=('31a157c493687e9b7be7366a5dc4ee7ef9cae1663ea279cd9fcf4070d53ef071'
+            'SKIP'
             'e5b425043a379bde57fd37c498ff8efb822325b7606b149cc09a53737ab4297d'
             'da0402440e0a3b66e55387700b2c178c294dc65cc4a7bd079c622343845adecb'
             'b27ef0342c3b22fbf1e3e7d104e23670b53eab9b648c1882cf295bd82ccadc66'
             '5664891275f3e489f85efd85b9740e36265f5ed3cf9512d245c500bdc31b568a'
             'b421e99f731635a68e59dabab803d1bbaecf11d338f17837cf0bb37c6bf32e6e')
+validpgpkeys=('5989BAF76217B843D66BE55B2D0E1FB8FE4B68B4') # Joakim Erdfelt <joakim.erdfelt@gmail.com>
 
 
 package() {