Bump to 18.10.3

3 files changed, 30 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 941be0cc1b47..01e198590b8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clickhouse
 	pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time
-	pkgver = 1.1.54390
+	pkgver = 18.10.3
 	pkgrel = 1
 	url = https://clickhouse.yandex/
 	install = clickhouse.install
@@ -19,23 +19,27 @@ pkgbase = clickhouse
 	backup = etc/clickhouse-client/config.xml
 	backup = etc/clickhouse-server/config.xml
 	backup = etc/clickhouse-server/users.xml
-	source = https://github.com/yandex/ClickHouse/archive/v1.1.54390-stable.tar.gz
+	source = https://github.com/yandex/ClickHouse/archive/v18.10.3-stable.tar.gz
 	source = https://github.com/google/cctz/archive/4f9776a.tar.gz
 	source = https://github.com/edenhill/librdkafka/archive/7478b5e.tar.gz
 	source = https://github.com/lz4/lz4/archive/c10863b.tar.gz
 	source = https://github.com/facebook/zstd/archive/2555975.tar.gz
-	source = https://github.com/Dead2/zlib-ng/archive/e07a52d.tar.gz
-	source = https://github.com/ClickHouse-Extras/poco/archive/3a2d0a8.tar.gz
+	source = https://github.com/Dead2/zlib-ng/archive/9173b89.tar.gz
+	source = https://github.com/ClickHouse-Extras/poco/archive/3df9473.tar.gz
 	source = https://github.com/ClickHouse-Extras/boost/archive/2d5cb2c.tar.gz
+	source = https://github.com/ClickHouse-Extras/ssl/archive/de02224.tar.gz
+	source = https://github.com/jemalloc/jemalloc/archive/41b7372.tar.gz
 	source = libunwind.patch
-	md5sums = db31651b515d515882a085b08c4de14f
+	md5sums = 07fc1025d2b6b6b5863d8b9521e41c91
 	md5sums = 5323f7ba2565a84a80a93edde95eb4fe
 	md5sums = 7d9c187a8afedde260fadf2f1d5f46a2
 	md5sums = 7b92f0554687e6a8949adc5c10aeff78
 	md5sums = aaa86ec9f379ef587cc53f7b96bcc0e7
-	md5sums = 87676f8d7fcdea908476029f92b8103f
-	md5sums = ae82a083462519d498cfacd1950d0509
+	md5sums = 8a7abcc6998e461605ecb2988ff93dfc
+	md5sums = 35c616621ff836091fa212bedb4fb758
 	md5sums = 123c1e981fe28c1240d066af493d83b9
+	md5sums = 26744168b84de285c9e7c0f3d3ae5ba0
+	md5sums = 6eaa07f5751d6264208185224f7a5e51
 	md5sums = f3f60b75abf8d6f21de74db6e88e1e7b
 
 pkgname = clickhouse
diff --git a/.gitignore b/.gitignore
index f0aca373aeff..c32cddee5a45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,7 @@ d2f05a6.tar.gz
 2d5a158.tar.gz
 3a2d0a8.tar.gz
 7478b5e.tar.gz
+9173b89.tar.gz
+3df9473.tar.gz
+de02224.tar.gz
+41b7372.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index f3cca94b7dbb..6f6db5f1d18c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
 
 pkgname=clickhouse
-pkgver=1.1.54390
+pkgver=18.10.3
 pkgrel=1
 pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
 arch=('i686' 'x86_64')
@@ -15,18 +15,22 @@ source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz
         https://github.com/edenhill/librdkafka/archive/7478b5e.tar.gz
         https://github.com/lz4/lz4/archive/c10863b.tar.gz
         https://github.com/facebook/zstd/archive/2555975.tar.gz
-        https://github.com/Dead2/zlib-ng/archive/e07a52d.tar.gz
-        https://github.com/ClickHouse-Extras/poco/archive/3a2d0a8.tar.gz
+        https://github.com/Dead2/zlib-ng/archive/9173b89.tar.gz
+        https://github.com/ClickHouse-Extras/poco/archive/3df9473.tar.gz
         https://github.com/ClickHouse-Extras/boost/archive/2d5cb2c.tar.gz
+        https://github.com/ClickHouse-Extras/ssl/archive/de02224.tar.gz
+        https://github.com/jemalloc/jemalloc/archive/41b7372.tar.gz
         libunwind.patch)
-md5sums=('db31651b515d515882a085b08c4de14f'
+md5sums=('07fc1025d2b6b6b5863d8b9521e41c91'
          '5323f7ba2565a84a80a93edde95eb4fe'
          '7d9c187a8afedde260fadf2f1d5f46a2'
          '7b92f0554687e6a8949adc5c10aeff78'
          'aaa86ec9f379ef587cc53f7b96bcc0e7'
-         '87676f8d7fcdea908476029f92b8103f'
-         'ae82a083462519d498cfacd1950d0509'
+         '8a7abcc6998e461605ecb2988ff93dfc'
+         '35c616621ff836091fa212bedb4fb758'
          '123c1e981fe28c1240d066af493d83b9'
+         '26744168b84de285c9e7c0f3d3ae5ba0'
+         '6eaa07f5751d6264208185224f7a5e51'
          'f3f60b75abf8d6f21de74db6e88e1e7b')
 backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
 install=$pkgname.install
@@ -41,9 +45,11 @@ prepare() {
   mv ../librdkafka-7478b5e*/* contrib/librdkafka/
   mv ../lz4-c10863b*/* contrib/lz4/
   mv ../zstd-2555975*/* contrib/zstd/
-  mv ../zlib-ng-e07a52d*/* contrib/zlib-ng/
-  mv ../poco-3a2d0a8*/* contrib/poco/
+  mv ../zlib-ng-9173b89*/* contrib/zlib-ng/
+  mv ../poco-3df9473*/* contrib/poco/
   mv ../boost-2d5cb2c*/* contrib/boost/
+  mv ../ssl-de02224*/* contrib/ssl/
+  mv ../jemalloc-41b7372*/* contrib/jemalloc/
   for dir in contrib/*/; do
     rmdir $dir &> /dev/null || true
   done
@@ -64,8 +70,7 @@ package() {
   cp dbms/programs/server/config.xml dbms/programs/server/users.xml $pkgdir/etc/clickhouse-server/
   cp dbms/programs/clickhouse $pkgdir/usr/bin/clickhouse-client
   cp dbms/programs/client/clickhouse-client.xml $pkgdir/etc/clickhouse-client/config.xml
-  cp dbms/libclickhouse.so.1 $pkgdir/usr/lib/libclickhouse.so.$pkgver
-  cp contrib/librdkafka/src/librdkafka.so $pkgdir/usr/lib/librdkafka.so
+  cp dbms/libclickhouse.so.18 $pkgdir/usr/lib/libclickhouse.so.$pkgver
   sed -e 's:/opt/clickhouse:/var/lib/clickhouse:g' -i $pkgdir/etc/clickhouse-server/config.xml
   sed -e '/listen_host/s%::<%::1<%' -i $pkgdir/etc/clickhouse-server/config.xml
   cp debian/clickhouse-server.service $pkgdir/usr/lib/systemd/system