From 17fd91ece11d3f5a25cf01dd1624f71440eb08f5 Mon Sep 17 00:00:00 2001
From: thialme-guest <thialme-guest@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Thu, 10 Sep 2009 22:19:28 +0000
Subject: [PATCH] * gpg-mailkeys: (Closes: #545186)   + The charset for the
 text of the message is deduced from the charset used     by ~/.gpg-mailkeysrc
 and ~/.signature.   + The text message is encoded in quoted printable and
 thus it requires a     new dependency on qprint in debian/control.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@444 b513b33f-fedd-0310-b452-c3deb5f4c849
---
 debian/changelog          |  7 +++++++
 debian/control            |  2 +-
 gpg-mailkeys/gpg-mailkeys | 35 ++++++++++++++++++++++++++++++++---
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8184d2e..7837e37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ signing-party (1.1.2-1) UNRELEASED; urgency=low
 
   TODOs:
   * Check for Debian policy 3.8.3
+  * Update of the gpg-mailkeys man page to mention both the signature and
+    gpg-mailkeysrc files.
 
   [ Franck Joncourt ]
   * gpgsigs: 
@@ -19,6 +21,11 @@ signing-party (1.1.2-1) UNRELEASED; urgency=low
     + Warned the user if a local-user keyid is not listed as a keyid in
       ./caffrc. (Closes: #540165).
   * gpgdir: New upstream release.
+  * gpg-mailkeys: (Closes: #545186)
+    + The charset for the text of the message is deduced from the charset used
+      by ~/.gpg-mailkeysrc and ~/.signature.
+    + The text message is encoded in quoted printable and thus it requires a
+      new dependency on qprint in debian/control.
   * debian.control: added ${misc:Depends} as Depends for the keyanalyze
     package.
 
diff --git a/debian/control b/debian/control
index d706963..7607767 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Package: signing-party
 Architecture: any
 Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, gnupg, 
  libgnupg-interface-perl, libtext-template-perl, libmime-tools-perl,
- libmailtools-perl, libterm-readkey-perl, libclass-methodmaker-perl
+ libmailtools-perl, libterm-readkey-perl, libclass-methodmaker-perl, qprint
 Recommends: exim4 | mail-transport-agent, libtext-iconv-perl | libintl-perl | recode, dialog | whiptail, libpaper-utils,
 # springraph
  libgd-gd2-noxpm-perl | libgd-gd2-perl
diff --git a/gpg-mailkeys/gpg-mailkeys b/gpg-mailkeys/gpg-mailkeys
index cacaf1d..7ba5139 100755
--- a/gpg-mailkeys/gpg-mailkeys
+++ b/gpg-mailkeys/gpg-mailkeys
@@ -8,6 +8,33 @@ set -e
 
 VERSION='$Rev$'
 
+# Define the charset used in the text message of the mail
+LOCAL_CHARSET=""
+
+##
+# Get the local charset.
+#
+# The local charset is deduced from the charset used by both ~/.gpg-mailkeysrc
+# and ~/.signature. If none of these files exist, the local charset is assumed
+# to be us-ascii.
+
+get_local_charset ()
+{
+    local charset="us-ascii"
+    local file_list="$HOME/.signature $HOME/.gpg-mailkeysrc"
+
+    for filename in $file_list; do
+
+        if [ -e $filename ]; then
+            charset=`file --mime-encoding $filename | cut -d ' ' -f 2`
+            break
+        fi
+
+    done;
+
+    LOCAL_CHARSET=$charset
+}
+
 if [ -z "$*" ]; then
 	printf "Send people their newly signed GPG key by mail.\n"
 	printf "Usage: $0 keyid ...\n"
@@ -35,6 +62,8 @@ Enjoy,
 $NAME"
 fi
 
+get_local_charset
+
 FAILKEYS=
 
 while [ -n "$1" ]; do
@@ -66,18 +95,18 @@ Content-Disposition: inline
 
 
 --$BOUNDARY
-Content-Type: text/plain; charset=us-ascii
+Content-Type: text/plain; charset=$LOCAL_CHARSET
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
  
 
-$TEXT
+`echo "$TEXT" | qprint -e`
 
 EOM
 
 if [ -f ~/.signature ]; 
 	then printf -- "--=20\n" >> $TEMPFILE 
-	cat ~/.signature >> $TEMPFILE
+	qprint -e ~/.signature >> $TEMPFILE
 fi
 
 cat << EOM >> $TEMPFILE
-- 
2.30.2