From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8868E1396D0 for ; Wed, 4 Oct 2017 17:17:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB6212BC006; Wed, 4 Oct 2017 17:17:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FF7E2BC006 for ; Wed, 4 Oct 2017 17:17:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61B07341792 for ; Wed, 4 Oct 2017 17:17:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C89A59085 for ; Wed, 4 Oct 2017 17:17:41 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1507137435.31494695ea19dcb11c2baf473614c90ee0357ee7.nicolasbock@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/neomutt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch X-VCS-Directories: mail-client/neomutt/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 31494695ea19dcb11c2baf473614c90ee0357ee7 X-VCS-Branch: master Date: Wed, 4 Oct 2017 17:17:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f451aeb2-4845-4f2b-98ce-59b95d3bced0 X-Archives-Hash: 289de0c2524f2ffd0ffe7d86e5cdda24 commit: 31494695ea19dcb11c2baf473614c90ee0357ee7 Author: Nicolas Bock gentoo org> AuthorDate: Wed Oct 4 17:16:56 2017 +0000 Commit: Nicolas Bock gentoo org> CommitDate: Wed Oct 4 17:17:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31494695 mail-client/neomutt: Rename smime_keys In order to avoid a file collision with the mutt package, rename the smime_keys helper script to neomutt_smime_keys. Fixes: #633454 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../0001-Rename-mutt-to-neomutt-20170912.patch | 50 +++++++++++++++++----- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch index 598a684a21a..a8a0c8ad272 100644 --- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch +++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20170912.patch @@ -1,17 +1,20 @@ -From 3a44a22841c2d5861c8fc79391f8615d22bcd08f Mon Sep 17 00:00:00 2001 +From 457e54623ce8c5ef40647ebbc4a304417e353230 Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Mon, 2 Oct 2017 14:04:34 -0600 Subject: [PATCH] Rename mutt to neomutt --- - Makefile.am | 28 +++++++++++++++------------- - configure.ac | 6 +++--- - contrib/pgp2.rc | 4 ++-- - contrib/pgp5.rc | 4 ++-- - contrib/pgp6.rc | 4 ++-- - doc/Makefile.am | 30 +++++++++++++++--------------- - lib/Makefile.am | 4 ++-- - 7 files changed, 41 insertions(+), 39 deletions(-) + Makefile.am | 28 +++++++++++++++------------- + configure.ac | 8 ++++---- + contrib/{smime_keys => neomutt_smime_keys} | 0 + contrib/pgp2.rc | 4 ++-- + contrib/pgp5.rc | 4 ++-- + contrib/pgp6.rc | 4 ++-- + contrib/smime.rc | 2 +- + doc/Makefile.am | 30 +++++++++++++++--------------- + lib/Makefile.am | 4 ++-- + 9 files changed, 43 insertions(+), 41 deletions(-) + rename contrib/{smime_keys => neomutt_smime_keys} (100%) diff --git a/Makefile.am b/Makefile.am index 97218b8f..859b2bcd 100644 @@ -98,7 +101,7 @@ index 97218b8f..859b2bcd 100644 echo 'const char *GitVer = "'$$version'";' > git_ver.h.tmp; \ cmp -s git_ver.h.tmp git_ver.h || mv git_ver.h.tmp git_ver.h; \ diff --git a/configure.ac b/configure.ac -index 1e888e86..471100b1 100644 +index 1e888e86..7898fa1b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl autoreconf -i @@ -119,7 +122,7 @@ index 1e888e86..471100b1 100644 AC_ARG_WITH(domain, AS_HELP_STRING([--with-domain=DOMAIN],[Specify your DNS domain name]), -@@ -213,7 +213,7 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [ +@@ -213,14 +213,14 @@ AS_IF([test x$use_gpgme = xyes && test x$gpgme_found = xno], [ dnl --enable-pgp AS_IF([test x$use_pgp != "xno"], [ AC_DEFINE(CRYPT_BACKEND_CLASSIC_PGP, 1, [Define if you want classic PGP Support.]) @@ -128,6 +131,18 @@ index 1e888e86..471100b1 100644 build_ncrypt_pgp="yes" ]) + dnl --enable-smime + AS_IF([test x$use_smime != "xno"], [ + AC_DEFINE(CRYPT_BACKEND_CLASSIC_SMIME, 1, [Define if you want classic S/MIME support.]) +- SMIMEAUX_TARGET='$(top_srcdir)/contrib/smime_keys' ++ SMIMEAUX_TARGET='$(top_srcdir)/contrib/neomutt_smime_keys' + build_ncrypt_smime="yes" + ]) + +diff --git a/contrib/smime_keys b/contrib/neomutt_smime_keys +similarity index 100% +rename from contrib/smime_keys +rename to contrib/neomutt_smime_keys diff --git a/contrib/pgp2.rc b/contrib/pgp2.rc index bd01e2d2..08b592dd 100644 --- a/contrib/pgp2.rc @@ -178,6 +193,19 @@ index a8708042..6b1ef985 100644 # create a clearsigned message set pgp_clearsign_command="PGPPASSFD=0; export PGPPASSFD; cat - %f | pgp6 +compatible +verbose=0 +batchmode +clearsig -afst %?a? -u %a?" +diff --git a/contrib/smime.rc b/contrib/smime.rc +index 532ac9ec..aa9897fb 100644 +--- a/contrib/smime.rc ++++ b/contrib/smime.rc +@@ -52,7 +52,7 @@ set smime_get_signer_cert_command="openssl smime -verify -in %f -noverify -signe + set smime_get_cert_email_command="openssl x509 -in %f -noout -email" + + # Add a certificate to the database using smime_keys. +-set smime_import_cert_command="smime_keys add_cert %f" ++set smime_import_cert_command="neomutt_smime_keys add_cert %f" + + + diff --git a/doc/Makefile.am b/doc/Makefile.am index 9bfe7ea6..dffbe5f6 100644 --- a/doc/Makefile.am