summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /mail-client/alot/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'mail-client/alot/files')
-rw-r--r--mail-client/alot/files/0.3.2-subject-fix.patch12
-rw-r--r--mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch78
2 files changed, 90 insertions, 0 deletions
diff --git a/mail-client/alot/files/0.3.2-subject-fix.patch b/mail-client/alot/files/0.3.2-subject-fix.patch
new file mode 100644
index 000000000000..064b416016a0
--- /dev/null
+++ b/mail-client/alot/files/0.3.2-subject-fix.patch
@@ -0,0 +1,12 @@
+diff -Naur pazz-alot-34f4a7d/alot/defaults/default.theme pazz-alot-34f4a7d.new/alot/defaults/default.theme
+--- pazz-alot-34f4a7d/alot/defaults/default.theme 2012-07-22 23:01:59.000000000 +0200
++++ pazz-alot-34f4a7d.new/alot/defaults/default.theme 2012-08-01 10:24:05.359838188 +0200
+@@ -62,7 +62,7 @@
+ [[[subject]]]
+ normal = 'default','','light gray','default','g66','default'
+ focus = 'standout','','yellow','light gray','yellow','g58'
+- #width = 'weight', 1
++ width = 'weight', 1
+ [[[content]]]
+ normal = 'default','','light gray','default','dark gray','default'
+ focus = 'standout','','yellow','light gray','yellow','g58'
diff --git a/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
new file mode 100644
index 000000000000..c7809fa82615
--- /dev/null
+++ b/mail-client/alot/files/0.3.5-0001-Use-Unicode-strings-when-dealing-with-.patch
@@ -0,0 +1,78 @@
+From 119e15cae5367d86e3754a337558eb98a420f46a Mon Sep 17 00:00:00 2001
+From: Simon Chopin <chopin.simon@gmail.com>
+Date: Wed, 24 Jul 2013 15:13:20 +0200
+Subject: [PATCH] Use Unicode strings when dealing with GPG
+
+This delays the encoding of special chars, if any, to the actual display
+which is supposed to know into what it should be encoded.
+---
+ alot/db/utils.py | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/alot/db/utils.py b/alot/db/utils.py
+index ba6d466..7fb2deb 100644
+--- a/alot/db/utils.py
++++ b/alot/db/utils.py
+@@ -51,9 +51,9 @@ def add_signature_headers(mail, sigs, error_msg):
+ )
+ mail.add_header(
+ X_SIGNATURE_MESSAGE_HEADER,
+- 'Invalid: {0}'.format(error_msg)
++ u'Invalid: {0}'.format(error_msg)
+ if error_msg else
+- 'Valid: {0}'.format(sig_from),
++ u'Valid: {0}'.format(sig_from),
+ )
+
+
+@@ -104,19 +104,19 @@ def message_from_file(handle):
+
+ malformed = False
+ if len(m.get_payload()) != 2:
+- malformed = 'expected exactly two messages, got {0}'.format(
++ malformed = u'expected exactly two messages, got {0}'.format(
+ len(m.get_payload()))
+
+ ct = m.get_payload(1).get_content_type()
+ if ct != app_pgp_sig:
+- malformed = 'expected Content-Type: {0}, got: {1}'.format(
++ malformed = u'expected Content-Type: {0}, got: {1}'.format(
+ app_pgp_sig, ct)
+
+ # TODO: RFC 3156 says the alg has to be lower case, but I've
+ # seen a message with 'PGP-'. maybe we should be more
+ # permissive here, or maybe not, this is crypto stuff...
+ if not p.get('micalg', 'nothing').startswith('pgp-'):
+- malformed = 'expected micalg=pgp-..., got: {0}'.format(
++ malformed = u'expected micalg=pgp-..., got: {0}'.format(
+ p.get('micalg', 'nothing'))
+
+ sigs = []
+@@ -144,13 +144,13 @@ def message_from_file(handle):
+
+ ct = m.get_payload(0).get_content_type()
+ if ct != app_pgp_enc:
+- malformed = 'expected Content-Type: {0}, got: {1}'.format(
++ malformed = u'expected Content-Type: {0}, got: {1}'.format(
+ app_pgp_enc, ct)
+
+ want = 'application/octet-stream'
+ ct = m.get_payload(1).get_content_type()
+ if ct != want:
+- malformed = 'expected Content-Type: {0}, got: {1}'.format(want, ct)
++ malformed = u'expected Content-Type: {0}, got: {1}'.format(want, ct)
+
+ if not malformed:
+ try:
+@@ -199,7 +199,7 @@ def message_from_file(handle):
+ add_signature_headers(m, sigs, '')
+
+ if malformed:
+- msg = 'Malformed OpenPGP message: {0}'.format(malformed)
++ msg = u'Malformed OpenPGP message: {0}'.format(malformed)
+ m.attach(email.message_from_string(msg))
+
+ return m
+--
+1.8.3.2
+