[mutt] 13/16: Remove mentions of gpg-2comp and ship gpg.rc pristine

Faidon Liambotis paravoid at moszumanska.debian.org
Mon Jul 4 15:51:50 UTC 2016 

This is an automated email from the git hooks/post-receive script.

paravoid pushed a commit to branch experimental
in repository mutt.

commit 90aa10139ae0e302f5f5df083adaa219851d7b5a
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Mon Jul 4 17:42:04 2016 +0300

    Remove mentions of gpg-2comp and ship gpg.rc pristine
    
    Remove mentions of gpg-2comp from gpg.rc and README.Debian and ship the
    resulting gpg.rc into /etc/Muttrc.d pristine, with the comments
    included.
---
 debian/README.Debian                   | 14 --------------
 debian/changelog                       |  2 ++
 debian/mutt.install                    |  2 +-
 debian/patches/misc/gpg.rc-paths.patch | 27 ++++++++++++++++++++++-----
 debian/rules                           |  4 ----
 5 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 9ac18c8..ade2ba7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -19,20 +19,6 @@ You do not need any of the example files in /usr/share/doc/mutt/
 unless you plan to send signed+encrypted messages to pgp2 users.
 
 
-gpg-2comp
-~~~~~~~~~
-/usr/share/doc/mutt/examples/gpg.rc uses a wrapper program called
-gpg-2comp which is not available as a debian package.
-This program is needed only to sign and encrypt messages with a method
-compatible with PGP 2.x. Users who don't need this feature can use the
-commands provided in the default /etc/Muttrc.
-The pgpewrap and pgpring programs used by some example rc files have
-been installed in /usr/lib/mutt.
-The files /usr/share/doc/mutt/examples/*.rc are just examples and are not
-supposed to be used as is. Actually they are not supposed to be used at
-all, PGP support works out of the box if gnupg is installed.
-
-
 GnuPG passphrase
 ~~~~~~~~~~~~~~~~
 The GnuPG passphrase is not asked if the $GPG_AGENT_INFO environment
diff --git a/debian/changelog b/debian/changelog
index 32924ca..5d0a3ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ mutt (1.6.1-2) UNRELEASED; urgency=medium
       part of neomutt.
     - Update sensible-browser and multiple-fcc patches to adjusted versions
       from the neomutt-upstream.
+  * Remove mentions of gpg-2comp from gpg.rc and README.Debian and ship the
+    resulting gpg.rc into /etc/Muttrc.d pristine, with the comments included.
 
  -- Faidon Liambotis <paravoid at debian.org>  Sun, 03 Jul 2016 22:32:37 +0200
 
diff --git a/debian/mutt.install b/debian/mutt.install
index b87e5bc..12d783a 100644
--- a/debian/mutt.install
+++ b/debian/mutt.install
@@ -11,7 +11,7 @@ debian/extra/lib/debian-ldap-query	usr/lib/mutt
 debian/extra/lib/mailto-mutt            usr/lib/mutt
 
 debian/tmp/Muttrc			etc
-debian/tmp/gpg.rc			etc/Muttrc.d
+contrib/gpg.rc				etc/Muttrc.d
 contrib/smime.rc			etc/Muttrc.d
 debian/extra/rc/*.rc			etc/Muttrc.d
 debian/extra/mutt.xpm			usr/share/pixmaps
diff --git a/debian/patches/misc/gpg.rc-paths.patch b/debian/patches/misc/gpg.rc-paths.patch
index 6a423ec..88156d2 100644
--- a/debian/patches/misc/gpg.rc-paths.patch
+++ b/debian/patches/misc/gpg.rc-paths.patch
@@ -7,19 +7,36 @@ Use the correct path of pgpewrap.
  contrib/gpg.rc | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/contrib/gpg.rc b/contrib/gpg.rc
-index 53f3965..eae51d2 100644
 --- a/contrib/gpg.rc
 +++ b/contrib/gpg.rc
-@@ -49,11 +49,11 @@ set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--pas
+@@ -2,9 +2,6 @@
+ #
+ # Command formats for gpg.
+ # 
+-# This version uses gpg-2comp from 
+-#   http://70t.de/download/gpg-2comp.tar.gz
+-#
+ # $Id$
+ #
+ # %p    The empty string when no passphrase is needed,
+@@ -40,20 +37,16 @@ set pgp_verify_command="gpg --status-fd=
+ set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+ 
+ # create a pgp/mime signed attachment
+-# set pgp_sign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
+ set pgp_sign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --detach-sign --textmode %?a?-u %a? %f"
+ 
+ # create a application/pgp signed (old-style) message
+-# set pgp_clearsign_command="gpg-2comp --comment '' --no-verbose --batch --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
+ set pgp_clearsign_command="gpg --no-verbose --batch --quiet --output - %?p?--passphrase-fd 0? --armor --textmode --clearsign %?a?-u %a? %f"
  
  # create a pgp/mime encrypted attachment
- # set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+-# set pgp_encrypt_only_command="pgpewrap gpg-2comp -v --batch --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
 -set pgp_encrypt_only_command="pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
 +set pgp_encrypt_only_command="/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
  
  # create a pgp/mime encrypted and signed attachment
- # set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+-# set pgp_encrypt_sign_command="pgpewrap gpg-2comp %?p?--passphrase-fd 0? -v --batch --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 -set pgp_encrypt_sign_command="pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 +set pgp_encrypt_sign_command="/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
  
diff --git a/debian/rules b/debian/rules
index 6df9009..32a52e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,10 +76,6 @@ override_dh_install:
 	( sed -e '/## More settings/,$$d' $(CURDIR)/doc/Muttrc || exit 1 ; \
 	  cat debian/extra/rc/Muttrc.foot ) > debian/tmp/Muttrc
 	
-	( echo "# GnuPG configuration"; \
-	  grep '^set' contrib/gpg.rc; \
-	  echo ) > debian/tmp/gpg.rc
-	
 	dh_install
 	
 	# prepare files for update-alternatives

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git

More information about the pkg-mutt-commits mailing list