* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
@ 2020-04-09 12:58 ` pullmoll
2020-04-10 16:26 ` jnbr
` (28 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-09 12:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 3129 bytes --]
From 9eb672bd549642c58f26f9d72434e9bab8fd8cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 36 ++++++++++++++++++-------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..a930e7847fc 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,21 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+configure_args="--user couchdb --with-curl"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
hostmakedepends="erlang pkg-config"
makedepends="libressl-devel icu-devel js-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +24,23 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" js-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ echo "ERL_CFLAGS : $ERL_CFLAGS"
+ echo "ERL_LDFLAGS : $ERL_LDFLAGS"
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ vmkdir usr/lib/couchdb
+ vcopy "rel/*" usr/lib/couchdb
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/overlay/bin/remsh ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
2020-04-09 12:58 ` [PR PATCH] [Updated] [WIP] " pullmoll
@ 2020-04-10 16:26 ` jnbr
2020-04-11 1:44 ` [PR PATCH] [Updated] " pullmoll
` (27 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: jnbr @ 2020-04-10 16:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-612107597
Comment:
Building the template in the current state results in a mostly empty package.
I think I got a step further by setting `make_build_target="release"`.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
2020-04-09 12:58 ` [PR PATCH] [Updated] [WIP] " pullmoll
2020-04-10 16:26 ` jnbr
@ 2020-04-11 1:44 ` pullmoll
2020-04-11 4:51 ` pullmoll
` (26 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-11 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 3129 bytes --]
From b962f60f4a5e0ea05ff1c9c36c95a6eb1a3ff094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 36 ++++++++++++++++++-------------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..a930e7847fc 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,21 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+configure_args="--user couchdb --with-curl"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
hostmakedepends="erlang pkg-config"
makedepends="libressl-devel icu-devel js-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +24,23 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" js-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ echo "ERL_CFLAGS : $ERL_CFLAGS"
+ echo "ERL_LDFLAGS : $ERL_LDFLAGS"
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ vmkdir usr/lib/couchdb
+ vcopy "rel/*" usr/lib/couchdb
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/overlay/bin/remsh ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (2 preceding siblings ...)
2020-04-11 1:44 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-11 4:51 ` pullmoll
2020-04-11 4:52 ` [PR PATCH] [Updated] " pullmoll
` (25 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-11 4:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 271 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-612327181
Comment:
@jnbr Yeah, this at least gives me a `/usr/lib/couchdb/couchdb/bin/couchdb` which can be symlinked to `/usr/bin/couchdb`. Thanks!
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (3 preceding siblings ...)
2020-04-11 4:51 ` pullmoll
@ 2020-04-11 4:52 ` pullmoll
2020-04-12 18:09 ` pullmoll
` (24 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-11 4:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 3083 bytes --]
From 2f0e800b8d3baaed77ef6d01618725948e0d4980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 35 ++++++++++++++++++-------------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..fc373ad4792 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
hostmakedepends="erlang pkg-config"
makedepends="libressl-devel icu-devel js-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,21 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" js-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ vmkdir usr/lib/couchdb
+ vcopy "rel/*" usr/lib/couchdb
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (4 preceding siblings ...)
2020-04-11 4:52 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-12 18:09 ` pullmoll
2020-04-13 5:18 ` pullmoll
` (23 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-12 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 3248 bytes --]
From 1e0736252d586540266b98ccc833205b6ba450d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 37 ++++++++++++++++++-------------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..c769182d97c 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version=60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,21 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" js-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ vmkdir usr/lib/couchdb
+ vcopy "rel/*" usr/lib/couchdb
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (5 preceding siblings ...)
2020-04-12 18:09 ` pullmoll
@ 2020-04-13 5:18 ` pullmoll
2020-04-13 8:49 ` pullmoll
` (22 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 5:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4035 bytes --]
From e1efc25f2a76bc55200563601f687db1d477e762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..fbdb754fa56 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (6 preceding siblings ...)
2020-04-13 5:18 ` pullmoll
@ 2020-04-13 8:49 ` pullmoll
2020-04-13 13:39 ` pullmoll
` (21 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 8:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4027 bytes --]
From edfcd3c775186067c61fc42c802757c068548713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..9754364240a 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb -o /dev/null -e /dev/null
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..605c3ecd044 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (7 preceding siblings ...)
2020-04-13 8:49 ` pullmoll
@ 2020-04-13 13:39 ` pullmoll
2020-04-13 14:12 ` pullmoll
` (20 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 13:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4000 bytes --]
From a719740a3dc743e565fd82d8a53116ed24571b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 2 +-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..c1545749a16 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..605c3ecd044 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vinstall rel/overlay/etc/default.ini 644 etc/couchdb
+ vinstall rel/overlay/etc/local.ini 644 etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (8 preceding siblings ...)
2020-04-13 13:39 ` pullmoll
@ 2020-04-13 14:12 ` pullmoll
2020-04-13 18:10 ` pullmoll
` (19 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 14:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4082 bytes --]
From 605ccd7b3a5e0b0563643797445c52545e71cf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 5 ++-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..c54bbdfaec2 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vmkdir etc/couchdb
+ vcopy "rel/couchdb/etc/*" etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (9 preceding siblings ...)
2020-04-13 14:12 ` pullmoll
@ 2020-04-13 18:10 ` pullmoll
2020-04-13 18:12 ` pullmoll
` (18 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 18:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4790 bytes --]
From 605ccd7b3a5e0b0563643797445c52545e71cf93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH 1/2] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 5 ++-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..c54bbdfaec2 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vmkdir etc/couchdb
+ vcopy "rel/couchdb/etc/*" etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
From b1f5ed4141c2f822180b203db7f66b56508ff4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Mon, 13 Apr 2020 20:10:52 +0200
Subject: [PATCH 2/2] kicad-i18n: needs gettext in hostmakedepends
---
srcpkgs/kicad-i18n/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/kicad-i18n/template b/srcpkgs/kicad-i18n/template
index c6931c83b40..408469c6c23 100644
--- a/srcpkgs/kicad-i18n/template
+++ b/srcpkgs/kicad-i18n/template
@@ -4,6 +4,7 @@ version=5.1.5
revision=1
archs=noarch
build_style=cmake
+hostmakedepends="gettext"
depends="kicad"
short_desc="KiCAD localization files"
maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (10 preceding siblings ...)
2020-04-13 18:10 ` pullmoll
@ 2020-04-13 18:12 ` pullmoll
2020-04-16 8:03 ` pullmoll
` (17 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-13 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 4082 bytes --]
From 1ce412a4fce11b856f885837f33036f7119fdf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 5 ++-
srcpkgs/couchdb/template | 62 ++++++++++++++++++++++---------
2 files changed, 48 insertions(+), 19 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..c54bbdfaec2 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,20 +1,22 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
@@ -23,18 +25,44 @@ make_dirs="
/var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
-
-post_install() {
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+ vmkdir etc/couchdb
+ vcopy "rel/couchdb/etc/*" etc/couchdb
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (11 preceding siblings ...)
2020-04-13 18:12 ` pullmoll
@ 2020-04-16 8:03 ` pullmoll
2020-04-16 8:12 ` pullmoll
` (16 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-16 8:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 5085 bytes --]
From 0d112823cd1965820c4bbe17fb9fdc5858d599b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/files/couchdb/run | 5 +-
srcpkgs/couchdb/template | 91 +++++++++++++++++++++++++------
2 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..5a864aba871 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,95 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ # Append a log-to-file configuration to local.ini
+ cat >> rel/couchdb/etc/local.ini <<- EOF
+
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ EOF
+
+ # Default to single node mode
+ vsed -i rel/couchdb/etc/local.ini \
+ -e "/;os_process_timeout/a single_node = true"
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy "rel/couchdb" usr/lib
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
-post_install() {
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (12 preceding siblings ...)
2020-04-16 8:03 ` pullmoll
@ 2020-04-16 8:12 ` pullmoll
2020-04-16 8:12 ` pullmoll
` (15 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-16 8:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4879 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-614488251
Comment:
I cannot get it to start up right. After installing I edited `/etc/couchdb/local.ini` to set an adimistrator account, i.e. `admin = password`, and log level to debug `[log] level = debuug`. Then I ran `sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb` and this is the output:
```ini
Configuration Settings:
[admins] admin="**********"
[attachments] compressible_types="text/*, application/javascript, application/json, application/xml"
[attachments] compression_level="8"
[chttpd] backlog="512"
[chttpd] bind_address="127.0.0.1"
[chttpd] max_db_number_for_dbs_info_req="100"
[chttpd] port="5984"
[chttpd] prefer_minimal="Cache-Control, Content-Length, Content-Range, Content-Type, ETag, Server, Transfer-Encoding, Vary"
[chttpd] require_valid_user="false"
[chttpd] server_options="[{recbuf, undefined}]"
[chttpd] socket_options="[{sndbuf, 262144}, {nodelay, true}]"
[cluster] n="3"
[cluster] q="2"
[cors] credentials="false"
[couch_httpd_auth] allow_persistent_cookies="true"
[couch_httpd_auth] auth_cache_size="50"
[couch_httpd_auth] authentication_db="_users"
[couch_httpd_auth] authentication_redirect="/_utils/session.html"
[couch_httpd_auth] iterations="10"
[couch_httpd_auth] require_valid_user="false"
[couch_httpd_auth] timeout="600"
[couch_peruser] database_prefix="userdb-"
[couch_peruser] delete_dbs="false"
[couch_peruser] enable="false"
[couchdb] attachment_stream_buffer_size="4096"
[couchdb] changes_doc_ids_optimization_threshold="100"
[couchdb] database_dir="./data"
[couchdb] default_engine="couch"
[couchdb] default_security="admin_only"
[couchdb] file_compression="snappy"
[couchdb] max_dbs_open="500"
[couchdb] max_document_size="8000000"
[couchdb] os_process_timeout="5000"
[couchdb] single_node="true"
[couchdb] view_index_dir="./data"
[couchdb_engines] couch="couch_bt_engine"
[csp] enable="true"
[feature_flags] partitioned||*="true"
[httpd] allow_jsonp="false"
[httpd] authentication_handlers="{couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}"
[httpd] bind_address="127.0.0.1"
[httpd] enable_cors="false"
[httpd] enable_xframe_options="false"
[httpd] max_http_request_size="4294967296"
[httpd] port="5986"
[httpd] secure_rewrites="true"
[httpd] socket_options="[{sndbuf, 262144}]"
[indexers] couch_mrview="true"
[ioq] concurrency="10"
[ioq] ratio="0.01"
[ioq.bypass] compaction="false"
[ioq.bypass] os_process="true"
[ioq.bypass] read="true"
[ioq.bypass] shard_sync="false"
[ioq.bypass] view_update="true"
[ioq.bypass] write="true"
[log] file="/var/log/couchdb/couch.log"
[log] level="debug"
[log] writer="file"
[purge] users_db_security_editable="false"
[query_server_config] os_process_limit="100"
[query_server_config] reduce_limit="true"
[replicator] connection_timeout="30000"
[replicator] http_connections="20"
[replicator] interval="60000"
[replicator] max_churn="20"
[replicator] max_jobs="500"
[replicator] retries_per_request="5"
[replicator] socket_options="[{keepalive, true}, {nodelay, false}]"
[replicator] ssl_certificate_max_depth="3"
[replicator] startup_jitter="5000"
[replicator] verify_ssl_certificates="false"
[replicator] worker_batch_size="500"
[replicator] worker_processes="4"
[smoosh.ratio_dbs] min_priority="2.0"
[smoosh.ratio_views] min_priority="2.0"
[ssl] port="6984"
[uuids] algorithm="sequential"
[uuids] max_count="1000"
[vendor] name="The Apache Software Foundation"
[os_mon] memory supervisor port (memsup): Erlang has closed
[os_mon] cpu supervisor port (cpu_sup): Erlang has closed
{"Kernel pid terminated",application_controller,"{application_start_failure,mem3,{{shutdown,{failed_to_start_child,mem3_nodes,{{case_clause,{not_found,no_db_file}},[{mem3_util,ensure_exists,1,[{file,\"src/mem3_util.erl\"},{line,270}]},{mem3_nodes,initialize_nodelist,0,[{file,\"src/mem3_nodes.erl\"},{line,94}]},{mem3_nodes,init,1,[{file,\"src/mem3_nodes.erl\"},{line,45}]},{gen_server,init_it,2,[{file,\"gen_server.erl\"},{line,374}]},{gen_server,init_it,6,[{file,\"gen_server.erl\"},{line,342}]},{proc_lib,init_p_do_apply,3,[{file,\"proc_lib.erl\"},{line,249}]}]}}},{mem3_app,start,[normal,[]]}}}"}
Kernel pid terminated (application_controller) ({application_start_failure,mem3,{{shutdown,{failed_to_start_child,mem3_nodes,{{case_clause,{not_found,no_db_file}},[{mem3_util,ensure_exists,1,[{file,"s
Crash dump is being written to: erl_crash.dump...
```
Perhaps someone can tell what I'm doing wrong or whether there may be a problem with `erlang`? I'm stuck here and ran out of ideas.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (13 preceding siblings ...)
2020-04-16 8:12 ` pullmoll
@ 2020-04-16 8:12 ` pullmoll
2020-04-17 5:53 ` [PR PATCH] [Updated] " pullmoll
` (14 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-16 8:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 4878 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-614488251
Comment:
I cannot get it to start up right. After installing I edited `/etc/couchdb/local.ini` to set an adimistrator account, i.e. `admin = password`, and log level to debug `[log] level = debug`. Then I ran `sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb` and this is the output:
```ini
Configuration Settings:
[admins] admin="**********"
[attachments] compressible_types="text/*, application/javascript, application/json, application/xml"
[attachments] compression_level="8"
[chttpd] backlog="512"
[chttpd] bind_address="127.0.0.1"
[chttpd] max_db_number_for_dbs_info_req="100"
[chttpd] port="5984"
[chttpd] prefer_minimal="Cache-Control, Content-Length, Content-Range, Content-Type, ETag, Server, Transfer-Encoding, Vary"
[chttpd] require_valid_user="false"
[chttpd] server_options="[{recbuf, undefined}]"
[chttpd] socket_options="[{sndbuf, 262144}, {nodelay, true}]"
[cluster] n="3"
[cluster] q="2"
[cors] credentials="false"
[couch_httpd_auth] allow_persistent_cookies="true"
[couch_httpd_auth] auth_cache_size="50"
[couch_httpd_auth] authentication_db="_users"
[couch_httpd_auth] authentication_redirect="/_utils/session.html"
[couch_httpd_auth] iterations="10"
[couch_httpd_auth] require_valid_user="false"
[couch_httpd_auth] timeout="600"
[couch_peruser] database_prefix="userdb-"
[couch_peruser] delete_dbs="false"
[couch_peruser] enable="false"
[couchdb] attachment_stream_buffer_size="4096"
[couchdb] changes_doc_ids_optimization_threshold="100"
[couchdb] database_dir="./data"
[couchdb] default_engine="couch"
[couchdb] default_security="admin_only"
[couchdb] file_compression="snappy"
[couchdb] max_dbs_open="500"
[couchdb] max_document_size="8000000"
[couchdb] os_process_timeout="5000"
[couchdb] single_node="true"
[couchdb] view_index_dir="./data"
[couchdb_engines] couch="couch_bt_engine"
[csp] enable="true"
[feature_flags] partitioned||*="true"
[httpd] allow_jsonp="false"
[httpd] authentication_handlers="{couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}"
[httpd] bind_address="127.0.0.1"
[httpd] enable_cors="false"
[httpd] enable_xframe_options="false"
[httpd] max_http_request_size="4294967296"
[httpd] port="5986"
[httpd] secure_rewrites="true"
[httpd] socket_options="[{sndbuf, 262144}]"
[indexers] couch_mrview="true"
[ioq] concurrency="10"
[ioq] ratio="0.01"
[ioq.bypass] compaction="false"
[ioq.bypass] os_process="true"
[ioq.bypass] read="true"
[ioq.bypass] shard_sync="false"
[ioq.bypass] view_update="true"
[ioq.bypass] write="true"
[log] file="/var/log/couchdb/couch.log"
[log] level="debug"
[log] writer="file"
[purge] users_db_security_editable="false"
[query_server_config] os_process_limit="100"
[query_server_config] reduce_limit="true"
[replicator] connection_timeout="30000"
[replicator] http_connections="20"
[replicator] interval="60000"
[replicator] max_churn="20"
[replicator] max_jobs="500"
[replicator] retries_per_request="5"
[replicator] socket_options="[{keepalive, true}, {nodelay, false}]"
[replicator] ssl_certificate_max_depth="3"
[replicator] startup_jitter="5000"
[replicator] verify_ssl_certificates="false"
[replicator] worker_batch_size="500"
[replicator] worker_processes="4"
[smoosh.ratio_dbs] min_priority="2.0"
[smoosh.ratio_views] min_priority="2.0"
[ssl] port="6984"
[uuids] algorithm="sequential"
[uuids] max_count="1000"
[vendor] name="The Apache Software Foundation"
[os_mon] memory supervisor port (memsup): Erlang has closed
[os_mon] cpu supervisor port (cpu_sup): Erlang has closed
{"Kernel pid terminated",application_controller,"{application_start_failure,mem3,{{shutdown,{failed_to_start_child,mem3_nodes,{{case_clause,{not_found,no_db_file}},[{mem3_util,ensure_exists,1,[{file,\"src/mem3_util.erl\"},{line,270}]},{mem3_nodes,initialize_nodelist,0,[{file,\"src/mem3_nodes.erl\"},{line,94}]},{mem3_nodes,init,1,[{file,\"src/mem3_nodes.erl\"},{line,45}]},{gen_server,init_it,2,[{file,\"gen_server.erl\"},{line,374}]},{gen_server,init_it,6,[{file,\"gen_server.erl\"},{line,342}]},{proc_lib,init_p_do_apply,3,[{file,\"proc_lib.erl\"},{line,249}]}]}}},{mem3_app,start,[normal,[]]}}}"}
Kernel pid terminated (application_controller) ({application_start_failure,mem3,{{shutdown,{failed_to_start_child,mem3_nodes,{{case_clause,{not_found,no_db_file}},[{mem3_util,ensure_exists,1,[{file,"s
Crash dump is being written to: erl_crash.dump...
```
Perhaps someone can tell what I'm doing wrong or whether there may be a problem with `erlang`? I'm stuck here and ran out of ideas.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (14 preceding siblings ...)
2020-04-16 8:12 ` pullmoll
@ 2020-04-17 5:53 ` pullmoll
2020-04-17 7:07 ` pullmoll
` (13 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 5:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 5542 bytes --]
From 76501ac8928119cb1e6e7bb12b9f418f85f0b880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
---
srcpkgs/couchdb/INSTALL | 2 +-
srcpkgs/couchdb/files/couchdb/run | 5 +-
srcpkgs/couchdb/template | 92 +++++++++++++++++++++++++------
3 files changed, 78 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68334184dfc 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,6 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/ /usr/lib/couchdb/
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..a7c57ee27fe 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,96 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ # Append a log-to-file configuration to local.ini
+ cat >> rel/couchdb/etc/local.ini <<- EOF
+
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ EOF
+
+ # Default to single node mode
+ vsed -i rel/couchdb/etc/local.ini \
+ -e "/;os_process_timeout/a single_node = true"
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ vcopy src usr/lib/erlang
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
-post_install() {
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] [WIP] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (15 preceding siblings ...)
2020-04-17 5:53 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-17 7:07 ` pullmoll
2020-04-17 7:31 ` [PR PATCH] [Updated] " pullmoll
` (12 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 446 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
[WIP] couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6076 bytes --]
From c5b942f23d93efead4ea9b9da7639064218919d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Not sure whether / where to put installation instructions.
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 5 +-
srcpkgs/couchdb/template | 94 +++++++++++++++++++++++++------
3 files changed, 82 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..1308a9ad745 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,6 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export COUCHDB_ARGS_FILE="/etc/couchdb/vm.args"
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..9910c84bca0 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,98 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ # Append a log-to-file configuration to local.ini
+ cat >> rel/couchdb/etc/local.ini <<- EOF
+
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ EOF
+
+ # Default to single node mode
+ vsed -i rel/couchdb/etc/local.ini \
+ -e "/;os_process_timeout/a single_node = true"
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ vcopy src usr/lib/erlang
+
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
-post_install() {
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (16 preceding siblings ...)
2020-04-17 7:07 ` pullmoll
@ 2020-04-17 7:31 ` pullmoll
2020-04-17 7:32 ` pullmoll
` (11 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 7:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6044 bytes --]
From eb046c3f8120717267a7f167b2765badc39ec482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 94 +++++++++++++++++++++++++------
3 files changed, 81 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..ccfa47b611b 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb /usr/bin/couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..9910c84bca0 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,98 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ # Append a log-to-file configuration to local.ini
+ cat >> rel/couchdb/etc/local.ini <<- EOF
+
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ EOF
+
+ # Default to single node mode
+ vsed -i rel/couchdb/etc/local.ini \
+ -e "/;os_process_timeout/a single_node = true"
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ vcopy src usr/lib/erlang
+
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
-post_install() {
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (17 preceding siblings ...)
2020-04-17 7:31 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-17 7:32 ` pullmoll
2020-04-17 8:35 ` [PR PATCH] [Updated] " pullmoll
` (10 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 7:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-615091613
Comment:
Finally I got it up and running.
Please review and, if you think it's okay, also merge.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (18 preceding siblings ...)
2020-04-17 7:32 ` pullmoll
@ 2020-04-17 8:35 ` pullmoll
2020-04-17 8:39 ` pullmoll
` (9 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 8:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6219 bytes --]
From d09f831d8946039f4ca08a6b0094e5645373b66b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 99 +++++++++++++++++++++++++------
3 files changed, 86 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..ccfa47b611b 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb /usr/bin/couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..717ac165706 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,103 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ vsed -i rel/couchdb/etc/default.ini \
+ -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+ -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Append a log-to-file configuration to local.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Default to single node mode
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
-post_install() {
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (19 preceding siblings ...)
2020-04-17 8:35 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-17 8:39 ` pullmoll
2020-04-17 10:40 ` pullmoll
` (8 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 8:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6296 bytes --]
From 93ad365886f466942e04c239b9e4f0247362c3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 101 ++++++++++++++++++++++++------
3 files changed, 88 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..ccfa47b611b 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb /usr/bin/couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..ed35d9a53de 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,105 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0700 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ vsed -i rel/couchdb/etc/default.ini \
+ -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+ -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (20 preceding siblings ...)
2020-04-17 8:39 ` pullmoll
@ 2020-04-17 10:40 ` pullmoll
2020-04-17 11:08 ` pullmoll
` (7 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 10:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6308 bytes --]
From 57e517e732a2dec307c127a5a34857f32e9bdd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 101 ++++++++++++++++++++++++------
3 files changed, 88 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..ccfa47b611b 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb /usr/bin/couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..4aa3ce291ce 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,105 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb/data/shards 0770 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ vsed -i rel/couchdb/etc/default.ini \
+ -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+ -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (21 preceding siblings ...)
2020-04-17 10:40 ` pullmoll
@ 2020-04-17 11:08 ` pullmoll
2020-04-17 16:59 ` pullmoll
` (6 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6366 bytes --]
From 25930716c2e1bed9bdee75a4d76c1a0cc425e7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 103 ++++++++++++++++++++++++------
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..99d6b788bc1 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..a39aec3ea23 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,107 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb/data/shards 0770 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ vsed -i rel/couchdb/etc/default.ini \
+ -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+ -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ # Copy the source to usr/lib/couchdb/src (?)
+ vcopy src usr/lib/couchdb
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (22 preceding siblings ...)
2020-04-17 11:08 ` pullmoll
@ 2020-04-17 16:59 ` pullmoll
2020-04-20 7:11 ` pullmoll
` (5 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-17 16:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 590 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-615357147
Comment:
I broke it again. It seems couchdb is very flimsy about access rights to directories it wants to access. Also reading and interpreting `erl_crash.dump` files is an entirely new experience - in case you want to see something new :-)
Now I'm trying to find out which of the recent changes broke it again. It certainly has to do with me trying to make the actual databases be stored below `/var/lib/couchdb/data` instead of `/usr/lib/couchdb/data`.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (23 preceding siblings ...)
2020-04-17 16:59 ` pullmoll
@ 2020-04-20 7:11 ` pullmoll
2020-04-20 9:04 ` [PR PATCH] [Updated] " pullmoll
` (4 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 7:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-616355968
Comment:
:sos: :axe: :bomb: :brain: :building_construction: :exploding_head: ... anyone willing to help? @arete?
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (24 preceding siblings ...)
2020-04-20 7:11 ` pullmoll
@ 2020-04-20 9:04 ` pullmoll
2020-04-20 9:11 ` pullmoll
` (3 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6366 bytes --]
From c3202831282f1b1df6bbbc110b8089a141856be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 4 +-
srcpkgs/couchdb/template | 103 ++++++++++++++++++++++++------
3 files changed, 90 insertions(+), 21 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..68f310e4603 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..99d6b788bc1 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -2,5 +2,5 @@
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..a39aec3ea23 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,107 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb/data/shards 0770 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+ vsed -i rel/couchdb/etc/default.ini \
+ -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+ -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ # Copy the source to usr/lib/couchdb/src (?)
+ vcopy src usr/lib/couchdb
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (25 preceding siblings ...)
2020-04-20 9:04 ` [PR PATCH] [Updated] " pullmoll
@ 2020-04-20 9:11 ` pullmoll
2020-04-20 9:23 ` pullmoll
` (2 subsequent siblings)
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 9:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6475 bytes --]
From 0b540d5c5ab2603681e0cd3b2db1aa08ca37fd42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 6 +-
srcpkgs/couchdb/template | 104 ++++++++++++++++++++++++------
3 files changed, 92 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..9033765d8ef 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..075211cf532 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -1,6 +1,6 @@
#!/bin/sh
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
-chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+chown couchdb:couchdb /var/run/couchdb
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..df983540534 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,108 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0770 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+# vsed -i rel/couchdb/etc/default.ini \
+# -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+# -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ # Copy the source to usr/lib/couchdb/src (?)
+# vcopy src usr/lib/couchdb
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/vm.conf ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Updated] couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (26 preceding siblings ...)
2020-04-20 9:11 ` pullmoll
@ 2020-04-20 9:23 ` pullmoll
2020-04-20 21:18 ` [PR PATCH] [Closed]: " pullmoll
2020-04-20 21:18 ` pullmoll
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 9:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
There is an updated pull request by pullmoll against master on the void-packages repository
https://github.com/pullmoll/void-packages couchdb
https://github.com/void-linux/void-packages/pull/20792
couchdb: update to 3.0.0
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
A patch file from https://github.com/void-linux/void-packages/pull/20792.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-couchdb-20792.patch --]
[-- Type: text/x-diff, Size: 6475 bytes --]
From dee214f3ce1a43f06cf2b3435b25ba3f4bf2e3e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 9 Apr 2020 14:30:24 +0200
Subject: [PATCH] couchdb: update to 3.0.0
Switch to use mozjs60-devel instead of js-devel. We can remove js now.
Installation instructions are in couchdb(1). In short for testing:
1) Install package
2) Edit /etc/couchdb/local.ini and set admin password
3) Run 'sudo -i -u couchdb /usr/lib/couchdb/bin/couchdb'
4) Open http://localhost:5984/_utils/index.html
5) Verify installation http://localhost:5984/_utils/index.html#verifyinstall
6) Start service by symlinking /etc/sv/couchdb to /var/service
7) Relax.
---
srcpkgs/couchdb/INSTALL | 4 +-
srcpkgs/couchdb/files/couchdb/run | 6 +-
srcpkgs/couchdb/template | 104 ++++++++++++++++++++++++------
3 files changed, 92 insertions(+), 22 deletions(-)
diff --git a/srcpkgs/couchdb/INSTALL b/srcpkgs/couchdb/INSTALL
index 753e71b95d6..9033765d8ef 100644
--- a/srcpkgs/couchdb/INSTALL
+++ b/srcpkgs/couchdb/INSTALL
@@ -1,6 +1,8 @@
case "$ACTION" in
post)
- chown -R couchdb /var/lib/couchdb/ /var/log/couchdb/
+ chown -R couchdb:couchdb var/lib/couchdb/ var/log/couchdb/ usr/lib/couchdb/
+ find usr/lib/couchdb -type d -exec chmod 0770 {} \;
+ chmod 0644 usr/lib/couchdb/etc/*
;;
esac
diff --git a/srcpkgs/couchdb/files/couchdb/run b/srcpkgs/couchdb/files/couchdb/run
index 25d1abb8272..075211cf532 100755
--- a/srcpkgs/couchdb/files/couchdb/run
+++ b/srcpkgs/couchdb/files/couchdb/run
@@ -1,6 +1,6 @@
#!/bin/sh
export HOME=/var/lib/couchdb
mkdir -p /var/run/couchdb
-chown couchdb /var/run/couchdb
-exec chpst -u couchdb:couchdb couchdb -r 5 -o /dev/null -e /dev/null
-
+chown couchdb:couchdb /var/run/couchdb
+export ERL_FLAGS="-couch_ini /etc/couchdb/default.ini /etc/couchdb/local.ini"
+exec chpst -u couchdb:couchdb couchdb
diff --git a/srcpkgs/couchdb/template b/srcpkgs/couchdb/template
index 5ca5eacbaab..d1d1b942a4f 100644
--- a/srcpkgs/couchdb/template
+++ b/srcpkgs/couchdb/template
@@ -1,40 +1,108 @@
# Template file for 'couchdb'
pkgname=couchdb
-version=1.7.1
-revision=2
+version=3.0.0
+revision=1
wrksrc="apache-couchdb-${version}"
-build_style=gnu-configure
+build_style=gnu-makefile
+make_build_args="V=1"
+make_build_target="release"
+configure_args="--user couchdb --with-curl --spidermonkey-version 60"
conf_files="/etc/couchdb/default.ini /etc/couchdb/local.ini"
-hostmakedepends="erlang pkg-config"
-makedepends="libressl-devel icu-devel js-devel libcurl-devel"
+hostmakedepends="erlang help2man"
+makedepends="libressl-devel icu-devel mozjs60-devel libcurl-devel"
depends="erlang"
-short_desc="A document-oriented database"
+short_desc="Document-oriented database"
maintainer="Gerardo Di Iorio <arete74@gmail.com>"
license="Apache-2.0"
homepage="http://couchdb.apache.org/"
-distfiles="https://dist.apache.org/repos/dist/release/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
-checksum=91200aa6fbc6fa5e2f3d78ef40e39d8c1ec7c83ea1c2cd730d270658735b2cad
-broken="unsupported version upstream, broken distfiles"
+distfiles="https://downloads.apache.org/couchdb/source/${version}/apache-couchdb-${version}.tar.gz"
+checksum=d109bb1a70fe746c04a9bf79a2bb1096cb949c750c29dbd196e9c2efd4167fd9
system_accounts="couchdb"
couchdb_homedir="/var/lib/couchdb"
+couchdb_shell="/bin/bash"
+couchdb_descr="CouchDB Administrator"
make_dirs="
- /var/lib/couchdb 0700 couchdb couchdb
- /var/log/couchdb 0750 couchdb couchdb"
+ /var/lib/couchdb 0770 couchdb couchdb
+ /var/log/couchdb 0750 couchdb couchdb"
if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" mozjs60-devel"
makedepends+=" erlang"
- configure_args="--with-erlang=${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
+ ERL_CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/js -I${XBPS_CROSS_BASE}/usr/lib/erlang/usr/include"
fi
-pre_configure() {
- sed -i 's|-Werror|-pie -fPIE|g' src/couchdb/priv/Makefile.*
-if [ "$CROSS_BUILD" ]; then
- sed -i '/FLAGS.*\(usr\|opt\)/s/.*/:/' configure
-fi
+do_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i src/rebar/src/rebar_port_compiler.erl \
+ -e "s;, erl_interface_dir(lib);, \"${XBPS_CROSS_BASE}/\"&;"
+ make -C src/rebar
+ fi
+ ./configure ${configure_args} ERL_CFLAGS="${ERL_CFLAGS}"
}
+do_install() {
+ local dir
+ if [ "$CROSS_BUILD" ]; then
+ # Copy target erlang libraries into release
+ for dir in $(ls rel/couchdb); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pRv ${XBPS_CROSS_BASE}/usr/lib/erlang/${dir}/* \
+ rel/couchdb/${dir}/
+ fi
+ done
+ for dir in $(ls rel/couchdb/lib); do
+ if [ -d "${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}" ]; then
+ echo "Copying target erlang ${dir} ..."
+ cp -pR ${XBPS_CROSS_BASE}/usr/lib/erlang/lib/${dir}/* \
+ rel/couchdb/lib/${dir}/
+ fi
+ done
+ fi
+
+ # Change permissions according to the installation guide at
+ # https://docs.couchdb.org/en/stable/install/unix.html
+ find rel -type d -exec chmod 0770 "{}" \;
+
+# vsed -i rel/couchdb/etc/default.ini \
+# -e "s;\(database_dir =\).*;\1 /var/lib/couchdb/data;" \
+# -e "s;\(view_index_dir =\).*;\1 /var/lib/couchdb/data;" \
+
+ # Write a log-to-file configuration to default.d/10-logfile.ini
+ cat >> rel/couchdb/etc/default.d/10-logfile.ini <<- EOF
+ [log]
+ writer = file
+ file = /var/log/couchdb/couch.log
+ level = info
+ EOF
+
+ # Write a single_node = true configuration to local.d/10-single_node.ini
+ cat >> rel/couchdb/etc/local.d/10-single_node.ini <<- EOF
+ [couchdb]
+ single_node = true
+ EOF
+
+ # Copy the release to usr/lib/couchdb
+ vmkdir usr/lib
+ vcopy rel/couchdb usr/lib
+ # Copy the source to usr/lib/couchdb/src (?)
+# vcopy src usr/lib/couchdb
+
+ # Manual page
+ vman rel/couchdb/share/docs/couchdb.1
+
+ # Symbolic links for the configation (ini) files
+ vmkdir etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/default.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.ini ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/local.d ${DESTDIR}/etc/couchdb
+ ln -srv ${DESTDIR}/usr/lib/couchdb/etc/vm.args ${DESTDIR}/etc/couchdb
+
+ # Symbolic link for the binary
+ vmkdir usr/bin
+ ln -srv ${DESTDIR}/usr/lib/couchdb/bin/couchdb ${DESTDIR}/usr/bin/couchdb
-post_install() {
vsv couchdb
}
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: [PR PATCH] [Closed]: couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (27 preceding siblings ...)
2020-04-20 9:23 ` pullmoll
@ 2020-04-20 21:18 ` pullmoll
2020-04-20 21:18 ` pullmoll
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
There's a closed pull request on the void-packages repository
couchdb: update to 3.0.0
https://github.com/void-linux/void-packages/pull/20792
Description:
This does not yet seem to run so I need help.
I need this to review couchdb for taking part in a paid work environment.
^ permalink raw reply [flat|nested] 31+ messages in thread* Re: couchdb: update to 3.0.0
2020-04-09 12:30 [PR PATCH] couchdb: update to 3.0.0 pullmoll
` (28 preceding siblings ...)
2020-04-20 21:18 ` [PR PATCH] [Closed]: " pullmoll
@ 2020-04-20 21:18 ` pullmoll
29 siblings, 0 replies; 31+ messages in thread
From: pullmoll @ 2020-04-20 21:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by pullmoll on void-packages repository
https://github.com/void-linux/void-packages/pull/20792#issuecomment-616815118
Comment:
Noone's interested thus closing.
^ permalink raw reply [flat|nested] 31+ messages in thread