From nobody Mon Sep 23 23:25:30 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 4XCJy315WDz5WgT1; Mon, 23 Sep 2024 23:25:31 +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 4XCJy30LKDz4v6b; Mon, 23 Sep 2024 23:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727133931; 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=c8Q407E44Q6j+S32i+ovdlrJFBSrCm72uszSfN31q+k=; b=dLlixA06DpGyX3t5Qyx4L9ktPQNHfM4jKfKsyRN8Qb4jBFvJ+DV+pq+zTekipGoEBsew56 1gUk2DvQYzyzdtW9aZlYkdCin4Yg2MNOypJCP2dcqv59MOY4AflRF3t5H21ErTIngqc3r6 jBSn0JK6a9NAnN1/Fa8Xh9cAaT2Ypx8R2XUe6tDr4mPqbWkvtSzyE0vT8PZobu6+OIVdWe dHXxFh33umm0cok4ksmnW41hT0ElznuNXHhYdGworuONSKgMSFVxBIVlThwfa9t/W3VbDe Q5NXifBq9UEZ6BYjVqORjxyq+krx2JFHoh/ROR7pZRYUGZ8uAz2YqnijMbgpRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727133931; a=rsa-sha256; cv=none; b=hUqr4TEiFWo9AzqaDE4AUTPfp3Zn32u50nhCJEetfPxwKN3i0FFfm9h0C+RiP4u4scym6Z IBS3jrRYp4LjVSw3tVJ3wk9aZOXpZa60qf6dmd3+KfZGfnwcARPqxTOH3GSeeqTmrxHX9T ydJ23mIvl7HLPSwnh6qUJZtv+c9925gv59NtpYufJFfuOY6Hs9zSMoXxAXYd6jtWZWWYy6 3+vzM3FEe/qOnbuVo1ulIHeLPnDN1Jl2iEnwOZvfUqemyEh5DS8k2c0IRfWc0hy0B230sP mcPYG48MXa8wKiHMwIHk6o/MQYIjQit0nKFyN6cy5/5gXdqWeNZxwCRxssKXQw== 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=1727133931; 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=c8Q407E44Q6j+S32i+ovdlrJFBSrCm72uszSfN31q+k=; b=ox6AQnK7yrWgSxNuPaTVAJer3CkyRcaDRIsmsJHqYq9tg6rrA7tlzGOzRoh4zp5wlIDcO8 65hRbS9NSWWpT8mj78+MwCT10xqQVSV+XhAqr/QMaznKsmtPZJA1fA2oH57FrcnmGr3eh8 9M+4Di+3nQQjp1OAmD+0uLvTIx4wPYW4oFQBlFUhQ5xiR/tAokVcAK48kFpzOsPyTfALk0 IapQwut+VjTMdpEWCWJJlViu/p8PT40knDMSZeomKAcglcINQOIdKopq+AUCXvWeWqTnky zHsJHtPAO44smCRvidckIJE6QJWq7FHqSeJBiAcYyWIBPd8WM851gXR0bGoGXA== 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 4XCJy26lRPz14ph; Mon, 23 Sep 2024 23:25:30 +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 48NNPU1o062740; Mon, 23 Sep 2024 23:25:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48NNPUee062737; Mon, 23 Sep 2024 23:25:30 GMT (envelope-from git) Date: Mon, 23 Sep 2024 23:25:30 GMT Message-Id: <202409232325.48NNPUee062737@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: 9dcbff870a87 - main - mail/hydroxide: switched to upstream 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: 9dcbff870a876642120cd71a51d1e95c7362817f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9dcbff870a876642120cd71a51d1e95c7362817f commit 9dcbff870a876642120cd71a51d1e95c7362817f Author: Yusuf Yaman AuthorDate: 2024-09-23 23:20:44 +0000 Commit: Vladimir Druzenko CommitDate: 2024-09-23 23:22:49 +0000 mail/hydroxide: switched to upstream Port has been switched to use upstream because I think it's better to just use a patch rather than forking the upstream and making the change there. PR: 281669 --- mail/hydroxide/Makefile | 4 ++-- mail/hydroxide/distinfo | 6 +++--- mail/hydroxide/files/patch-config_config.go | 17 +++++++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/mail/hydroxide/Makefile b/mail/hydroxide/Makefile index 594006fcfe90..4f9ba94283df 100644 --- a/mail/hydroxide/Makefile +++ b/mail/hydroxide/Makefile @@ -1,7 +1,7 @@ PORTNAME= hydroxide DISTVERSIONPREFIX= v DISTVERSION= 0.2.29 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MAINTAINER= nxjoseph@protonmail.com @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= go:modules USE_GITHUB= yes -GH_ACCOUNT= nxjosephofficial +GH_ACCOUNT= emersion 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 6f93acce324c..b74655e66e82 100644 --- a/mail/hydroxide/distinfo +++ b/mail/hydroxide/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1723902839 -SHA256 (nxjosephofficial-hydroxide-v0.2.29_GH0.tar.gz) = 504732b22d97d95db73e799878fa5dc974a151b491cd4c11867970d6aadbf45e -SIZE (nxjosephofficial-hydroxide-v0.2.29_GH0.tar.gz) = 45559 +TIMESTAMP = 1727105515 +SHA256 (emersion-hydroxide-v0.2.29_GH0.tar.gz) = 96f1f1cc058544365a31d9b9c64fe44073092b36f95784c044b88641849448bc +SIZE (emersion-hydroxide-v0.2.29_GH0.tar.gz) = 45566 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/patch-config_config.go b/mail/hydroxide/files/patch-config_config.go new file mode 100644 index 000000000000..4d5b5d95927d --- /dev/null +++ b/mail/hydroxide/files/patch-config_config.go @@ -0,0 +1,17 @@ +--- config/config.go.orig 2024-09-23 15:32:25 UTC ++++ config/config.go +@@ -6,12 +6,9 @@ func Path(filename string) (string, error) { + ) + + func Path(filename string) (string, error) { +- configHome, err := os.UserConfigDir() +- if err != nil { +- return "", err +- } ++ configHome := "/var/db/hydroxide" + +- p := filepath.Join(configHome, "hydroxide", filename) ++ p := filepath.Join(configHome, filename) + + dirname, _ := filepath.Split(p) + if err := os.MkdirAll(dirname, 0700); err != nil {