From nobody Sun Aug 18 12:56:17 2024 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 4Wmwhd507Kz5T51s; Sun, 18 Aug 2024 12:56:17 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wmwhd4SXTz4Wd6; Sun, 18 Aug 2024 12:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723985777; 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=NUtFAD9a9pkqsm/rMWl9K/csjazCRttcgQg1SDEiKQ4=; b=cGTcqA6eCgRE9FF4FQCX/ucGr7XUyLzQ4WuY+DXX4KxlV8MqgC29qxRGbShOHCGldxkpKZ UhufvdLCQ5mz6gTNSrLooNiVciXW8L485nDSSqLFuKviqtKgU8lOoP0lBTYRXmSlj+t/z6 Pm7qpmRUeCa4U1D7gR3tWcbqiTV5cl4YgOqlu0HofqB19lfrdWK3EB7IDGsnx1sGrdxsdn C8vXkILrNShAiLP0MOwxkFttJk3j9z5OSw802f/rGiqWim/Sn8dL7zc3yBOpUiveZN0Q8l qREGksSB1QHVA/C1LRhpjgOzBf0A36/QSFAJAdQSjqkfcjroQ5aEhqP5p0Y5qQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723985777; a=rsa-sha256; cv=none; b=M1FsrxxLmiNQYPFKG48VLj4oqNjAFcRu9orLB5pUySjROZ5GQPCtbq+2rNplkF9nLLVbcS bMvCwipnlFhFPHaEzvsW0/kZV0NrD204vsxkLSUex7PRcLJMw48DyWe1xCpEp8IlkhYpCD qawqManIq8Bc66imIgGOe/ZVrKBgSssmLxtu0vpw4e2NztzI48wIwKkBq93F93l4dBGPxz PZu2q1SBBloTkGzfKWZE3qVmeNvZFHpBr37hxG8YyjfXZJomQX2nUyDYmBlnh9pDErSN1a E/09rKapncMIdD9bDj3reRLeEs8BHpvkVDu0+fKUYEbXnyasKpypdzUasNNh/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723985777; 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=NUtFAD9a9pkqsm/rMWl9K/csjazCRttcgQg1SDEiKQ4=; b=BgRNWInM8UyB568Lea8tDtAd1pe9LCpghv0WyISoUOKL3nSyv0zhDFBns10q/3r3lI6zTN WBI62PIzPY86xcg7zBe1sYw+0plc1VILBAo+izdxwFlnGHuDC8i53oIoBt+fUn5K8WV8P8 QK2VE1dQvk2N+lvBjEIdNoIegCw43HiGeC4z0TI4JIZninHjhpr479cbxF9z0ZvssyExkE axizRIy4DrI+NxHK3mPjPyaRbYn70301dNx5zM/E02Ilflc+bBdMjF5BWvjia6VjqhcQuZ FX+tqyENLLQCFtuSZUkTNYHGxNQx2IsWeDXUIuF4nQZt+CDObWUejN75FuAfyw== 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 4Wmwhd3zD3zZFS; Sun, 18 Aug 2024 12:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47ICuH9Y087908; Sun, 18 Aug 2024 12:56:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47ICuHNM087905; Sun, 18 Aug 2024 12:56:17 GMT (envelope-from git) Date: Sun, 18 Aug 2024 12:56:17 GMT Message-Id: <202408181256.47ICuHNM087905@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 138d30ed37c7 - main - mail/hydroxide: Fix rc.d script 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 138d30ed37c7eee5f1f616c74eac2d646b26ce0b Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=138d30ed37c7eee5f1f616c74eac2d646b26ce0b commit 138d30ed37c7eee5f1f616c74eac2d646b26ce0b Author: Yusuf Yaman AuthorDate: 2024-08-18 12:51:41 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-18 12:53:59 +0000 mail/hydroxide: Fix rc.d script - hydroxide does want to store some files and users were running "hydroxide auth" with normal user. Now, hydroxide user has a home directory, and it does store them there now. - Change upstream. PR: 280886 --- UIDs | 2 +- mail/hydroxide/Makefile | 4 ++-- mail/hydroxide/distinfo | 6 +++--- mail/hydroxide/files/hydroxide.in | 17 +++++++++++++---- mail/hydroxide/pkg-message | 13 +++++++++++++ 5 files changed, 32 insertions(+), 10 deletions(-) diff --git a/UIDs b/UIDs index dda814603f01..6c0b1db9a828 100644 --- a/UIDs +++ b/UIDs @@ -326,7 +326,7 @@ _wsdd:*:370:370::0:0:Web Service Discovery Daemon:/nonexistent:/usr/sbin/nologin # free: 378 # free: 379 spoofdpi:*:380:380::0:0:SpoofDPI Daemon:/nonexistent:/usr/sbin/nologin -hydroxide:*:381:381::0:0:Hydroxide Daemon:/nonexistent:/usr/sbin/nologin +hydroxide:*:381:381::0:0:Hydroxide Daemon:/var/db/hydroxide:/usr/sbin/nologin # free: 382 # free: 383 # free: 384 diff --git a/mail/hydroxide/Makefile b/mail/hydroxide/Makefile index c71c5b725d6b..594006fcfe90 100644 --- a/mail/hydroxide/Makefile +++ b/mail/hydroxide/Makefile @@ -1,7 +1,7 @@ PORTNAME= hydroxide DISTVERSIONPREFIX= v DISTVERSION= 0.2.29 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MAINTAINER= nxjoseph@protonmail.com @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes -GH_ACCOUNT= emersion +GH_ACCOUNT= nxjosephofficial GH_TUPLE= ProtonMail:go-crypto:v1.0.0:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \ boltdb:bolt:v1.3.1:boltdb_bolt/vendor/github.com/boltdb/bolt \ cloudflare:circl:v1.3.7:cloudflare_circl/vendor/github.com/cloudflare/circl \ diff --git a/mail/hydroxide/distinfo b/mail/hydroxide/distinfo index c38b89cfd806..6f93acce324c 100644 --- a/mail/hydroxide/distinfo +++ b/mail/hydroxide/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1719692102 -SHA256 (emersion-hydroxide-v0.2.29_GH0.tar.gz) = 96f1f1cc058544365a31d9b9c64fe44073092b36f95784c044b88641849448bc -SIZE (emersion-hydroxide-v0.2.29_GH0.tar.gz) = 45566 +TIMESTAMP = 1723902839 +SHA256 (nxjosephofficial-hydroxide-v0.2.29_GH0.tar.gz) = 504732b22d97d95db73e799878fa5dc974a151b491cd4c11867970d6aadbf45e +SIZE (nxjosephofficial-hydroxide-v0.2.29_GH0.tar.gz) = 45559 SHA256 (ProtonMail-go-crypto-v1.0.0_GH0.tar.gz) = 596e264d2df6beb3ec40e47286f86960845ab227cb635150ef3bd35a90a79e43 SIZE (ProtonMail-go-crypto-v1.0.0_GH0.tar.gz) = 333515 SHA256 (boltdb-bolt-v1.3.1_GH0.tar.gz) = b5ae498b780f535a5d308c188dee1329b3536275d29ad6758876084c0b8586a8 diff --git a/mail/hydroxide/files/hydroxide.in b/mail/hydroxide/files/hydroxide.in index 9bbc41c4853a..6e4cfed34c38 100644 --- a/mail/hydroxide/files/hydroxide.in +++ b/mail/hydroxide/files/hydroxide.in @@ -27,17 +27,26 @@ esac name=${name##*/} rcvar="${name}_enable" +extra_commands="init" + +init_cmd="${name}_init" +su_cmd="/usr/bin/su" load_rc_config "${name}" eval "${rcvar}=\${${rcvar}:-'NO'}" -eval "_args=\${${name}_args:-''}" -eval "_user=\${${name}_user:-'%%USER%%'}" -eval "_log=\${${name}_log:-/dev/null}" +eval "__args=\${${name}_args:-''}" +eval "__user=\${${name}_user:-'%%USER%%'}" +eval "__log=\${${name}_log:-/dev/null}" pidfile="/var/run/${name}.pid" command="/usr/sbin/daemon" -command_args="-P ${pidfile} -u ${_user} -f -H -o ${_log} -m 3 %%PREFIX%%/bin/hydroxide ${_args} serve" +command_args="-P ${pidfile} -u ${__user} -f -H -o ${__log} -m 3 %%PREFIX%%/bin/hydroxide ${__args} serve" + +hydroxide_init() { + read -p "Enter mail account id: " id + ${su_cmd} -m ${__user} -c "%%PREFIX%%/bin/hydroxide auth $id" +} run_rc_command "$1" diff --git a/mail/hydroxide/pkg-message b/mail/hydroxide/pkg-message new file mode 100644 index 000000000000..6573ce79fe8e --- /dev/null +++ b/mail/hydroxide/pkg-message @@ -0,0 +1,13 @@ +[ +{ type: install + message: <