23.1.12

3 files changed, 74 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4744ce91adb1..3a382fa9e44c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
 pkgbase = cockroachdb-bin
-	pkgdesc = An open source, survivable, strongly consistent, scale-out SQL database
-	pkgver = 22.2.2
+	pkgdesc = Cloud-native, distributed SQL database
+	pkgver = 23.1.12
 	pkgrel = 1
 	url = https://www.cockroachlabs.com
 	arch = x86_64
 	license = Apache
-	license = custom:BSL
-	license = custom:CCL
-	depends = glibc
+	license = BSL
+	license = CCL
 	provides = cockroachdb
-	conflicts = cockroachdb
-	source = cockroachdb-bin-22.2.2.tgz::https://binaries.cockroachdb.com/cockroach-v22.2.2.linux-amd64.tgz
-	source = LICENSE::https://raw.githubusercontent.com/cockroachdb/cockroach/v22.2.2/LICENSE
+	conflicts = cockroachdb=23.1.12
+	source = cockroachdb-23.1.12.tar.gz::https://binaries.cockroachdb.com/cockroach-v23.1.12.linux-amd64.tgz
+	source = LICENSE::https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE
 	source = cockroach.service
 	source = cockroach.default
 	source = cockroach.sysusers
 	source = cockroach.tmpfiles
-	sha256sums = c11875f9015b7f9ea4193f4ca92b723ef02c405afc290ab4541934fbf1561efb
+	sha256sums = 980ff363521922725c63814696a7385943ca46f3c0bea21322ded9591de33ed2
 	sha256sums = 8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11
 	sha256sums = 6c336d30983d6295995823a134e3cc85a06ef9418339b53cf6f375df816bea51
 	sha256sums = 55f380f5cb201c6afeafbf1a6fb5a6400dbffa0edc134d30960d1d04e3d19ef2
diff --git a/.gitignore b/.gitignore
index 588610027ff4..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-*.t*
-pkg/
-src/
-__pycache__
-update_check.py
\ No newline at end of file
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 9875ab8b9a22..ba7e0852fdca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,84 @@
-# Maintainer: Riccardo Berto <riccardo at rcrdbrt dot-symbol com>
-# 
-# Previous maintainers listed down here:
-# Contributor:  Moses Narrow <moe-narrow@use.startmail.com>
-# Contributor:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Maintainer:
+# Contributor: Riccardo Berto <riccardo at rcrdbrt dot-symbol com>
+# Contributor: Moses Narrow <moe-narrow@use.startmail.com>
+# Contributor: Dimitris Kiziridis <ragouel at outlook dot com>
 # Contributor: Konrad Tegtmeier <konrad.tegtmeier+aur@gmail.com>
 # Contributor: Marcel O'Neil <marcel@marceloneil.com>
 
-pkgname=cockroachdb-bin
-pkgver=22.2.2
+_pkgname=cockroachdb
+pkgname="$_pkgname-bin"
+pkgver=23.1.12
 pkgrel=1
-pkgdesc='An open source, survivable, strongly consistent, scale-out SQL database'
-arch=('x86_64')
+pkgdesc="Cloud-native, distributed SQL database"
 url='https://www.cockroachlabs.com'
-license=('Apache' 'custom:BSL' 'custom:CCL')
-conflicts=('cockroachdb')
-provides=('cockroachdb')
-depends=('glibc')
-source=("${pkgname}-${pkgver}.tgz::https://binaries.cockroachdb.com/cockroach-v${pkgver}.linux-amd64.tgz"
-        "LICENSE::https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE"
-        'cockroach.service'
-        'cockroach.default'
-        'cockroach.sysusers'
-        'cockroach.tmpfiles')
+license=('Apache' 'BSL' 'CCL')
+arch=('x86_64')
 
-sha256sums=('c11875f9015b7f9ea4193f4ca92b723ef02c405afc290ab4541934fbf1561efb'
-            '8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11'
-            '6c336d30983d6295995823a134e3cc85a06ef9418339b53cf6f375df816bea51'
-            '55f380f5cb201c6afeafbf1a6fb5a6400dbffa0edc134d30960d1d04e3d19ef2'
-            '8be2f52529135d8d173bba130e000a187bbadc869ac2c603a4714af435840821'
-            'c74cf876197312b91970bdd7832081750d2ab4d47e553bb46f38d57cba52641e')
-package() {
+conflicts=("$_pkgname=${pkgver}")
+provides=("$_pkgname")
+
+# https://www.cockroachlabs.com/docs/releases/
+
+_pkgsrc="cockroach-v$pkgver.linux-amd64"
+source=(
+  "$_pkgname-$pkgver.tar.gz"::"https://binaries.cockroachdb.com/$_pkgsrc.tgz"
+  'LICENSE'::'https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE'
+  'cockroach.service'
+  'cockroach.default'
+  'cockroach.sysusers'
+  'cockroach.tmpfiles'
+)
+sha256sums=(
+  '980ff363521922725c63814696a7385943ca46f3c0bea21322ded9591de33ed2'
+  '8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11'
+  '6c336d30983d6295995823a134e3cc85a06ef9418339b53cf6f375df816bea51'
+  '55f380f5cb201c6afeafbf1a6fb5a6400dbffa0edc134d30960d1d04e3d19ef2'
+  '8be2f52529135d8d173bba130e000a187bbadc869ac2c603a4714af435840821'
+  'c74cf876197312b91970bdd7832081750d2ab4d47e553bb46f38d57cba52641e'
+)
+
+prepare() {
+  cat <<'EOF' > "$_pkgname.sh"
+#!/usr/bin/env sh
+exec /usr/share/cockroach/cockroach "$@"
+EOF
+}
+
+build() {
   # generate shell completion
-  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-  gen autocomplete bash --out "${srcdir}/cockroach.bash"
-  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-  gen autocomplete zsh --out "${srcdir}/cockroach.zsh"
+  "$_pkgsrc/cockroach" gen autocomplete bash --out "cockroach.bash"
+  "$_pkgsrc/cockroach" gen autocomplete zsh --out "cockroach.zsh"
 
   # generate man pages
-  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-  gen man --path "${srcdir}/man"
+  "$_pkgsrc/cockroach" gen man --path "man"
+}
 
+package() {
   # binary
-  install -Dm755 "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" "${pkgdir}/usr/bin/cockroach"
+  install -Dm755 "$_pkgsrc/cockroach" "$pkgdir/usr/share/cockroach/cockroach"
+
+  # GEOS libraries # https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html
+  install -Dm644 "$_pkgsrc/lib/libgeos.so" "$pkgdir/usr/share/cockroach/lib/libgeos.so"
+  install -Dm644 "$_pkgsrc/lib/libgeos_c.so" "$pkgdir/usr/share/cockroach/lib/libgeos_c.so"
+
+  # script
+  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/cockroach"
 
   # user/group & owned directories
-  install -Dm644 "${srcdir}/cockroach.sysusers" "${pkgdir}/usr/lib/sysusers.d/cockroach.conf"
-  install -Dm644 "${srcdir}/cockroach.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/cockroach.conf"
+  install -Dm644 "cockroach.sysusers" "$pkgdir/usr/lib/sysusers.d/cockroach.conf"
+  install -Dm644 "cockroach.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/cockroach.conf"
 
   # services & runtime
-  install -Dm644 "${srcdir}/cockroach.service" "${pkgdir}/usr/lib/systemd/system/cockroach.service"
-  install -Dm644 "${srcdir}/cockroach.default" "${pkgdir}/etc/default/cockroach"
+  install -Dm644 "cockroach.service" "$pkgdir/usr/lib/systemd/system/cockroach.service"
+  install -Dm644 "cockroach.default" "$pkgdir/etc/default/cockroach"
 
   # man pages
-  install -d "${pkgdir}/usr/share/man/man1/"
-  install -m644 "${srcdir}"/man/*.1 "${pkgdir}/usr/share/man/man1/"
+  install -Dm644 "man"/*.1 -t "$pkgdir/usr/share/man/man1/"
 
   # shell completion
-  install -Dm644 cockroach.bash "${pkgdir}/usr/share/bash-completion/completions/cockroach"
-  install -Dm644 cockroach.zsh  "${pkgdir}/usr/share/zsh/site-functions/_cockroach"
+  install -Dm644 cockroach.bash "$pkgdir/usr/share/bash-completion/completions/cockroach"
+  install -Dm644 cockroach.zsh  "$pkgdir/usr/share/zsh/site-functions/_cockroach"
 
   # licenses
-  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # GEOS libraries (see: https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html)
-  install -Dm644 "${srcdir}/cockroach-v${pkgver}.linux-amd64/lib/libgeos.so" "${pkgdir}/usr/local/lib/cockroach/libgeos.so"
-  install -Dm644 "${srcdir}/cockroach-v${pkgver}.linux-amd64/lib/libgeos_c.so" "${pkgdir}/usr/local/lib/cockroach/libgeos_c.so"
+  install -Dm644 "LICENSE" -t "$pkgdir/usr/share/licenses/$pkgname/"
 }