Re: [PR PATCH] [Updated] couchdb: update to 3.0.0

[pullmoll <pullmoll@users.noreply.github.com>]

[-- 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
 }