Bump to 54342
This commit is contained in:
kmeaw
@@ -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 = 1.1.54337
|
||||
pkgrel = 3
|
||||
pkgver = 1.1.54342
|
||||
pkgrel = 1
|
||||
url = https://clickhouse.yandex/
|
||||
install = clickhouse.install
|
||||
arch = i686
|
||||
@@ -19,27 +19,25 @@ 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.54337-stable.tar.gz
|
||||
source = https://github.com/yandex/ClickHouse/archive/v1.1.54342-stable.tar.gz
|
||||
source = https://github.com/google/cctz/archive/4f9776a.tar.gz
|
||||
source = https://github.com/edenhill/librdkafka/archive/3401fa1.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/d2f05a6.tar.gz
|
||||
source = https://github.com/ClickHouse-Extras/zookeeper/archive/5aa9e88.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 = clickhouse-server.service
|
||||
source = re2-length.patch
|
||||
source = libunwind.patch
|
||||
md5sums = e6a1820e3267a39f831223f46ef42d64
|
||||
md5sums = c2613b6952fadb2a057c5e16f4bac030
|
||||
md5sums = 5323f7ba2565a84a80a93edde95eb4fe
|
||||
md5sums = 6bc0f4f409d8ff24019afd9e15cd3d19
|
||||
md5sums = ea7f52489fead0712f7d20c450a4b7a0
|
||||
md5sums = 7b92f0554687e6a8949adc5c10aeff78
|
||||
md5sums = 6636ab50e66d1c0a1e05d83ed6154bdc
|
||||
md5sums = eebe2918fb575297ecc60016442a749d
|
||||
md5sums = e3212525a38d6cc38e26979a10c174ed
|
||||
md5sums = 87676f8d7fcdea908476029f92b8103f
|
||||
md5sums = 1bc2bbf8b5c26f6685cca8f8b7525d4c
|
||||
md5sums = f9f5663b0a9a58e99f481efe9d193e85
|
||||
md5sums = 143f0146c3ef3a6832191fba352b70c4
|
||||
md5sums = f3f60b75abf8d6f21de74db6e88e1e7b
|
||||
|
||||
pkgname = clickhouse
|
||||
|
||||
+2
-2
@@ -2,10 +2,10 @@ clickhouse-*.pkg.tar.xz
|
||||
pkg/
|
||||
src/
|
||||
v*.tar.gz
|
||||
3401fa1.tar.gz
|
||||
c3d50eb.tar.gz
|
||||
4f9776a.tar.gz
|
||||
c10863b.tar.gz
|
||||
d2f05a6.tar.gz
|
||||
81d4fdf.tar.gz
|
||||
f4340f4.tar.gz
|
||||
e07a52d.tar.gz
|
||||
*.part
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
# Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
|
||||
|
||||
pkgname=clickhouse
|
||||
pkgver=1.1.54337
|
||||
pkgrel=3
|
||||
pkgver=1.1.54342
|
||||
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/'
|
||||
@@ -12,25 +12,23 @@ depends=('ncurses' 'readline' 'unixodbc' 'termcap' 'double-conversion' 'capnprot
|
||||
makedepends=('cmake')
|
||||
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/3401fa1.tar.gz
|
||||
https://github.com/edenhill/librdkafka/archive/c3d50eb.tar.gz
|
||||
https://github.com/lz4/lz4/archive/c10863b.tar.gz
|
||||
https://github.com/ClickHouse-Extras/zookeeper/archive/d2f05a6.tar.gz
|
||||
https://github.com/ClickHouse-Extras/zookeeper/archive/5aa9e88.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
|
||||
clickhouse-server.service
|
||||
re2-length.patch
|
||||
libunwind.patch)
|
||||
md5sums=('e6a1820e3267a39f831223f46ef42d64'
|
||||
md5sums=('c2613b6952fadb2a057c5e16f4bac030'
|
||||
'5323f7ba2565a84a80a93edde95eb4fe'
|
||||
'6bc0f4f409d8ff24019afd9e15cd3d19'
|
||||
'ea7f52489fead0712f7d20c450a4b7a0'
|
||||
'7b92f0554687e6a8949adc5c10aeff78'
|
||||
'6636ab50e66d1c0a1e05d83ed6154bdc'
|
||||
'eebe2918fb575297ecc60016442a749d'
|
||||
'e3212525a38d6cc38e26979a10c174ed'
|
||||
'87676f8d7fcdea908476029f92b8103f'
|
||||
'1bc2bbf8b5c26f6685cca8f8b7525d4c'
|
||||
'f9f5663b0a9a58e99f481efe9d193e85'
|
||||
'143f0146c3ef3a6832191fba352b70c4'
|
||||
'f3f60b75abf8d6f21de74db6e88e1e7b')
|
||||
backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
|
||||
install=$pkgname.install
|
||||
@@ -38,14 +36,13 @@ install=$pkgname.install
|
||||
prepare() {
|
||||
cd ClickHouse-$pkgver-stable
|
||||
sed -e 's/mysqlxx common\(.*\) \(\${Z_LIB}\)/mysqlxx \2 common\1/' -i libs/libmysqlxx/CMakeLists.txt
|
||||
patch -p1 < ../re2-length.patch
|
||||
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}/*
|
||||
mv ../cctz-4f9776a*/* contrib/cctz/
|
||||
mv ../librdkafka-3401fa1*/* contrib/librdkafka/
|
||||
mv ../librdkafka-c3d50eb*/* contrib/librdkafka/
|
||||
mv ../lz4-c10863b*/* contrib/lz4/
|
||||
mv ../zookeeper-d2f05a6*/* contrib/zookeeper/
|
||||
mv ../zookeeper-5aa9e88*/* contrib/zookeeper/
|
||||
mv ../zstd-f4340f4*/* contrib/zstd/
|
||||
mv ../zlib-ng-e07a52d*/* contrib/zlib-ng/
|
||||
mv ../poco-81d4fdf*/* contrib/poco/
|
||||
@@ -56,7 +53,7 @@ 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 .
|
||||
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 .
|
||||
make clickhouse
|
||||
}
|
||||
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From e6a76059d371c11dae51648e348f9d9f41d3ba96 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Bilunov <kmeaw@yandex-team.ru>
|
||||
Date: Tue, 6 Jun 2017 13:10:33 +0300
|
||||
Subject: [PATCH 1/1] re2: respect (possibly signed) return type of
|
||||
StringPiece::length()
|
||||
|
||||
---
|
||||
dbms/src/Functions/FunctionsStringSearch.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dbms/src/Functions/FunctionsStringSearch.cpp b/dbms/src/Functions/FunctionsStringSearch.cpp
|
||||
index daf595f74..a3b335d6b 100644
|
||||
--- a/dbms/src/Functions/FunctionsStringSearch.cpp
|
||||
+++ b/dbms/src/Functions/FunctionsStringSearch.cpp
|
||||
@@ -630,7 +630,7 @@ struct ReplaceRegexpImpl
|
||||
{
|
||||
re2_st::StringPiece matches[max_captures];
|
||||
|
||||
- int start_pos = 0;
|
||||
+ decltype(input.length()) start_pos = 0;
|
||||
while (start_pos < input.length())
|
||||
{
|
||||
/// If no more replacements possible for current string
|
||||
--
|
||||
2.12.2
|
||||
|
||||
Reference in New Issue
Block a user