jaromail

commit 58bdfbe0781a79e7ef510672905853f0fa191de0
parent 9d030d18c1bea76f56df9a8c4d7b44d4dbe20c2e
Author: Jaromil <jaromil@dyne.org>
Date:   Thu, 10 Jan 2013 09:42:06 +0100

gpg and wrapper for osx

Diffstat:
M
build/build-osx.sh
 | 
9
+++++----
M
src/mutt/gpg
 | 
28
++++++++++++----------------

2 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/build/build-osx.sh b/build/build-osx.sh
@@ -3,8 +3,6 @@
 # this script creates a binary build for Apple/OSX
 # it requires all needed macports to be installed:
 
-# mutt
-# sudo port -vc install mutt-devel +gnuregex +gpgme +headercache +imap +pop +sasl +smtp +ssl +tokyocabinet +universal
 
 # pinentry
 # sudo port install pinentry +universal
@@ -173,7 +171,7 @@ fi
     echo "Compiling Mutt (MUA)"
     pushd src/mutt-1.5.21
 
-    CC=clang CFLAGS="$cflags" LDFLAGS="$ldflags" ./configure \
+    CC=clang CFLAGS="$cflags" CPPFLAGS="-I/opt/local/include" LDFLAGS="$ldflags" ./configure \
 	--with-ssl --with-gnutls --enable-imap --disable-debug \
 	--with-slang --disable-gpgme \
 	--enable-hcache --with-regex --with-tokyocabinet \
@@ -206,10 +204,13 @@ fi
     copydeps ${root}/src/mutt-1.5.21/pgpewrap
     copydeps /opt/local/bin/gfind
     copydeps /opt/local/bin/msmtp
+    copydeps /opt/local/bin/gpg
+    mv build/osx/gpg build/osx/gpg-jaro
     copydeps /opt/local/bin/pinentry
     copydeps /opt/local/bin/abook
     copydeps /opt/local/bin/lynx
-
+    copydeps /opt/local/bin/fetchmail
+    copydeps /opt/local/bin/procmail
 }
 
 
diff --git a/src/mutt/gpg b/src/mutt/gpg
@@ -31,44 +31,40 @@
 # breaking PGP/MIME.
 
 # decode application/pgp
-set pgp_decode_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_decode_command="gpg-jaro --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
 
 # verify a pgp/mime signature
-set pgp_verify_command="gpg --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
+set pgp_verify_command="gpg-jaro --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
 
 # decrypt a pgp/mime attachment
-set pgp_decrypt_command="gpg --status-fd=2 %?p?--passphrase-fd 0? --no-verbose --quiet --batch --output - %f"
+set pgp_decrypt_command="gpg-jaro --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"
+set pgp_sign_command="gpg-jaro --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"
+set pgp_clearsign_command="gpg-jaro --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 --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set pgp_encrypt_only_command="pgpewrap gpg-jaro --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 %?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="pgpewrap gpg-jaro %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
 
 # import a key into the public key ring
-set pgp_import_command="gpg --no-verbose --import %f"
+set pgp_import_command="gpg-jaro --no-verbose --import %f"
 
 # export a key from the public key ring
-set pgp_export_command="gpg --no-verbose --export --armor %r"
+set pgp_export_command="gpg-jaro --no-verbose --export --armor %r"
 
 # verify a key
-set pgp_verify_key_command="gpg --verbose --batch --fingerprint --check-sigs %r"
+set pgp_verify_key_command="gpg-jaro --verbose --batch --fingerprint --check-sigs %r"
 
 # read in the public key ring
-set pgp_list_pubring_command="gpg --no-verbose --batch --quiet --with-colons --list-keys %r" 
+set pgp_list_pubring_command="gpg-jaro --no-verbose --batch --quiet --with-colons --list-keys %r" 
 
 # read in the secret key ring
-set pgp_list_secring_command="gpg --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
+set pgp_list_secring_command="gpg-jaro --no-verbose --batch --quiet --with-colons --list-secret-keys %r" 
 
 # fetch keys
 # set pgp_getkeys_command="pkspxycwrap %r"