From c4c0371f97176b7a3cd5904ecca9f846eba07fc3 Mon Sep 17 00:00:00 2001 From: kmeaw Date: Fri, 14 Sep 2018 13:01:04 +0300 Subject: [PATCH] Bump to 18.12.14 --- .SRCINFO | 13 +++++++------ .gitignore | 1 + PKGBUILD | 25 ++++++++++++++----------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1a97f6d..1d469cc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,14 @@ pkgbase = clickhouse pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time - pkgver = 18.10.3 - pkgrel = 2 + pkgver = 18.12.14 + pkgrel = 1 url = https://clickhouse.yandex/ install = clickhouse.install arch = i686 arch = x86_64 license = Apache makedepends = cmake + makedepends = patchelf depends = ncurses depends = readline depends = unixodbc @@ -19,24 +20,24 @@ 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/v18.10.3-stable.tar.gz + source = https://github.com/yandex/ClickHouse/archive/v18.12.14-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/9173b89.tar.gz - source = https://github.com/ClickHouse-Extras/poco/archive/3df9473.tar.gz + source = https://github.com/ClickHouse-Extras/poco/archive/d7a4383.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 = 07fc1025d2b6b6b5863d8b9521e41c91 + md5sums = 8fcb870311fe94365556213666c74f7a md5sums = 5323f7ba2565a84a80a93edde95eb4fe md5sums = 7d9c187a8afedde260fadf2f1d5f46a2 md5sums = 7b92f0554687e6a8949adc5c10aeff78 md5sums = aaa86ec9f379ef587cc53f7b96bcc0e7 md5sums = 8a7abcc6998e461605ecb2988ff93dfc - md5sums = 35c616621ff836091fa212bedb4fb758 + md5sums = 3e9bb8b30ceecfd7dba9c0b03a89bf85 md5sums = 123c1e981fe28c1240d066af493d83b9 md5sums = 26744168b84de285c9e7c0f3d3ae5ba0 md5sums = 6eaa07f5751d6264208185224f7a5e51 diff --git a/.gitignore b/.gitignore index c32cdde..2d644ba 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ d2f05a6.tar.gz 3df9473.tar.gz de02224.tar.gz 41b7372.tar.gz +d7a4383.tar.gz diff --git a/PKGBUILD b/PKGBUILD index 4c70a6a..97533b1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,32 +2,32 @@ # Maintainer: Dmitry Bilunov pkgname=clickhouse -pkgver=18.10.3 -pkgrel=2 +pkgver=18.12.14 +pkgrel=1 pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time' arch=('i686' 'x86_64') url='https://clickhouse.yandex/' license=('Apache') depends=('ncurses' 'readline' 'unixodbc' 'termcap' 'double-conversion' 'capnproto' 're2' 'gtest') -makedepends=('cmake') +makedepends=('cmake' 'patchelf') source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz https://github.com/google/cctz/archive/4f9776a.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/9173b89.tar.gz - https://github.com/ClickHouse-Extras/poco/archive/3df9473.tar.gz + https://github.com/ClickHouse-Extras/poco/archive/d7a4383.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=('07fc1025d2b6b6b5863d8b9521e41c91' +md5sums=('8fcb870311fe94365556213666c74f7a' '5323f7ba2565a84a80a93edde95eb4fe' '7d9c187a8afedde260fadf2f1d5f46a2' '7b92f0554687e6a8949adc5c10aeff78' 'aaa86ec9f379ef587cc53f7b96bcc0e7' '8a7abcc6998e461605ecb2988ff93dfc' - '35c616621ff836091fa212bedb4fb758' + '3e9bb8b30ceecfd7dba9c0b03a89bf85' '123c1e981fe28c1240d066af493d83b9' '26744168b84de285c9e7c0f3d3ae5ba0' '6eaa07f5751d6264208185224f7a5e51' @@ -40,13 +40,13 @@ 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/zstd - rm -rf contrib/{cctz,librdkafka,lz4,zstd,zlib-ng,poco,boost}/* + rm -rf contrib/{cctz,librdkafka,lz4,zstd,zlib-ng,poco,boost,ssl}/* mv ../cctz-4f9776a*/* contrib/cctz/ mv ../librdkafka-7478b5e*/* contrib/librdkafka/ mv ../lz4-c10863b*/* contrib/lz4/ mv ../zstd-2555975*/* contrib/zstd/ mv ../zlib-ng-9173b89*/* contrib/zlib-ng/ - mv ../poco-3df9473*/* contrib/poco/ + mv ../poco-d7a4383*/* contrib/poco/ mv ../boost-2d5cb2c*/* contrib/boost/ mv ../ssl-de02224*/* contrib/ssl/ mv ../jemalloc-41b7372*/* contrib/jemalloc/ @@ -57,7 +57,8 @@ prepare() { build() { cd ClickHouse-$pkgver-stable - cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_CAPNP_LIBRARY:BOOL=False -D USE_INTERNAL_POCO_LIBRARY:BOOL=True -D POCO_STATIC:BOOL=True -D USE_INTERNAL_RE2_LIBRARY:BOOL=False -D NO_WERROR=1 . + rm -f PreLoad.cmake + cmake -G 'Unix Makefiles' -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=False -D USE_INTERNAL_DOUBLE_CONVERSION_LIBRARY:BOOL=False -D USE_INTERNAL_CAPNP_LIBRARY:BOOL=False -D USE_INTERNAL_POCO_LIBRARY:BOOL=True -D POCO_STATIC:BOOL=True -D USE_INTERNAL_RE2_LIBRARY:BOOL=False -D NO_WERROR=1 . make clickhouse } @@ -69,9 +70,11 @@ package() { ln -s clickhouse-client $pkgdir/usr/bin/clickhouse-server cp dbms/programs/server/config.xml dbms/programs/server/users.xml $pkgdir/etc/clickhouse-server/ cp dbms/programs/clickhouse $pkgdir/usr/bin/clickhouse-client + patchelf --remove-rpath $pkgdir/usr/bin/clickhouse-client + patchelf --replace-needed libz.so.1 libz-ng.so.1 $pkgdir/usr/bin/clickhouse-client cp dbms/programs/client/clickhouse-client.xml $pkgdir/etc/clickhouse-client/config.xml - cp dbms/libclickhouse.so.18 $pkgdir/usr/lib/libclickhouse.so.$pkgver - cp contrib/zlib-ng/libz-ng.so.1 $pkgdir/usr/lib/libz-ng.so.1 + cp dbms/libclickhouse.so.$pkgver $pkgdir/usr/lib/libclickhouse.so.$pkgver + cp contrib/zlib-ng/libz.so.1 $pkgdir/usr/lib/libz-ng.so.1 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