From 1384198169d8bada358eafccf0a453e18dc5814b Mon Sep 17 00:00:00 2001 From: Yiyang Kang Date: Tue, 12 Apr 2022 13:02:29 +0800 Subject: [PATCH] upgpkg: lts-22.3 --- .SRCINFO | 37 +++++++++++++++++--------------- PKGBUILD | 44 ++++++++++++++++++++++---------------- clickhouse-lts-218.install | 9 -------- clickhouse-sysuser.conf | 1 + clickhouse-tmpfiles.conf | 2 ++ 5 files changed, 49 insertions(+), 44 deletions(-) delete mode 100644 clickhouse-lts-218.install create mode 100644 clickhouse-sysuser.conf create mode 100644 clickhouse-tmpfiles.conf diff --git a/.SRCINFO b/.SRCINFO index 3c5b73a..62a84e1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,31 @@ -pkgbase = clickhouse-lts-218 - pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time. LTS version 21.8 - pkgver = 21.8.13.6 +pkgbase = clickhouse-lts-223 + pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time -- LTS version 22.3 + pkgver = 22.3.3.44 pkgrel = 1 - url = https://clickhouse.com/ - install = clickhouse-lts-218.install + url = https://clickhouse.com arch = x86_64 license = Apache depends = tzdata depends = libcap - provides = clickhouse - provides = clickhouse-lts + provides = clickhouse=22.3.3.44 + provides = clickhouse-lts=22.3.3.44 conflicts = clickhouse conflicts = clickhouse-lts - noextract = clickhouse-common-static_21.8.13.6_amd64.deb - noextract = clickhouse-client_21.8.13.6_all.deb - noextract = clickhouse-server_21.8.13.6_all.deb + noextract = clickhouse-client_22.3.3.44_all.deb + noextract = clickhouse-common-static_22.3.3.44_amd64.deb + noextract = clickhouse-server_22.3.3.44_all.deb backup = etc/clickhouse-client/config.xml backup = etc/clickhouse-server/config.xml backup = etc/clickhouse-server/users.xml - source = https://repo.clickhouse.tech/deb/lts/main/clickhouse-client_21.8.13.6_all.deb - source = https://repo.clickhouse.tech/deb/lts/main/clickhouse-common-static_21.8.13.6_amd64.deb - source = https://repo.clickhouse.tech/deb/lts/main/clickhouse-server_21.8.13.6_all.deb - sha256sums = 1791da0283a1dd6821a113be6cf5cdb3d1c328441a9a81a3afb4effe87b79b91 - sha256sums = 9e2065cd9a1c08d216213e77872bcbd7a0c57111589140a9ed0dbe056745b75e - sha256sums = 5686577fb282e9817b98f7212b0f28a0fb23a0d6f4e8448600ae6d4934e0cb18 + source = https://packages.clickhouse.com/deb/pool/lts/clickhouse-client_22.3.3.44_all.deb + source = https://packages.clickhouse.com/deb/pool/lts/clickhouse-common-static_22.3.3.44_amd64.deb + source = https://packages.clickhouse.com/deb/pool/lts/clickhouse-server_22.3.3.44_all.deb + source = clickhouse-sysuser.conf + source = clickhouse-tmpfiles.conf + b2sums = d5dde3d86b9ce2bdcd31e38ddba2ee487d7b9a3fe0ad665da0c1a339eacf10da1403146bb8e3eea5b4a6720b21770f88916784dc52d1c5fdf4e8d3ed9090ea29 + b2sums = e280ff762cac4851d15fc91b7f430ff98f48a0c98a4604a995952d98cd90b4c0f405ffc28d269c44d5e2a3bacd3e3e06f0b0516361940762576742f5fa2ba3b1 + b2sums = 8e4bddea2f9c7da7d8ca782998b88a67ef1f30ee33a2732ce122d27c205ca4827bf2d1e38d4cdef3ad93b7adcf5be551e669db5f3928b1a98b22020057378dc7 + b2sums = 6a1a52bffac1609e46d5476946a6658c111ef8082bbeeb0c00a32bfc5bc5335330e14d536fcae63f83cb8e2970195a14aeb38545d2133528fba21a0f9bcb473e + b2sums = 28c0af218707634dc33bfea33c934bfad3b3e3a6e6526b0786f989a9f333e7eba5ce6c610e5cd0ac34893d43c17a6262e13b5821a6451c2781499b7ae5e1ac01 -pkgname = clickhouse-lts-218 +pkgname = clickhouse-lts-223 diff --git a/PKGBUILD b/PKGBUILD index 55da4cb..0c2db07 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,31 +1,37 @@ +# Maintainer: Dmitry Bilunov # Maintainer: Mikhail f. Shiryaev +# Maintainer: Yiyang Kang -pkgname=clickhouse-lts-218 -pkgver=21.8.13.6 +pkgname=clickhouse-lts-223 +_pkgname=clickhouse +pkgver=22.3.3.44 pkgrel=1 -pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time. LTS version 21.8' +pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time -- LTS version 22.3' arch=('x86_64') -url='https://clickhouse.com/' +url='https://clickhouse.com' license=('Apache') depends=('tzdata' 'libcap') -provides=(clickhouse clickhouse-lts) -conflicts=(clickhouse clickhouse-lts) +provides=('clickhouse=22.3.3.44' 'clickhouse-lts=22.3.3.44') +conflicts=('clickhouse' 'clickhouse-lts') noextract=( - clickhouse-common-static_${pkgver}_amd64.deb clickhouse-client_${pkgver}_all.deb + clickhouse-common-static_${pkgver}_amd64.deb clickhouse-server_${pkgver}_all.deb ) source=( - https://repo.clickhouse.tech/deb/lts/main/clickhouse-client_${pkgver}_all.deb - https://repo.clickhouse.tech/deb/lts/main/clickhouse-common-static_${pkgver}_amd64.deb - https://repo.clickhouse.tech/deb/lts/main/clickhouse-server_${pkgver}_all.deb + https://packages.clickhouse.com/deb/pool/lts/clickhouse-client_${pkgver}_all.deb + https://packages.clickhouse.com/deb/pool/lts/clickhouse-common-static_${pkgver}_amd64.deb + https://packages.clickhouse.com/deb/pool/lts/clickhouse-server_${pkgver}_all.deb + clickhouse-sysuser.conf + clickhouse-tmpfiles.conf ) -sha256sums=( - 1791da0283a1dd6821a113be6cf5cdb3d1c328441a9a81a3afb4effe87b79b91 - 9e2065cd9a1c08d216213e77872bcbd7a0c57111589140a9ed0dbe056745b75e - 5686577fb282e9817b98f7212b0f28a0fb23a0d6f4e8448600ae6d4934e0cb18 +b2sums=( + d5dde3d86b9ce2bdcd31e38ddba2ee487d7b9a3fe0ad665da0c1a339eacf10da1403146bb8e3eea5b4a6720b21770f88916784dc52d1c5fdf4e8d3ed9090ea29 + e280ff762cac4851d15fc91b7f430ff98f48a0c98a4604a995952d98cd90b4c0f405ffc28d269c44d5e2a3bacd3e3e06f0b0516361940762576742f5fa2ba3b1 + 8e4bddea2f9c7da7d8ca782998b88a67ef1f30ee33a2732ce122d27c205ca4827bf2d1e38d4cdef3ad93b7adcf5be551e669db5f3928b1a98b22020057378dc7 + 6a1a52bffac1609e46d5476946a6658c111ef8082bbeeb0c00a32bfc5bc5335330e14d536fcae63f83cb8e2970195a14aeb38545d2133528fba21a0f9bcb473e + 28c0af218707634dc33bfea33c934bfad3b3e3a6e6526b0786f989a9f333e7eba5ce6c610e5cd0ac34893d43c17a6262e13b5821a6451c2781499b7ae5e1ac01 ) -install=$pkgname.install backup=( 'etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' @@ -38,16 +44,18 @@ package() { tar xf data.tar.gz -C "${pkgdir}" done - gzip -d "${pkgdir}/usr/share/doc/clickhouse-server/LICENSE.gz" - mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}" + mkdir -p "${pkgdir}/usr/share/licenses/${_pkgname}" mv "${pkgdir}/lib" "${pkgdir}/usr/lib" - mv "${pkgdir}/usr/share/doc/clickhouse-server/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + mv "${pkgdir}/usr/share/doc/clickhouse-server/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/" rm -rf "${pkgdir}/etc/cron.d" \ "${pkgdir}/etc/init.d" \ "${pkgdir}/etc/security" \ "${pkgdir}/etc/systemd" \ "${pkgdir}/usr/share/doc" + + install -o root -g root -Dm 0644 clickhouse-sysuser.conf "${pkgdir}/usr/lib/sysusers.d/${_pkgname}.conf" + install -o root -g root -Dm 0644 clickhouse-tmpfiles.conf "${pkgdir}/usr/lib/tmpfiles.d/${_pkgname}.conf" } # vim:set ts=2 sw=2 et: diff --git a/clickhouse-lts-218.install b/clickhouse-lts-218.install deleted file mode 100644 index 281a9c0..0000000 --- a/clickhouse-lts-218.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - groupadd -r clickhouse &>/dev/null - useradd -r -g clickhouse -d /var/lib/clickhouse -s /bin/false clickhouse &>/dev/null - mkdir -p /var/lib/clickhouse/ - chmod 0750 /var/lib/clickhouse - mkdir -p /var/log/clickhouse-server - chown clickhouse:clickhouse -R /var/lib/clickhouse /var/log/clickhouse-server - ldconfig -} diff --git a/clickhouse-sysuser.conf b/clickhouse-sysuser.conf new file mode 100644 index 0000000..ee4fc3d --- /dev/null +++ b/clickhouse-sysuser.conf @@ -0,0 +1 @@ +u clickhouse - "ClickHouse OLAP database" /var/lib/clickhouse diff --git a/clickhouse-tmpfiles.conf b/clickhouse-tmpfiles.conf new file mode 100644 index 0000000..0d0b211 --- /dev/null +++ b/clickhouse-tmpfiles.conf @@ -0,0 +1,2 @@ +d /var/lib/clickhouse 0750 clickhouse clickhouse - +d /var/log/clickhouse-server 0755 clickhouse clickhouse -