Update aarch64 too, generalize sources

2 files changed, 21 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43f82946744e..2450ef392797 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = clickhouse
 	pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time
 	pkgver = 22.9.3.18
-	pkgrel = 1
+	pkgrel = 2
 	url = https://clickhouse.com
 	install = clickhouse.install
 	arch = x86_64
@@ -24,11 +24,11 @@ pkgbase = clickhouse
 	sha256sums_x86_64 = 019eaf83edd4731be017cdf90e14b064dfd44f1b8a034878d63b3bbb04647f3d
 	sha256sums_x86_64 = f480c43c13856d0651bf29ce6b100b3bbd235c90d61cba3a814ab7a200ed6697
 	sha256sums_x86_64 = cd87f4e7622c50c960836a65840d1aab54223152c108e61c9527fa917588212b
-	source_aarch64 = https://packages.clickhouse.com/deb/pool/stable/clickhouse-client_22.9.3.18_arm64.deb
-	source_aarch64 = https://packages.clickhouse.com/deb/pool/stable/clickhouse-common-static_22.9.3.18_arm64.deb
-	source_aarch64 = https://packages.clickhouse.com/deb/pool/stable/clickhouse-server_22.9.3.18_arm64.deb
-	sha256sums_aarch64 = 18585d8533bcf20775d8bdd89689f5eac1f703dea9e2dd5f25fee1ab0b2dad2a
-	sha256sums_aarch64 = 99cefe2aaa22737f26ec98cc64383ed3651fed59d2c30b71b8821ab794d54c78
-	sha256sums_aarch64 = 3427bf8e94443b7555ce022518ac2c96409fe970c42e9814441ac30331d601f7
+	source_aarch64 = https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse/clickhouse-client_22.9.3.18_arm64.deb
+	source_aarch64 = https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse/clickhouse-common-static_22.9.3.18_arm64.deb
+	source_aarch64 = https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse/clickhouse-server_22.9.3.18_arm64.deb
+	sha256sums_aarch64 = f4673b57bafed4b83294edfef1daf6b870157852e204c11e40dc8c141f1cf0be
+	sha256sums_aarch64 = e89a65ec377b2031dd967395e021d071e5e2ce038614c8b47d62fc9048e2839e
+	sha256sums_aarch64 = 9a1c2c61fab0350f1306014bb587efa1714df69d442be451addcbc26a00cbbf1
 
 pkgname = clickhouse
diff --git a/PKGBUILD b/PKGBUILD
index 13410cc7bd78..18f8b356c78a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,32 @@
 
 pkgname=clickhouse
 pkgver=22.9.3.18
-pkgrel=1
+pkgrel=2
 pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
 arch=('x86_64' 'aarch64')
 url='https://clickhouse.com'
 license=('Apache')
 depends=('tzdata' 'libcap')
+_source_prefix='https://packages.clickhouse.com/deb/pool/main/c/clickhouse'
 source_x86_64=(
-  https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse-client_${pkgver}_amd64.deb
-  https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse-common-static_${pkgver}_amd64.deb
-  https://packages.clickhouse.com/deb/pool/main/c/clickhouse/clickhouse-server_${pkgver}_amd64.deb
+  "${_source_prefix}/clickhouse-client_${pkgver}_amd64.deb"
+  "${_source_prefix}/clickhouse-common-static_${pkgver}_amd64.deb"
+  "${_source_prefix}/clickhouse-server_${pkgver}_amd64.deb"
 )
 sha256sums_x86_64=(
-019eaf83edd4731be017cdf90e14b064dfd44f1b8a034878d63b3bbb04647f3d
-f480c43c13856d0651bf29ce6b100b3bbd235c90d61cba3a814ab7a200ed6697
-cd87f4e7622c50c960836a65840d1aab54223152c108e61c9527fa917588212b
+  019eaf83edd4731be017cdf90e14b064dfd44f1b8a034878d63b3bbb04647f3d
+  f480c43c13856d0651bf29ce6b100b3bbd235c90d61cba3a814ab7a200ed6697
+  cd87f4e7622c50c960836a65840d1aab54223152c108e61c9527fa917588212b
 )
 source_aarch64=(
-  https://packages.clickhouse.com/deb/pool/stable/clickhouse-client_${pkgver}_arm64.deb
-  https://packages.clickhouse.com/deb/pool/stable/clickhouse-common-static_${pkgver}_arm64.deb
-  https://packages.clickhouse.com/deb/pool/stable/clickhouse-server_${pkgver}_arm64.deb
+  "${_source_prefix}/clickhouse/clickhouse-client_${pkgver}_arm64.deb"
+  "${_source_prefix}/clickhouse/clickhouse-common-static_${pkgver}_arm64.deb"
+  "${_source_prefix}/clickhouse/clickhouse-server_${pkgver}_arm64.deb"
 )
 sha256sums_aarch64=(
-18585d8533bcf20775d8bdd89689f5eac1f703dea9e2dd5f25fee1ab0b2dad2a
-99cefe2aaa22737f26ec98cc64383ed3651fed59d2c30b71b8821ab794d54c78
-3427bf8e94443b7555ce022518ac2c96409fe970c42e9814441ac30331d601f7
+  f4673b57bafed4b83294edfef1daf6b870157852e204c11e40dc8c141f1cf0be
+  e89a65ec377b2031dd967395e021d071e5e2ce038614c8b47d62fc9048e2839e
+  9a1c2c61fab0350f1306014bb587efa1714df69d442be451addcbc26a00cbbf1
 )
 _noextract_x86_64=(
   clickhouse-client_"${pkgver}"_amd64.deb