23.2.3

6 files changed, 53 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 82cf59b2181e..d57ca0cc6197 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,20 @@
 pkgbase = cockroachdb-bin
 	pkgdesc = Cloud-native, distributed SQL database
-	pkgver = 23.2.2
+	pkgver = 23.2.3
 	pkgrel = 1
 	url = https://www.cockroachlabs.com
 	arch = x86_64
 	license = Apache-2.0
 	license = BUSL-1.1
-	license = RefLicense-CCL
+	license = LicenseRef-CCL
 	provides = cockroachdb
-	conflicts = cockroachdb=23.2.2
+	conflicts = cockroachdb=23.2.3
 	backup = etc/default/cockroach
-	source = cockroachdb-23.2.2.tar.gz::https://binaries.cockroachdb.com/cockroach-v23.2.2.linux-amd64.tgz
-	source = LICENSE-23.2.2::https://github.com/cockroachdb/cockroach/raw/v23.2.2/LICENSE
-	source = LICENSE.CCL-23.2.2::https://github.com/cockroachdb/cockroach/raw/v23.2.2/licenses/CCL.txt
-	source = cockroach.service
-	source = cockroach.default
-	source = cockroach.sysusers
-	source = cockroach.tmpfiles
-	sha256sums = bf58a5bccca741d455209a01c530f26148de303ce3e388c59285bca9665a95b5
+	source = cockroachdb-23.2.3.tar.gz::https://binaries.cockroachdb.com/cockroach-v23.2.3.linux-amd64.tgz
+	source = LICENSE-23.2.3::https://github.com/cockroachdb/cockroach/raw/v23.2.3/LICENSE
+	source = LICENSE.CCL-23.2.3::https://github.com/cockroachdb/cockroach/raw/v23.2.3/licenses/CCL.txt
+	sha256sums = 909b7a28ae9362cdbfc44a30b20694e6e271b1d3d1cc63fdfd0ab3370566bed4
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 6c336d30983d6295995823a134e3cc85a06ef9418339b53cf6f375df816bea51
-	sha256sums = 55f380f5cb201c6afeafbf1a6fb5a6400dbffa0edc134d30960d1d04e3d19ef2
-	sha256sums = 8be2f52529135d8d173bba130e000a187bbadc869ac2c603a4714af435840821
-	sha256sums = c74cf876197312b91970bdd7832081750d2ab4d47e553bb46f38d57cba52641e
 
 pkgname = cockroachdb-bin
diff --git a/PKGBUILD b/PKGBUILD
index 9b827b0367fd..e7f52613d61e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,11 +12,11 @@
 
 _pkgname=cockroachdb
 pkgname="$_pkgname-bin"
-pkgver=23.2.2
+pkgver=23.2.3
 pkgrel=1
 pkgdesc="Cloud-native, distributed SQL database"
 url='https://www.cockroachlabs.com'
-license=('Apache-2.0' 'BUSL-1.1' 'RefLicense-CCL')
+license=('Apache-2.0' 'BUSL-1.1' 'LicenseRef-CCL')
 arch=('x86_64')
 
 conflicts=("$_pkgname=${pkgver}")
@@ -30,28 +30,13 @@ source=(
   "$_pkgname-$pkgver.tar.gz"::"https://binaries.cockroachdb.com/$_pkgsrc.tgz"
   "LICENSE-$pkgver"::"https://github.com/cockroachdb/cockroach/raw/v$pkgver/LICENSE"
   "LICENSE.CCL-$pkgver"::"https://github.com/cockroachdb/cockroach/raw/v$pkgver/licenses/CCL.txt"  
-  'cockroach.service'
-  'cockroach.default'
-  'cockroach.sysusers'
-  'cockroach.tmpfiles'
 )
 sha256sums=(
-  'bf58a5bccca741d455209a01c530f26148de303ce3e388c59285bca9665a95b5'
+  '909b7a28ae9362cdbfc44a30b20694e6e271b1d3d1cc63fdfd0ab3370566bed4'
   'SKIP'
   'SKIP'
-  '6c336d30983d6295995823a134e3cc85a06ef9418339b53cf6f375df816bea51'
-  '55f380f5cb201c6afeafbf1a6fb5a6400dbffa0edc134d30960d1d04e3d19ef2'
-  '8be2f52529135d8d173bba130e000a187bbadc869ac2c603a4714af435840821'
-  'c74cf876197312b91970bdd7832081750d2ab4d47e553bb46f38d57cba52641e'
 )
 
-prepare() {
-  cat <<'EOF' > "$_pkgname.sh"
-#!/usr/bin/env sh
-exec /usr/share/cockroach/cockroach "$@"
-EOF
-}
-
 build() {
   # generate shell completion
   "$_pkgsrc/cockroach" gen autocomplete bash --out "cockroach.bash"
@@ -62,23 +47,58 @@ build() {
 }
 
 package() {
+  local _install_path='usr/lib'
+
   # binary
-  install -Dm755 "$_pkgsrc/cockroach" "$pkgdir/usr/share/cockroach/cockroach"
+  install -Dm755 "$_pkgsrc/cockroach" "$pkgdir/$_install_path/$_pkgname/cockroach"
 
   # GEOS libraries
-  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"
+  install -Dm644 "$_pkgsrc/lib/libgeos.so" "$pkgdir/$_install_path/$_pkgname/lib/libgeos.so"
+  install -Dm644 "$_pkgsrc/lib/libgeos_c.so" "$pkgdir/$_install_path/$_pkgname/lib/libgeos_c.so"
 
   # script
-  install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/cockroach"
+  install -Dm755 /dev/stdin "$pkgdir/usr/bin/cockroach" <<EOF
+#!/usr/bin/env sh
+exec /$_install_path/$_pkgname/cockroach "\$@"
+EOF
 
   # user/group & owned directories
-  install -Dm644 "cockroach.sysusers" "$pkgdir/usr/lib/sysusers.d/cockroach.conf"
-  install -Dm644 "cockroach.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/cockroach.conf"
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cockroach.conf" <<END
+u cockroach - "CockroachDB" /var/lib/cockroach
+END
+
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/cockroach.conf" <<END
+d /etc/cockroach 0755 root cockroach - -
+d /var/lib/cockroach 0750 cockroach cockroach - -
+END
 
   # services & runtime
-  install -Dm644 "cockroach.service" "$pkgdir/usr/lib/systemd/system/cockroach.service"
-  install -Dm644 "cockroach.default" "$pkgdir/etc/default/cockroach"
+  install -Dm644 /dev/stdin "$pkgdir/usr/lib/systemd/system/cockroach.service" <<END
+[Unit]
+Description=CockroachDB database server
+Requires=network-online.target
+After=network-online.target
+
+[Service]
+User=cockroach
+Group=cockroach
+
+EnvironmentFile=-/etc/default/cockroach
+ExecStart=/usr/bin/cockroach start --certs-dir /etc/cockroach --store=${COCKROACH_STORE} $COCKROACH_FLAGS
+LimitNOFILE=35000
+
+ProtectHome=true
+ProtectSystem=full
+NoNewPrivileges=true
+
+[Install]
+WantedBy=multi-user.target
+END
+
+  install -Dm644 /dev/stdin "$pkgdir/etc/default/cockroach" <<END
+COCKROACH_FLAGS="--insecure"
+COCKROACH_STORE="path=/var/lib/cockroach"
+END
 
   # man pages
   install -Dm644 "man"/*.1 -t "$pkgdir/usr/share/man/man1/"
diff --git a/cockroach.default b/cockroach.default
deleted file mode 100644
index 9ac547375185..000000000000
--- a/cockroach.default
+++ /dev/null
@@ -1,2 +0,0 @@
-COCKROACH_FLAGS="--insecure"
-COCKROACH_STORE="path=/var/lib/cockroach"
diff --git a/cockroach.service b/cockroach.service
deleted file mode 100644
index e4bde93d4034..000000000000
--- a/cockroach.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=CockroachDB database server
-Requires=network-online.target
-After=network-online.target
-
-[Service]
-User=cockroach
-Group=cockroach
-
-EnvironmentFile=-/etc/default/cockroach
-ExecStart=/usr/bin/cockroach start --certs-dir /etc/cockroach --store=${COCKROACH_STORE} $COCKROACH_FLAGS
-LimitNOFILE=35000
-
-ProtectHome=true
-ProtectSystem=full
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/cockroach.sysusers b/cockroach.sysusers
deleted file mode 100644
index baaf20572210..000000000000
--- a/cockroach.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u cockroach - "CockroachDB" /var/lib/cockroach
diff --git a/cockroach.tmpfiles b/cockroach.tmpfiles
deleted file mode 100644
index a8ac7a027080..000000000000
--- a/cockroach.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /etc/cockroach 0755 root cockroach - -
-d /var/lib/cockroach 0750 cockroach cockroach - -