From nobody Fri May 20 15:40:08 2022 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 36F901B44588; Fri, 20 May 2022 15:40:09 +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 4L4WBd0rBnz3sYJ; Fri, 20 May 2022 15:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653061209; 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=ES3kEHeorOMSa4kNtTNVWF3G3/YP5dByact4xjBbvzw=; b=owZX55i0KqsrR0jtUM0EaVFTEjutTthmol5et5m4HkdmQflTlS95w0/h6aXhi/JDx1ZJXz hh+sA6Lr6If9mFQnXB2OiSd4ekEPQ5F9UwFKewApOnDd6Kgiws2cuhIBF6XJq3EaspjxKy g/eSTlf5BgtkA4TwkxB1FcYZgnquJCr1h7J17swcJ2gGUakht3WUhOMflrXf4eM14DTE4B MQRQzZMNbhQ+OAdwhBFQwYMV4CVjFxFU5m2SvuGxTrDxjCUqyZDssxdypavHBiKYbFvxtu dA9aHq0F+ZLx3hrV9oG2aXdtWftiu34UBKDcKcUNJ95wGIxmMky3eM8XgTgDfA== 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 F19FE14ECD; Fri, 20 May 2022 15:40:08 +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 24KFe88b012110; Fri, 20 May 2022 15:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24KFe8jO012107; Fri, 20 May 2022 15:40:08 GMT (envelope-from git) Date: Fri, 20 May 2022 15:40:08 GMT Message-Id: <202205201540.24KFe8jO012107@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 294c4c05d691 - main - mail/mutt: Update to 2.2.5 add GNU SASL option 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294c4c05d6916e5c0a397806c154b914f3c326f2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653061209; 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=ES3kEHeorOMSa4kNtTNVWF3G3/YP5dByact4xjBbvzw=; b=fO/JEVjMNOK40F8GWpoDaAj67clJotKb5R1z+kpolu1QqSd0ckyq3rz9hCew7Eb2IqxuCJ ufGkfrWPuDFeFvsNXhHxxMuCiyN7nPKbn68BIYcotwrSpgQsu6pztNn5oaic4kGF/TZA8f H2mVP8NK4BsC5Y2s0VLpastcDc944xDFBCeU6S3drx1kx2tjO5TPydY0XloFsqnCSDPNFo zRTqKypJzA2Zs97u/y1NZDpBtP9y0lUOYtsZL/UsJWivTnNnlwIRk3Ui86+t0WtDTxB7xf GicRDPAgZgpQYZuIBxp/zIA5t68yhArWk5uS712ifZQP97WUgad63Q4yF7nv8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653061209; a=rsa-sha256; cv=none; b=mwH5ko+UEtlmkKhL0utZtmmVbHQQDA7uJ3F6g/Ttor5PiO7v9CNM3W615UWwkfdFF824XY lzhXJ3P3mS7SI5f//8k2a7ksM/VEaRjuyDp2MozYQF63nVO83R6IB19Lp2qE2uhCWUWZrZ PguEYGTktKCWWohWfkQOIT589xKJfDMMVZIaY1tXSeYbUYmBW1iU3Ntyn/vhhdx1qEDCFO ojSloDz3+DXG0uaNDHt8BRwhHoBsQAyqUsP3257v5ntMFfpf9bQwndS3cOOvakJsGO6sJA i+zT/omtALoX2wWTfGa0r6ldqP9LZa7xyAHONskgsA5QCv9A0H+vvf6obEFCtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=294c4c05d6916e5c0a397806c154b914f3c326f2 commit 294c4c05d6916e5c0a397806c154b914f3c326f2 Author: Derek Schrock AuthorDate: 2022-05-20 07:06:25 +0000 Commit: Fernando Apesteguía CommitDate: 2022-05-20 15:37:41 +0000 mail/mutt: Update to 2.2.5 add GNU SASL option ChangeLog: https://marc.info/?l=mutt-users&m=165272386215588&w=2 * Move SASL auth to a OPTIONS_SINGLE SASL_CYRUS Cyrus SASL default (old SASL option) SASL_GSASL GNU SASL PR: 264091 Reported by: dereks@lifeofadishwasher.com (maintainer) --- mail/mutt/Makefile | 21 +++++++++++++-------- mail/mutt/distinfo | 6 +++--- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 8659b0e2dc86..7fcaae1d938f 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,8 +1,7 @@ # Created by: Udo Schweigert PORTNAME= mutt -DISTVERSION= 2.2.4 -PORTREVISION= 1 +DISTVERSION= 2.2.5 CATEGORIES+= mail MASTER_SITES= ftp://ftp.mutt.org/pub/mutt/ \ https://bitbucket.org/mutt/mutt/downloads/ \ @@ -51,16 +50,18 @@ INFO= ${PORTNAME} OPTIONS_DEFINE= AUTOCRYPT DEBUG_LOGS DOCS EXAMPLES FLOCK GPGME \ GREETING_PATCH HTML ICONV IDN IFDEF_PATCH LOCALES_FIX \ MAILBOX_MANPAGES MAILDIR_MTIME_PATCH NLS QUOTE_PATCH \ - REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW + REVERSE_REPLY_PATCH SMART_DATE SMIME SMTP URLVIEW OPTIONS_DEFAULT= AUTOCRYPT DEBUG_LOGS GPGME GSSAPI_NONE HCACHE_LMDB HTML \ ICONV IDN IFDEF_PATCH LOCALES_FIX MAILBOX_MANPAGES \ MAILDIR_MTIME_PATCH NCURSES NLS QUOTE_PATCH \ - REVERSE_REPLY_PATCH SASL SMART_DATE SMIME SMTP URLVIEW + REVERSE_REPLY_PATCH SASL_CYRUS SMART_DATE SMIME SMTP \ + URLVIEW -OPTIONS_SINGLE= GSSAPI HCACHE SCREEN +OPTIONS_SINGLE= GSSAPI HCACHE SASL SCREEN OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_SINGLE_HCACHE= HCACHE_BDB HCACHE_GDBM HCACHE_KYOTOCABINET HCACHE_LMDB \ HCACHE_NONE HCACHE_QDBM HCACHE_TOKYOCABINET +OPTIONS_SINGLE_SASL= SASL_CYRUS SASL_GSASL SASL_NONE OPTIONS_SINGLE_SCREEN= NCURSES SLANG OPTIONS_SUB= yes @@ -87,7 +88,9 @@ NCURSES_DESC= Ncurses support NLS_DESC= Native language support (implies ICONV) QUOTE_PATCH_DESC= Extended quoting REVERSE_REPLY_PATCH_DESC= Reverse_reply -SASL_DESC= SASL authentication +SASL_CYRUS_DESC= Cyrus SASL Authentication +SASL_GSASL_DESC= GNU SASL Authentication +SASL_NONE_DESC= Disable SASL Authentication SLANG_DESC= SLANG support SMART_DATE_DESC= Dynamic date formatting with "%@" SMIME_DESC= SMIME email check option patch @@ -174,8 +177,10 @@ QUOTE_PATCH_PATCHFILES= patch-${VVV_PATCH_VERSION}.vvv.initials.xz:vvv \ REVERSE_REPLY_PATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-reverse_reply -SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 -SASL_CONFIGURE_ON= --with-sasl=${LOCALBASE} +SASL_CYRUS_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 +SASL_CYRUS_CONFIGURE_WITH= sasl=${LOCALBASE} +SASL_GSASL_LIB_DEPENDS= libgsasl.so:security/libgsasl +SASL_GSASL_CONFIGURE_WITH= gsasl=${LOCALBASE} # Handle ncurses/ncurses-port/slang SLANG_LIB_DEPENDS= libslang.so:devel/libslang2 diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo index 03d890dc8244..566b0cbd0ac9 100644 --- a/mail/mutt/distinfo +++ b/mail/mutt/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1651351940 -SHA256 (mutt/mutt-2.2.4.tar.gz) = b82776bebff0e10820a33fa1e7eafa5cba4ab3a011b08e83b66ed62d75c6e060 -SIZE (mutt/mutt-2.2.4.tar.gz) = 5515825 +TIMESTAMP = 1653001771 +SHA256 (mutt/mutt-2.2.5.tar.gz) = ff8b781159794adcca126b551d5e419174b7b38a582a159bfe4e13451a757e47 +SIZE (mutt/mutt-2.2.5.tar.gz) = 5516189 SHA256 (mutt/mutt-2.2.0.vc.greeting) = 7abb467cfaa0ccbfa1fa7cdf8585eefef94e039459ff95fb59efe23043d941d2 SIZE (mutt/mutt-2.2.0.vc.greeting) = 1979 SHA256 (mutt/patch-1.13.0.vvv.initials.xz) = 8b25ad6596bd57d94f6551e7e73ceb8da620468e96fb507b2f51545d5b3eaa02