backup config file

3 files changed, 11 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a382fa9e44c..0522cd3f9503 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = cockroachdb-bin
 	pkgdesc = Cloud-native, distributed SQL database
 	pkgver = 23.1.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.cockroachlabs.com
 	arch = x86_64
 	license = Apache
@@ -9,8 +9,9 @@ pkgbase = cockroachdb-bin
 	license = CCL
 	provides = cockroachdb
 	conflicts = cockroachdb=23.1.12
+	backup = etc/default/cockroach
 	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 = LICENSE::https://raw.githubusercontent.com/cockroachdb/cockroach/v23.1.12/LICENSE
 	source = cockroach.service
 	source = cockroach.default
 	source = cockroach.sysusers
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 1841d72b95e8..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-Source code in this repository is variously licensed under the Business Source
-License 1.1 (BSL), the CockroachDB Community License (CCL), the MIT license, and
-BSD-style licenses. A copy of each license can be found in the licenses
-directory. Source code in a given file is licensed under the BSL and the
-copyright belongs to The Cockroach Authors unless otherwise noted at the
-beginning of the file.
-
-Running `make` will produce a binary that includes CCL-licensed code and is thus
-subject to the terms of the CCL. To produce a binary that is free of CCL-
-licensed code, run `make buildoss`.
diff --git a/PKGBUILD b/PKGBUILD
index ba7e0852fdca..f154d6c194b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,10 +5,14 @@
 # Contributor: Konrad Tegtmeier <konrad.tegtmeier+aur@gmail.com>
 # Contributor: Marcel O'Neil <marcel@marceloneil.com>
 
+## Useful URLs:
+# https://www.cockroachlabs.com/docs/releases/
+# https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html
+
 _pkgname=cockroachdb
 pkgname="$_pkgname-bin"
 pkgver=23.1.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Cloud-native, distributed SQL database"
 url='https://www.cockroachlabs.com'
 license=('Apache' 'BSL' 'CCL')
@@ -17,12 +21,12 @@ arch=('x86_64')
 conflicts=("$_pkgname=${pkgver}")
 provides=("$_pkgname")
 
-# https://www.cockroachlabs.com/docs/releases/
+backup=("etc/default/cockroach")
 
 _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'
+  'LICENSE'::"https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE"
   'cockroach.service'
   'cockroach.default'
   'cockroach.sysusers'
@@ -57,7 +61,7 @@ package() {
   # binary
   install -Dm755 "$_pkgsrc/cockroach" "$pkgdir/usr/share/cockroach/cockroach"
 
-  # GEOS libraries # https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html
+  # 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"