[arch-commits] Commit in couchdb/trunk (PKGBUILD couchdb-erlang22.patch)
Bruno Pagani
archange at archlinux.org
Mon Oct 12 18:32:51 UTC 2020
Date: Monday, October 12, 2020 @ 18:32:51
Author: archange
Revision: 723711
upgpkg: couchdb 3.1.1-1
Also fixes FS#68106.
Modified:
couchdb/trunk/PKGBUILD
Deleted:
couchdb/trunk/couchdb-erlang22.patch
------------------------+
PKGBUILD | 73 ++++++++++++++++++++++-------------------------
couchdb-erlang22.patch | 49 -------------------------------
2 files changed, 35 insertions(+), 87 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-10-12 18:28:10 UTC (rev 723710)
+++ PKGBUILD 2020-10-12 18:32:51 UTC (rev 723711)
@@ -4,56 +4,53 @@
# Contributor: Michael Fellinger <m.fellinger at gmail.com>
pkgname=couchdb
-pkgver=2.3.1
-pkgrel=4
-pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
-arch=('x86_64')
+pkgver=3.1.1
+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' 'js185' 'zlib')
-makedepends=('erlang-nox')
+license=(Apache)
+depends=(icu js68 zlib)
+makedepends=(erlang22-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}
- 'couchdb.service'
- 'couchdb.sysusers'
- 'couchdb.tmpfiles'
- 'datadirs.ini'
- 'couchdb-erlang22.patch')
-sha256sums=('43eb8cec41eb52871bf22d35f3e2c2ce5b806ebdbce3594cf6b0438f2534227d'
- 'SKIP'
- '293fe7ce16de6feb5927bf151360c7441f427f1d6bec73bc9ecb1e530be2b93a'
- '3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8'
- '0ce806cbc5e18e60b17be9fd2cdbd4c7f12cc84ca95b079efdede16ddb5f3efd'
- '937ca3498aab47b3f2226d027fa8a1a95de55cbb463373099e28cb9a6c7046ac'
- 'b2342e84a6b2b79d732b4b701d54723d20f552a6b412eca039373a7b21a35e3c')
-validpgpkeys=('2EC788AE3F239FA13E82D215CDE711289384AE37' # Joan Touzet (CODE SIGNING KEY) <wohali at apache.org>
- 'D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4') # Jan Lehnardt <jan at apache.org>
+ couchdb.service
+ couchdb.sysusers
+ couchdb.tmpfiles
+ datadirs.ini)
+sha256sums=(8ffe766bba2ba39a7b49689a0732afacf69caffdf8e2d95447e82fb173c78ca3
+ SKIP
+ 293fe7ce16de6feb5927bf151360c7441f427f1d6bec73bc9ecb1e530be2b93a
+ 3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8
+ 0ce806cbc5e18e60b17be9fd2cdbd4c7f12cc84ca95b079efdede16ddb5f3efd
+ 937ca3498aab47b3f2226d027fa8a1a95de55cbb463373099e28cb9a6c7046ac)
+validpgpkeys=(2EC788AE3F239FA13E82D215CDE711289384AE37 # Joan Touzet (CODE SIGNING KEY) <wohali at apache.org>
+ D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4) # Jan Lehnardt <jan at apache.org>
prepare() {
- cd apache-couchdb-${pkgver}
- sed -i 's|$ROOTDIR/etc/vm.args|/etc/couchdb/vm.args|' rel/files/couchdb.in
- patch -p1 -i ../couchdb-erlang22.patch # Support erlang 22
+ cd apache-couchdb-${pkgver}
+ sed -i 's|$ROOTDIR/etc/vm.args|/etc/couchdb/vm.args|' rel/files/couchdb.in
}
build() {
- cd apache-couchdb-${pkgver}
- ./configure
- make release
+ cd apache-couchdb-${pkgver}
+ ./configure --spidermonkey-version 68
+ make release
}
package() {
- cd apache-couchdb-${pkgver}
- install -dm755 "${pkgdir}"/usr/lib/
- install -dm755 "${pkgdir}"/etc/couchdb/
+ cd apache-couchdb-${pkgver}
+ install -dm755 "${pkgdir}"/usr/lib/
+ 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
+ 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
- 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/
+ 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/
}
Deleted: couchdb-erlang22.patch
===================================================================
--- couchdb-erlang22.patch 2020-10-12 18:28:10 UTC (rev 723710)
+++ couchdb-erlang22.patch 2020-10-12 18:32:51 UTC (rev 723711)
@@ -1,49 +0,0 @@
-From 61fc0868699805733a8f4357783bcdd06629d708 Mon Sep 17 00:00:00 2001
-From: Nick Vatamaniuc <vatamane at apache.org>
-Date: Tue, 9 Jul 2019 16:45:52 -0400
-Subject: [PATCH] Add erlang 22 support
-
-Bumped elixir version to 1.7.4 as 1.6.6 wasn't built with Erlang 22
-support.
-
-Also moving straight to 22.0.5 since 22.0 in travis crashed with a
-segmentation fault. Some of the release comments in the point release
-mention VM crashes, so it seems to check out.
-
-Fixes https://github.com/apache/couchdb/issues/2069
----
- .travis.yml | 3 ++-
- rebar.config.script | 6 ++++--
- 2 files changed, 6 insertions(+), 3 deletions(-)
-diff --git a/rebar.config.script b/rebar.config.script
-index 33ceb72838..6445057e7e 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -44,6 +44,8 @@ case VerList of
- [20 | _] = V20 when V20 >= [20, 3, 8, 11] -> ok;
- [21, 2] -> NotSupported(VerString);
- [21, 2, N | _] when N < 3 -> NotSupported(VerString);
-+ [22, 0] -> NotSupported(VerString);
-+ [22, 0, N | _] when N < 5 -> NotSupported(VerString);
- _ -> ok
- end.
-
-@@ -148,7 +150,7 @@ ErlOpts = case os:getenv("ERL_OPTS") of
- end,
-
- AddConfig = [
-- {require_otp_vsn, "17|18|19|20|21"},
-+ {require_otp_vsn, "17|18|19|20|21|22"},
- {deps_dir, "src"},
- {deps, lists:map(MakeDep, DepDescs)},
- {sub_dirs, SubDirs},
-diff --git a/rebar.config b/rebar.config
-index f134a63..1785295 100644
---- a/src/snappy/rebar.config
-+++ b/src/snappy/rebar.config
-@@ -1,4 +1,4 @@
--{require_otp_vsn, "R14|R15|R16|17|18|19|20|21"}.
-+{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22"}.
-
- {erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}.
- {port_sources, ["c_src/*.cc",
More information about the arch-commits
mailing list