Author: thialme-guest
Date: 2009-09-10 22:19:28 +0000 (Thu, 10 Sep 2009)
New Revision: 444
Modified:
trunk/debian/changelog
trunk/debian/control
trunk/gpg-mailkeys/gpg-mailkeys
Log:
* 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.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2009-09-06 15:11:17 UTC (rev 443)
+++ trunk/debian/changelog 2009-09-10 22:19:28 UTC (rev 444)
@@ -2,6 +2,8 @@
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 @@
+ 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.
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-09-06 15:11:17 UTC (rev 443)
+++ trunk/debian/control 2009-09-10 22:19:28 UTC (rev 444)
@@ -16,7 +16,7 @@
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
Modified: trunk/gpg-mailkeys/gpg-mailkeys
===================================================================
--- trunk/gpg-mailkeys/gpg-mailkeys 2009-09-06 15:11:17 UTC (rev 443)
+++ trunk/gpg-mailkeys/gpg-mailkeys 2009-09-10 22:19:28 UTC (rev 444)
@@ -8,6 +8,33 @@
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 @@
$NAME"
fi
+get_local_charset
+
FAILKEYS=
while [ -n "$1" ]; do
@@ -66,18 +95,18 @@
--$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