summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmeaw2018-03-12 18:25:17 +0300
committerkmeaw2018-03-12 18:25:17 +0300
commitf3f82ae9c3e722c6b205a3eaf5d9e22fa5d00684 (patch)
tree09bfa2e0f6627bfe681361e473fc6264cd8b9020
parenteefd30c2cb323653ad7b9e00df75c278f69077ff (diff)
downloadaur-f3f82ae9c3e722c6b205a3eaf5d9e22fa5d00684.tar.gz
Bump to 54362
-rw-r--r--.SRCINFO12
-rw-r--r--.gitignore6
-rw-r--r--PKGBUILD16
3 files changed, 23 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 915789f23285..35ffca639d33 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.54343
+ pkgver = 1.1.54362
pkgrel = 1
url = https://clickhouse.yandex/
install = clickhouse.install
@@ -19,24 +19,26 @@ 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.54343-stable.tar.gz
+ source = https://github.com/yandex/ClickHouse/archive/v1.1.54362-stable.tar.gz
source = https://github.com/google/cctz/archive/4f9776a.tar.gz
source = https://github.com/edenhill/librdkafka/archive/c3d50eb.tar.gz
source = https://github.com/lz4/lz4/archive/c10863b.tar.gz
source = https://github.com/ClickHouse-Extras/zookeeper/archive/438afae.tar.gz
source = https://github.com/facebook/zstd/archive/f4340f4.tar.gz
source = https://github.com/Dead2/zlib-ng/archive/e07a52d.tar.gz
- source = https://github.com/ClickHouse-Extras/poco/archive/81d4fdf.tar.gz
+ source = https://github.com/ClickHouse-Extras/poco/archive/8238852.tar.gz
+ source = https://github.com/ClickHouse-Extras/boost/archive/5121cc9.tar.gz
source = clickhouse-server.service
source = libunwind.patch
- md5sums = b1462bc8d95af168261ca0e879e44292
+ md5sums = e941e503e404f14bc874d6e8c2ea1758
md5sums = 5323f7ba2565a84a80a93edde95eb4fe
md5sums = ea7f52489fead0712f7d20c450a4b7a0
md5sums = 7b92f0554687e6a8949adc5c10aeff78
md5sums = 822fa96f5ceb235f06d22d2e0c7175a2
md5sums = e3212525a38d6cc38e26979a10c174ed
md5sums = 87676f8d7fcdea908476029f92b8103f
- md5sums = 1bc2bbf8b5c26f6685cca8f8b7525d4c
+ md5sums = fc643caa1710523bbd1d69f72577afbe
+ md5sums = 0eedc70c486ae679da354fb7599f2851
md5sums = f9f5663b0a9a58e99f481efe9d193e85
md5sums = f3f60b75abf8d6f21de74db6e88e1e7b
diff --git a/.gitignore b/.gitignore
index 2e41cc1d1c6a..47429f8d9a40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,9 @@ f4340f4.tar.gz
e07a52d.tar.gz
*.part
81d4fdf.tar.gz
+3401fa1.tar.gz
+438afae.tar.gz
+5121cc9.tar.gz
+5aa9e88.tar.gz
+8238852.tar.gz
+d2f05a6.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
index ed03f701c267..2b8dc4c24f34 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
pkgname=clickhouse
-pkgver=1.1.54343
+pkgver=1.1.54362
pkgrel=1
pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
arch=('i686' 'x86_64')
@@ -17,17 +17,19 @@ source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz
https://github.com/ClickHouse-Extras/zookeeper/archive/438afae.tar.gz
https://github.com/facebook/zstd/archive/f4340f4.tar.gz
https://github.com/Dead2/zlib-ng/archive/e07a52d.tar.gz
- https://github.com/ClickHouse-Extras/poco/archive/81d4fdf.tar.gz
+ https://github.com/ClickHouse-Extras/poco/archive/8238852.tar.gz
+ https://github.com/ClickHouse-Extras/boost/archive/5121cc9.tar.gz
clickhouse-server.service
libunwind.patch)
-md5sums=('b1462bc8d95af168261ca0e879e44292'
+md5sums=('e941e503e404f14bc874d6e8c2ea1758'
'5323f7ba2565a84a80a93edde95eb4fe'
'ea7f52489fead0712f7d20c450a4b7a0'
'7b92f0554687e6a8949adc5c10aeff78'
'822fa96f5ceb235f06d22d2e0c7175a2'
'e3212525a38d6cc38e26979a10c174ed'
'87676f8d7fcdea908476029f92b8103f'
- '1bc2bbf8b5c26f6685cca8f8b7525d4c'
+ 'fc643caa1710523bbd1d69f72577afbe'
+ '0eedc70c486ae679da354fb7599f2851'
'f9f5663b0a9a58e99f481efe9d193e85'
'f3f60b75abf8d6f21de74db6e88e1e7b')
backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
@@ -38,14 +40,15 @@ prepare() {
sed -e 's/mysqlxx common\(.*\) \(\${Z_LIB}\)/mysqlxx \2 common\1/' -i libs/libmysqlxx/CMakeLists.txt
patch -p1 < ../libunwind.patch
mkdir -p contrib/cctz contrib/librdkafka contrib/lz4 contrib/zookeeper contrib/zstd
- rm -rf contrib/{cctz,librdkafka,lz4,zookeeper,zstd,zlib-ng,poco}/*
+ rm -rf contrib/{cctz,librdkafka,lz4,zookeeper,zstd,zlib-ng,poco,boost}/*
mv ../cctz-4f9776a*/* contrib/cctz/
mv ../librdkafka-c3d50eb*/* contrib/librdkafka/
mv ../lz4-c10863b*/* contrib/lz4/
mv ../zookeeper-438afae*/* contrib/zookeeper/
mv ../zstd-f4340f4*/* contrib/zstd/
mv ../zlib-ng-e07a52d*/* contrib/zlib-ng/
- mv ../poco-81d4fdf*/* contrib/poco/
+ mv ../poco-8238852*/* contrib/poco/
+ mv ../boost-5121cc9*/* contrib/boost/
for dir in contrib/*/; do
rmdir $dir &> /dev/null || true
done
@@ -67,6 +70,7 @@ package() {
cp dbms/src/Server/clickhouse $pkgdir/usr/bin/clickhouse-client
cp dbms/src/Server/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
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 $startdir/clickhouse-server.service $pkgdir/usr/lib/systemd/system