[arch-commits] Commit in couchdb/trunk (4 files)

[Bruno Pagani]

    Date: Friday, April 22, 2022 @ 22:20:25
  Author: archange
Revision: 1187442

upgpkg: couchdb 3.2.2-1

Use upstream provided means of configuration as much as possible.

Modified:
  couchdb/trunk/PKGBUILD
  couchdb/trunk/couchdb.service
  couchdb/trunk/couchdb.tmpfiles
Deleted:
  couchdb/trunk/datadirs.ini

------------------+
 PKGBUILD         |   38 +++++++++++++++++++-------------------
 couchdb.service  |    2 +-
 couchdb.tmpfiles |    2 +-
 datadirs.ini     |    3 ---
 4 files changed, 21 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-22 22:19:21 UTC (rev 1187441)
+++ PKGBUILD	2022-04-22 22:20:25 UTC (rev 1187442)
@@ -4,28 +4,25 @@
 # Contributor: Michael Fellinger <m.fellinger at gmail.com>
 
 pkgname=couchdb
-pkgver=3.2.1
-pkgrel=2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc="Document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=(x86_64)
 url="https://couchdb.apache.org"
 license=(Apache)
-depends=(icu js78 zlib)
+depends=(icu js91 zlib)
 optdepends=('erlang-nox: for weatherreport')
 makedepends=(erlang-nox)
-backup=('etc/couchdb/local.ini'
-        'etc/couchdb/vm.args')
-source=("https://www-eu.apache.org/dist/couchdb/source/${pkgver}/apache-couchdb-${pkgver}.tar.gz"{,.asc}
+backup=(etc/couchdb/local.ini
+        etc/couchdb/vm.args)
+source=("https://archive.apache.org/dist/${pkgname}/source/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
         couchdb.service
         couchdb.sysusers
-        couchdb.tmpfiles
-        datadirs.ini)
-sha256sums=('11de2d1c3a5b317017a7459ec3f76230d5c43aba427a1e71ca3437845874acf8'
-            'SKIP'
-            '38f3e489c031b8c6eacd8b9da3ca91362d7929e8f5e3c8b0e4cf5401c67bf7bb'
-            '3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8'
-            '0ce806cbc5e18e60b17be9fd2cdbd4c7f12cc84ca95b079efdede16ddb5f3efd'
-            '937ca3498aab47b3f2226d027fa8a1a95de55cbb463373099e28cb9a6c7046ac')
+        couchdb.tmpfiles)
+sha256sums=(69c9fd6f80133557f68a02e92dda72a4fd646d646f429f45bb8329a30f82f20e SKIP
+            745754da596c2451352a21ed6e9ade92b2fbd111f9957ddba1209a20bd9eff1d
+            3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8
+            7331b9675e3668c5f0d632bee5d154c061cc3e60d451bef3dc0d0ab2dadfa006)
 validpgpkeys=(2EC788AE3F239FA13E82D215CDE711289384AE37  # Joan Touzet (CODE SIGNING KEY) <wohali at apache.org>
               D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4  # Jan Lehnardt <jan at apache.org>
               0BD7A98499C4AB41C910EE65FC04DFBC9657A78E) # Nick Vatamaniuc <vatamane at gmail.com>
@@ -32,12 +29,12 @@
 
 prepare() {
   cd apache-couchdb-${pkgver}
-  sed -i 's|$ROOTDIR/etc/vm.args|/etc/couchdb/vm.args|' rel/files/couchdb.in
+  sed -i 's|./data|/var/lib/couchdb|' configure
 }
 
 build() {
   cd apache-couchdb-${pkgver}
-  ./configure --spidermonkey-version 78
+  ./configure --spidermonkey-version 91
   make release
 }
 
@@ -47,12 +44,15 @@
   install -dm755 "${pkgdir}"/etc/couchdb/
 
   cp -r rel/couchdb "${pkgdir}"/usr/lib/couchdb
-  mv "${pkgdir}"/usr/lib/couchdb/etc/local.ini "${pkgdir}"/etc/couchdb/local.ini
-  mv "${pkgdir}"/usr/lib/couchdb/etc/vm.args "${pkgdir}"/etc/couchdb/vm.args
+  mv "${pkgdir}"/usr/lib/couchdb/etc/{default.ini,local.ini,vm.args} "${pkgdir}"/etc/couchdb/
 
   cd "${srcdir}"
   install -Dm644 ${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf
   install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
-  install -Dm644 datadirs.ini -t "${pkgdir}"/usr/lib/couchdb/etc/
+
+  # Remove some cruft
+  rm -r "${pkgdir}"/usr/lib/couchdb/erts-12.3/{doc,include,lib,man,src}
+  rm -rv "${pkgdir}"/usr/lib/couchdb/etc/
+  rm -rv "${pkgdir}"/usr/lib/couchdb/lib/couch-${pkgver}/priv/couch_{ejson_compare,js}
 }

Modified: couchdb.service
===================================================================
--- couchdb.service	2022-04-22 22:19:21 UTC (rev 1187441)
+++ couchdb.service	2022-04-22 22:20:25 UTC (rev 1187442)
@@ -7,7 +7,7 @@
 Type=simple
 WorkingDirectory=~
 StateDirectory=couchdb
-Environment="ERL_FLAGS=-couch_ini /usr/lib/couchdb/etc/default.ini /usr/lib/couchdb/etc/datadirs.ini /etc/couchdb/local.ini"
+Environment=COUCHDB_ARGS_FILE=/etc/couchdb/vm.args "COUCHDB_INI_FILES=/etc/couchdb/default.ini /etc/couchdb/local.ini"
 ExecStart=/usr/lib/couchdb/bin/couchdb
 ReadWritePaths=/etc/couchdb/local.ini
 Restart=always

Modified: couchdb.tmpfiles
===================================================================
--- couchdb.tmpfiles	2022-04-22 22:19:21 UTC (rev 1187441)
+++ couchdb.tmpfiles	2022-04-22 22:20:25 UTC (rev 1187442)
@@ -1,3 +1,3 @@
+z /etc/couchdb/local.ini - couchdb couchdb
 d /var/lib/couchdb 0755 couchdb couchdb
 x /var/lib/couchdb
-z /etc/couchdb/local.ini - couchdb couchdb

Deleted: datadirs.ini
===================================================================
--- datadirs.ini	2022-04-22 22:19:21 UTC (rev 1187441)
+++ datadirs.ini	2022-04-22 22:20:25 UTC (rev 1187442)
@@ -1,3 +0,0 @@
-[couchdb]
-database_dir = /var/lib/couchdb
-view_index_dir = /var/lib/couchdb