fix tomcat url

2 files changed, 8 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 501281cfabac..de1052681894 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Feb 24 22:18:05 UTC 2019
+# Wed Mar 20 19:46:31 UTC 2019
 pkgbase = i2p-dev
 	pkgdesc = A distributed anonymous network (daily mtn->git sync)
 	pkgver = 0.9.38.9
@@ -23,13 +23,13 @@ pkgbase = i2p-dev
 	options = !strip
 	backup = opt/i2p/wrapper.config
 	source = git+https://github.com/i2p/i2p.i2p.git#commit=master
-	source = http://apache.mirrors.pair.com/tomcat/tomcat-9/v9.0.16/bin/apache-tomcat-9.0.16.tar.gz
+	source = https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.17/bin/apache-tomcat-9.0.17.tar.gz
 	source = i2prouter.service
 	source = i2prouter.sh
 	source = wrapper.config
 	source = router.config
 	sha256sums = SKIP
-	sha256sums = 1f45dd960c6cbc044e75ce0ed5ae5d3af62aff0152fa56b8160d2e3dc23f417a
+	sha256sums = 6c8a8bccc2bee1b28b3a8da128db26f6e22a3546a6cd44e655c8e34157a215a6
 	sha256sums = ff9942ca43715b5095b0118e306c8aec1af7c68c18e8959dba10d86eac8efbfd
 	sha256sums = ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53
 	sha256sums = 72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2
diff --git a/PKGBUILD b/PKGBUILD
index 3a47bdac2d73..c499c7c6793b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,15 +21,15 @@ backup=('opt/i2p/wrapper.config')
 install='i2p.install'
 options=(!strip)
 
-_tomcatver=9.0.16
+_tomcatver=9.0.17
 _gitname=i2p.i2p
 _commit=master
 
 source=("git+https://github.com/i2p/${_gitname}.git#commit=${_commit}"
-        "http://apache.mirrors.pair.com/tomcat/tomcat-9/v${_tomcatver}/bin/apache-tomcat-${_tomcatver}.tar.gz"
+        "https://archive.apache.org/dist/tomcat/tomcat-9/v${_tomcatver}/bin/apache-tomcat-${_tomcatver}.tar.gz"
         'i2prouter.service' 'i2prouter.sh' 'wrapper.config' 'router.config')
 sha256sums=('SKIP'
-            '1f45dd960c6cbc044e75ce0ed5ae5d3af62aff0152fa56b8160d2e3dc23f417a'
+            '6c8a8bccc2bee1b28b3a8da128db26f6e22a3546a6cd44e655c8e34157a215a6'
             'ff9942ca43715b5095b0118e306c8aec1af7c68c18e8959dba10d86eac8efbfd'
             'ea8f97e66461d591b1819eab39bbc40056b89ae12f7729b3dd9fd2ce088e5e53'
             '72c0944cd2b04c747673a534475f2ec42c64d52fdda76714f1165c4655113de2'
@@ -37,8 +37,8 @@ sha256sums=('SKIP'
 
 pkgver() {
     cd "$_gitname"
-    echo "$(grep 'VERSION =' core/java/src/net/i2p/CoreVersion.java \
-        |sed 's/.*= "//;s/";//').$(grep 'BUILD =' router/java/src/net/i2p/router/RouterVersion.java \
+    printf "%s.%s" "$(grep 'VERSION =' core/java/src/net/i2p/CoreVersion.java \
+        |sed 's/.*= "//;s/";//')" "$(grep 'BUILD =' router/java/src/net/i2p/router/RouterVersion.java \
         |sed 's/.*= //;s/;//')"
 }