summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
2 files changed, 7 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bd618ec5f993..b152d7ba79a8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = tikv
pkgdesc = Distributed transactional key-value database, originally created to complement TiDB
- pkgver = 3.0.10
- pkgrel = 2
+ pkgver = 3.0.11
+ pkgrel = 1
url = https://github.com/tikv/tikv
arch = x86_64
license = Apache
@@ -15,14 +15,12 @@ pkgbase = tikv
depends = gcc-libs
provides = tikv-server
backup = etc/tikv/tikv.toml
- source = tikv-3.0.10.tar.gz::https://github.com/tikv/tikv/archive/v3.0.10.tar.gz
- source = pr-6704.patch::https://patch-diff.githubusercontent.com/raw/tikv/tikv/pull/6704.patch
+ source = tikv-3.0.11.tar.gz::https://github.com/tikv/tikv/archive/v3.0.11.tar.gz
source = tikv.service
source = tikv-sysusers.conf
source = tikv-tmpfiles.conf
source = tikv.toml
- sha256sums = 72b0388d8c5c746d11a16baaa12dc1753e83031997b1c7dc8b4f2f48123b17c4
- sha256sums = 6604c22b6e1f8cd2ae6a4296e3e98bbf40b99e796840b34c34a2a773baed2a81
+ sha256sums = 78f2d04675a12ec75d00c237837956543538eb42c62665aa5e221a0c26c761d1
sha256sums = 870b8eaf83bc0d22b05b0f3a7890660e483cf77bb1d84bc50ad04fb23068cd8c
sha256sums = 744b252e29099b0099dc41e30bc3badd33b3d661c7126af8044faa4fc2df8927
sha256sums = 935291bac6a216c6f880df9bfaec8900266413bb202ac483e79f291e1f28e9f1
diff --git a/PKGBUILD b/PKGBUILD
index fe920c66d792..c6aa76835335 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Xuanwo <xuanwo@archlinuxcn.org>
# Maintainer: Allen Zhong <zhongbenli@pingcap.com>
pkgname=tikv
-pkgver=3.0.10
-pkgrel=2
+pkgver=3.0.11
+pkgrel=1
pkgdesc='Distributed transactional key-value database, originally created to complement TiDB'
makedepends=('go' 'make' 'rustup' 'awk' 'cmake' 'gcc')
arch=('x86_64')
@@ -12,13 +12,11 @@ provides=('tikv-server')
backup=(etc/tikv/tikv.toml)
depends=('tikv-pd' 'gcc-libs')
source=(tikv-${pkgver}.tar.gz::https://github.com/tikv/tikv/archive/v${pkgver}.tar.gz
- "pr-6704.patch::https://patch-diff.githubusercontent.com/raw/tikv/tikv/pull/6704.patch"
tikv.service
tikv-sysusers.conf
tikv-tmpfiles.conf
tikv.toml)
-sha256sums=('72b0388d8c5c746d11a16baaa12dc1753e83031997b1c7dc8b4f2f48123b17c4'
- '6604c22b6e1f8cd2ae6a4296e3e98bbf40b99e796840b34c34a2a773baed2a81'
+sha256sums=('78f2d04675a12ec75d00c237837956543538eb42c62665aa5e221a0c26c761d1'
'870b8eaf83bc0d22b05b0f3a7890660e483cf77bb1d84bc50ad04fb23068cd8c'
'744b252e29099b0099dc41e30bc3badd33b3d661c7126af8044faa4fc2df8927'
'935291bac6a216c6f880df9bfaec8900266413bb202ac483e79f291e1f28e9f1'
@@ -27,9 +25,6 @@ sha256sums=('72b0388d8c5c746d11a16baaa12dc1753e83031997b1c7dc8b4f2f48123b17c4'
prepare() {
cd tikv-${pkgver}
- # apply upstream patch
- patch -Np1 -i ../pr-6704.patch
-
rustup component add rustfmt-preview
# patch Makefile