mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-18 22:54:00 +00:00
extra/couchdb to 3.3.3-1
This commit is contained in:
Kevin Mihelich
parent
f21e80e9c3
commit
73fc053739
5 changed files with 43 additions and 79 deletions
39
extra/couchdb/.SRCINFO
Normal file
39
extra/couchdb/.SRCINFO
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
pkgbase = couchdb
|
||||
pkgdesc = Document-oriented database that can be queried and indexed in a MapReduce fashion using JSON
|
||||
pkgver = 3.3.3
|
||||
pkgrel = 1
|
||||
url = https://couchdb.apache.org
|
||||
arch = x86_64
|
||||
license = Apache
|
||||
makedepends = erlang-nox
|
||||
depends = icu
|
||||
depends = js91
|
||||
depends = zlib
|
||||
optdepends = erlang-nox: for weatherreport
|
||||
options = !makeflags
|
||||
backup = etc/couchdb/local.ini
|
||||
backup = etc/couchdb/vm.args
|
||||
backup = etc/default/couchdb
|
||||
source = https://archive.apache.org/dist/couchdb/source/3.3.3/apache-couchdb-3.3.3.tar.gz
|
||||
source = https://archive.apache.org/dist/couchdb/source/3.3.3/apache-couchdb-3.3.3.tar.gz.asc
|
||||
source = https://github.com/davisp/jiffy/archive/1.1.1/jiffy-1.1.1.tar.gz
|
||||
source = erlang-26.patch
|
||||
source = erlang-26-compatibilty.patch
|
||||
source = couchdb.default
|
||||
source = couchdb.service
|
||||
source = couchdb.sysusers
|
||||
source = couchdb.tmpfiles
|
||||
validpgpkeys = 2EC788AE3F239FA13E82D215CDE711289384AE37
|
||||
validpgpkeys = D2B17F9DA23C0A10991AF2E3D9EE01E47852AEE4
|
||||
validpgpkeys = 0BD7A98499C4AB41C910EE65FC04DFBC9657A78E
|
||||
sha256sums = 7a2007b5f673d4be22a25c9a111d9066919d872ddb9135a7dcec0122299bd39e
|
||||
sha256sums = SKIP
|
||||
sha256sums = a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8
|
||||
sha256sums = bb1d55bc3643b0c03536efcc136719f3c2c51dd7cb3bbf763c613d25e9169a79
|
||||
sha256sums = ec18cdf8b0e7287db0467385797b5fe11f17701ab10df631cb74b6e56099bf5e
|
||||
sha256sums = 0d21fdd7851b3a6fa099b030cab0e96705b1d5a3a83a4ff1c871814d8742cae9
|
||||
sha256sums = 6ab3d362f3fcd9079036c883dc09dc597584cb627831460f2e0c68a31aa052ae
|
||||
sha256sums = 3ed1ad2a37a068ce194b03fb72eb35285d60fa7faf2d2c2bb710703d229108a8
|
||||
sha256sums = 7331b9675e3668c5f0d632bee5d154c061cc3e60d451bef3dc0d0ab2dadfa006
|
||||
|
||||
pkgname = couchdb
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
# - patch to disable LTO
|
||||
|
||||
pkgname=couchdb
|
||||
pkgver=3.3.2
|
||||
pkgver=3.3.3
|
||||
pkgrel=1
|
||||
pkgdesc="Document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
|
||||
arch=(x86_64)
|
||||
|
|
@ -29,10 +29,10 @@ source=("https://archive.apache.org/dist/${pkgname}/source/${pkgver}/apache-${pk
|
|||
couchdb.sysusers
|
||||
couchdb.tmpfiles
|
||||
arm.patch)
|
||||
sha256sums=('3d6823d42d10cf0d4f86c9c4fe59c9932c89d68578fcb6c4b4278dc769308daa'
|
||||
sha256sums=('7a2007b5f673d4be22a25c9a111d9066919d872ddb9135a7dcec0122299bd39e'
|
||||
'SKIP'
|
||||
'a999351d956d3ed10c33a6dd7e9435e674e519b5b82a46d60361afdb83062fd8'
|
||||
'06782fccf44ad0463f55f0d9edc03c3ba05958471811bc38c1a155d322e09fa5'
|
||||
'bb1d55bc3643b0c03536efcc136719f3c2c51dd7cb3bbf763c613d25e9169a79'
|
||||
'ec18cdf8b0e7287db0467385797b5fe11f17701ab10df631cb74b6e56099bf5e'
|
||||
'0d21fdd7851b3a6fa099b030cab0e96705b1d5a3a83a4ff1c871814d8742cae9'
|
||||
'6ab3d362f3fcd9079036c883dc09dc597584cb627831460f2e0c68a31aa052ae'
|
||||
|
|
@ -85,7 +85,7 @@ package() {
|
|||
install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf
|
||||
|
||||
# Remove some cruft
|
||||
rm -r "${pkgdir}"/usr/lib/couchdb/erts-14.0.1/{doc,include,lib,man,src}
|
||||
rm -r "${pkgdir}"/usr/lib/couchdb/erts-*/{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}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
From 7ed2207259db0ef82fa3d3ead52af3d3414ec350 Mon Sep 17 00:00:00 2001
|
||||
From: Ronny <ronny@apache.org>
|
||||
Date: Sat, 11 Jun 2022 14:00:32 +0200
|
||||
Subject: [PATCH] Add Erlang 25 support
|
||||
|
||||
---
|
||||
rebar.config | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rebar.config b/rebar.config
|
||||
index a6a3b70..3b93f8a 100644
|
||||
--- a/rebar.config
|
||||
+++ b/rebar.config
|
||||
@@ -1,4 +1,4 @@
|
||||
-{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22|23|24"}.
|
||||
+{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22|23|24|25|26"}.
|
||||
|
||||
{erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}.
|
||||
{port_sources, ["c_src/*.cc",
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
From 592837abc8b07f9b28898fa91c31658e2beecfc4 Mon Sep 17 00:00:00 2001
|
||||
From: Ronny Berndt <ronny@apache.org>
|
||||
Date: Sat, 11 Jun 2022 14:18:54 +0200
|
||||
Subject: [PATCH] Add Erlang 25 support
|
||||
|
||||
Before merging this PR, PR #16 in couchdb-snappy needs to get merged and tagged with CouchDB-1.0.8
|
||||
---
|
||||
rebar.config.script | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rebar.config.script b/rebar.config.script
|
||||
index 31855098b3..44c4d61b1a 100644
|
||||
--- a/rebar.config.script
|
||||
+++ b/rebar.config.script
|
||||
@@ -192,7 +192,7 @@ MakeDep = fun
|
||||
end.
|
||||
|
||||
AddConfig = [
|
||||
- {require_otp_vsn, "20|21|22|23|24"},
|
||||
+ {require_otp_vsn, "20|21|22|23|24|25|26"},
|
||||
{deps_dir, "src"},
|
||||
{deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)},
|
||||
{sub_dirs, SubDirs},
|
||||
|
||||
From 6da9405ff97acae745ae85f3f9ce92484a7722df Mon Sep 17 00:00:00 2001
|
||||
From: Nick Vatamaniuc <vatamane@gmail.com>
|
||||
Date: Fri, 17 Jun 2022 16:47:12 -0400
|
||||
Subject: [PATCH] Erlang 25 compatibility - http_uri:parse -> uri_string:parse
|
||||
|
||||
This fixes the replicator eunit failure:
|
||||
https://github.com/apache/couchdb/pull/4060#issuecomment-1154391783
|
||||
---
|
||||
.../test/eunit/couch_replicator_error_reporting_tests.erl | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
|
||||
index 7778bd77de..b0863614c3 100644
|
||||
--- a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
|
||||
+++ b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
|
||||
@@ -165,7 +165,7 @@ mock_fail_req(Path, Return) ->
|
||||
send_req_direct,
|
||||
fun(W, Url, Headers, Meth, Body, Opts, TOut) ->
|
||||
Args = [W, Url, Headers, Meth, Body, Opts, TOut],
|
||||
- {ok, {_, _, _, _, UPath, _}} = http_uri:parse(Url),
|
||||
+ #{path := UPath} = uri_string:parse(Url),
|
||||
case lists:suffix(Path, UPath) of
|
||||
true -> Return;
|
||||
false -> meck:passthrough(Args)
|
||||
|
|
@ -21,11 +21,3 @@ index 31855098b3..44c4d61b1a 100644
|
|||
{deps_dir, "src"},
|
||||
{deps, lists:map(MakeDep, DepDescs ++ OptionalDeps)},
|
||||
{sub_dirs, SubDirs},
|
||||
--- apache-couchdb-3.3.2/src/snappy/rebar.config 2023-06-27 16:23:39.000000000 +0200
|
||||
+++ apache-couchdb-3.3.2/src/snappy/rebar.config.new 2023-06-27 16:35:58.371758506 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22|23|24|25"}.
|
||||
+{require_otp_vsn, "R14|R15|R16|17|18|19|20|21|22|23|24|25|26"}.
|
||||
|
||||
{erl_opts, [debug_info, warn_unused_vars, warn_shadow_vars, warn_unused_import]}.
|
||||
{port_sources, ["c_src/*.cc",
|
||||
|
|
|
|||
Loading…
Reference in a new issue