From nobody Mon May 22 14:13:31 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QPzvJ14j3z4BVX2; Mon, 22 May 2023 14:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QPzvJ0NVJz3Cwp; Mon, 22 May 2023 14:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684764812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+veQEutCFPLSbYq/EKHpP3xVfWxBQfAnytExPmAWOz8=; b=GXLasoSYZfz05ZEllBRzn4NYCeHSpnhlIJfLWrHng/iwLZOJwCS5ijCxvJ5jnxDXlkfY7q fl1Fc5g8XkIL0Rd0aQ6C5Tm7MmLUid853DpQ7BSTVnTMkSQrzKQlbHN64zw2B8LqFYpKU/ YAAIDZQlUCdCDRnvWw5ZAOwZ5QLVoMbEHnbVPUWBSCHWlZv5X5OVpsfdDtPAgGtoNpBqAS JWJMFB1vt4w9fWbVkhPNU/pBcBEqFeJR3MDU3Rk1YpXRU8eOwOo7W7ASkLNji4MtlHZAUh MDKgXzP4/F01dMM5K7HD/FCWYs2Sw6miKhXyVFsDUIKObMf0A4iYBJjMzFZXsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684764812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+veQEutCFPLSbYq/EKHpP3xVfWxBQfAnytExPmAWOz8=; b=MmWSbrz40r1SVYy3drj5olKv2lgriac2sUtHoYDY7PIQxgQkc8RiKyxmbB0kqrtzU2ozY0 uJbho0OxoAtoRMtLEll1sTIOWruhJeeyeQn1RHPwEJLJ0nydGvpYJZvRqkIE604a6Zmjqt JKuOM/vC9J8o4SkMg88L83/x02uouxLZn21jiR0k0/38fTky17cl82NAgT+RQKCw87Td7J Z8qrXT99QyXQ7wO8RysCysMG6LUjr92txUEOkRH0I9oBB6KAe2lDgEt9+CrIBcc7Rz9vhi JqYxIkM5msJN0ljSdzFN4AZuLrUHNl9DBS9FdWWntQjwPEkcNXzqYPCuA+xR5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684764812; a=rsa-sha256; cv=none; b=AJeMH+2Nhjj8BJmgJGUQ3vi7aF295KkwwfIwUerqRwe2EGoAYVv95B4//gFjupK5Xnozns yMaSQ29/b8gehCimQB79Z4wfKeQeSZwRYMCyG1HIT18uFCS3YT/5qNeRG9TSgw30xXem5A TvVEdn1aMtMuBWhozCs7IDJGU5Z3s4JABSl7OSTX8zqlIKFAdZsVeBtfuil+j9yYx3Sis/ wAsnvBZK8a+Ijh5BFzos7NRMN2xpmktFdndGKUuQ+EGMctc10GPqYWDRYVOqmgjB1s3B0i mFzplwS6bItAfDpjAKGXyYZmJil160R9EC19a0i2U4BAFudslw3YhHcsSEgxwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QPzvH6ZkQzLMQ; Mon, 22 May 2023 14:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34MEDVhX026526; Mon, 22 May 2023 14:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34MEDVfF026525; Mon, 22 May 2023 14:13:31 GMT (envelope-from git) Date: Mon, 22 May 2023 14:13:31 GMT Message-Id: <202305221413.34MEDVfF026525@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dave Cottlehuber Subject: git: b70939ee08bd - main - databases/couchdb3: update to 3.3.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dch X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b70939ee08bde39f31b5dc578a515cef5472fc0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dch: URL: https://cgit.FreeBSD.org/ports/commit/?id=b70939ee08bde39f31b5dc578a515cef5472fc0f commit b70939ee08bde39f31b5dc578a515cef5472fc0f Author: Dave Cottlehuber AuthorDate: 2023-05-22 14:12:56 +0000 Commit: Dave Cottlehuber CommitDate: 2023-05-22 14:12:56 +0000 databases/couchdb3: update to 3.3.2 And fix a long-standing error in rc.d script that affects new installs. PR: 271177 Reported by: Jose Jachuf Sponsored by: SkunkWerks, GmbH --- databases/couchdb3/Makefile | 3 +-- databases/couchdb3/distinfo | 6 +++--- databases/couchdb3/files/couchdb3.in | 4 ++-- databases/couchdb3/files/patch-rel_reltool.config | 2 +- databases/couchdb3/pkg-plist | 14 +++++++------- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/databases/couchdb3/Makefile b/databases/couchdb3/Makefile index 53437ad22e5f..25779f08a62d 100644 --- a/databases/couchdb3/Makefile +++ b/databases/couchdb3/Makefile @@ -1,6 +1,5 @@ PORTNAME= couchdb3 -DISTVERSION= 3.3.1 -PORTREVISION= 2 +DISTVERSION= 3.3.2 CATEGORIES= databases MASTER_SITES= APACHE/couchdb/source/${DISTVERSION} DISTNAME= apache-couchdb-${DISTVERSION} diff --git a/databases/couchdb3/distinfo b/databases/couchdb3/distinfo index e6e677160303..b049c06c68a9 100644 --- a/databases/couchdb3/distinfo +++ b/databases/couchdb3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673469227 -SHA256 (apache-couchdb-3.3.1.tar.gz) = 9b89d7b54f7ef52b42bd51a6a0a2d3b1b06cce395df2c99d8f1f47f9355e2bee -SIZE (apache-couchdb-3.3.1.tar.gz) = 19077002 +TIMESTAMP = 1684750988 +SHA256 (apache-couchdb-3.3.2.tar.gz) = 3d6823d42d10cf0d4f86c9c4fe59c9932c89d68578fcb6c4b4278dc769308daa +SIZE (apache-couchdb-3.3.2.tar.gz) = 19083558 diff --git a/databases/couchdb3/files/couchdb3.in b/databases/couchdb3/files/couchdb3.in index 5d59c21f7f87..af3f2e27bea2 100644 --- a/databases/couchdb3/files/couchdb3.in +++ b/databases/couchdb3/files/couchdb3.in @@ -44,8 +44,8 @@ erl_flags="${erl_sasl} ${erl_boot} ${erl_args} ${%%PORTNAME%%_erl_flags}" -t ${name} \ -u ${%%PORTNAME%%_user} \ env ERL_FLAGS="${erl_flags}" \ - HOME=/var/run/couchdb \ - ERL_CRASH_DUMP=/var/run/couchdb/erl_crash.dump \ + HOME=/var/run/%%PORTNAME%% \ + ERL_CRASH_DUMP=/var/run/%%PORTNAME%%/erl_crash.dump \ COUCHDB_FAUXTON_DOCROOT=%%WWWDIR%% \ COUCHDB_QUERY_SERVER_JAVASCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main.js" \ COUCHDB_QUERY_SERVER_COFFEESCRIPT="%%APPDIR%%/bin/couchjs %%APPDIR%%/share/server/main-coffee.js" \ diff --git a/databases/couchdb3/files/patch-rel_reltool.config b/databases/couchdb3/files/patch-rel_reltool.config index 8f9402504e59..9f377c4de794 100644 --- a/databases/couchdb3/files/patch-rel_reltool.config +++ b/databases/couchdb3/files/patch-rel_reltool.config @@ -6,5 +6,5 @@ {sys, [ + {excl_lib, otp_root}, %% require erts runtime from FreeBSD ports {lib_dirs, ["../src"]}, - {rel, "couchdb", "3.2.1", [ + {rel, "couchdb", "3.3.2", [ %% stdlib diff --git a/databases/couchdb3/pkg-plist b/databases/couchdb3/pkg-plist index cd9fa9f731d2..ea187618037d 100644 --- a/databases/couchdb3/pkg-plist +++ b/databases/couchdb3/pkg-plist @@ -509,13 +509,13 @@ libexec/couchdb3/lib/mochiweb-3.1.1/ebin/mochiweb_util.beam libexec/couchdb3/lib/mochiweb-3.1.1/ebin/mochiweb_websocket.beam libexec/couchdb3/lib/mochiweb-3.1.1/ebin/reloader.beam libexec/couchdb3/lib/mochiweb-3.1.1/include/internal.hrl -libexec/couchdb3/lib/recon-2.5.2/ebin/recon.app -libexec/couchdb3/lib/recon-2.5.2/ebin/recon.beam -libexec/couchdb3/lib/recon-2.5.2/ebin/recon_alloc.beam -libexec/couchdb3/lib/recon-2.5.2/ebin/recon_lib.beam -libexec/couchdb3/lib/recon-2.5.2/ebin/recon_map.beam -libexec/couchdb3/lib/recon-2.5.2/ebin/recon_rec.beam -libexec/couchdb3/lib/recon-2.5.2/ebin/recon_trace.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon.app +libexec/couchdb3/lib/recon-2.5.3/ebin/recon.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon_alloc.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon_lib.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon_map.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon_rec.beam +libexec/couchdb3/lib/recon-2.5.3/ebin/recon_trace.beam libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.app libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi.beam libexec/couchdb3/lib/rexi-%%VERSION%%/ebin/rexi_app.beam