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

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

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