Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2016-11-28 15:04:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt" Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2016-09-21 18:50:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new/mutt.changes 2016-11-28 15:04:58.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 23 10:39:04 UTC 2016 - [email protected] + +- Add patch mutt-1.6.2-gpgme_set_sender.patch + that is avoid name space clash with gpgme_set_sender() from gpgme + +------------------------------------------------------------------- +Wed Nov 23 10:13:49 UTC 2016 - [email protected] + +- Rename patch mutt-1.5.23-cariage-return.path to + mutt-1.5.23-carriage-return.path +- Extend patch mutt-1.5.23-carriage-return.path + Be sure that also signed messages from Android can be verified + by gpgme interface of mutt + +------------------------------------------------------------------- Old: ---- mutt-1.5.23-cariage-return.path New: ---- mutt-1.5.23-carriage-return.path mutt-1.6.2-gpgme_set_sender.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.1qQSuf/_old 2016-11-28 15:05:00.000000000 +0100 +++ /var/tmp/diff_new_pack.1qQSuf/_new 2016-11-28 15:05:00.000000000 +0100 @@ -102,13 +102,15 @@ # PATCH-FIX-OPENSUSE: bnc#813498 - mutt crashes in fgetwc in text_enriched_handler Patch15: widechar.sidebar.dif # PATCH-FIX-OPENSUSE: Be able to read signed/encrypted messsages even with CRLF -Patch16: mutt-1.5.23-cariage-return.path +Patch16: mutt-1.5.23-carriage-return.path # PATCH-FIX-OPENSUSE bnc#899712 - fallback mailcap for e.g text/html Patch18: mutt-1.5.21-mailcap.diff # PATCH-FIX-SUSE: bsc#907453 - CVE-2014-9116: mutt: heap-based buffer overflow in mutt_substrdup() Patch19: bsc907453-CVE-2014-9116-jessie.patch # PATCH-FIX-OPENSUSE boo#980830 ... remove if fixed upstream Patch20: COLS-workaround.dif +# PATCH-FIX-OPENSUSE avoid name space trouble with latest libgppme +Patch21: mutt-1.6.2-gpgme_set_sender.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir %{_sysconfdir} @@ -148,6 +150,7 @@ %patch18 -p0 -b .mailcap %patch19 -p0 -b .cvw2014.9116 %patch20 -p0 -b .cols +%patch21 -p0 -b .ssend rm -vf README*.orig rm -vf PATCHES*.orig ++++++ mutt-1.5.23-carriage-return.path ++++++ --- crypt-gpgme.c | 2 +- lib.c | 12 ++++++++++++ lib.h | 1 + pager.c | 2 +- pgp.c | 24 ++++++++++++------------ 5 files changed, 27 insertions(+), 14 deletions(-) --- crypt-gpgme.c +++ crypt-gpgme.c 2016-11-23 10:06:56.163851435 +0000 @@ -2313,7 +2313,7 @@ static void copy_clearsigned (gpgme_data if (armor_header) { - if (buf[0] == '\n') + if (buf[0] == '\n' || (buf[0] == '\r' && buf[1] == '\n')) armor_header = 0; continue; } --- lib.c +++ lib.c 2013-05-29 09:31:53.000000000 +0000 @@ -880,6 +880,18 @@ int mutt_strcmp(const char *a, const cha return strcmp(NONULL(a), NONULL(b)); } +int mutt_strxcmp(const char *a, const char *b) +{ + size_t xa, xb; + xa = strcspn(NONULL(a), "\r\n"); + xb = strcspn(NONULL(b), "\r\n"); + if (xb != xa) + return -1; + if (!xa) + return 0; + return strncmp(NONULL(a), NONULL(b), xa); +} + int mutt_strcasecmp(const char *a, const char *b) { return strcasecmp(NONULL(a), NONULL(b)); --- lib.h +++ lib.h 2013-05-29 09:25:22.000000000 +0000 @@ -197,6 +197,7 @@ int mutt_copy_bytes (FILE *, FILE *, siz int mutt_rx_sanitize_string (char *, size_t, const char *); int mutt_strcasecmp (const char *, const char *); int mutt_strcmp (const char *, const char *); +int mutt_strxcmp (const char *, const char *); int mutt_strncasecmp (const char *, const char *, size_t); int mutt_strncmp (const char *, const char *, size_t); int mutt_strcoll (const char *, const char *); --- pager.c +++ pager.c 2013-05-29 09:31:53.000000000 +0000 @@ -774,7 +774,7 @@ resolve_types (char *buf, char *raw, str else if (check_attachment_marker ((char *) raw) == 0) lineInfo[n].type = MT_COLOR_ATTACHMENT; #endif - else if (mutt_strcmp ("-- \n", buf) == 0 || mutt_strcmp ("-- \r\n", buf) == 0) + else if (mutt_strxcmp ("-- \n", buf) == 0) { i = n + 1; --- pgp.c +++ pgp.c 2015-01-26 15:48:02.361518080 +0000 @@ -302,7 +302,7 @@ static void pgp_copy_clearsigned (FILE * continue; } - if (mutt_strcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) + if (mutt_strxcmp (buf, "-----BEGIN PGP SIGNATURE-----\n") == 0) break; if (armor_header) @@ -368,14 +368,14 @@ int pgp_application_pgp_handler (BODY *m { clearsign = 0; - if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) + if (mutt_strxcmp ("MESSAGE-----\n", buf + 15) == 0) needpass = 1; - else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) + else if (mutt_strxcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) { clearsign = 1; needpass = 0; } - else if (!mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) + else if (!mutt_strxcmp ("PUBLIC KEY BLOCK-----\n", buf + 15)) { needpass = 0; pgp_keyblock = 1; @@ -408,10 +408,10 @@ int pgp_application_pgp_handler (BODY *m fputs (buf, tmpfp); - if ((needpass && mutt_strcmp ("-----END PGP MESSAGE-----\n", buf) == 0) || + if ((needpass && mutt_strxcmp ("-----END PGP MESSAGE-----\n", buf) == 0) || (!needpass - && (mutt_strcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 - || mutt_strcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0))) + && (mutt_strxcmp ("-----END PGP SIGNATURE-----\n", buf) == 0 + || mutt_strxcmp ("-----END PGP PUBLIC KEY BLOCK-----\n",buf) == 0))) break; /* remember optional Charset: armor header as defined by RfC4880 */ if (mutt_strncmp ("Charset: ", buf, 9) == 0) @@ -645,11 +645,11 @@ static int pgp_check_traditional_one_bod { if (mutt_strncmp ("-----BEGIN PGP ", buf, 15) == 0) { - if (mutt_strcmp ("MESSAGE-----\n", buf + 15) == 0) + if (mutt_strxcmp ("MESSAGE-----\n", buf + 15) == 0) enc = 1; - else if (mutt_strcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) + else if (mutt_strxcmp ("SIGNED MESSAGE-----\n", buf + 15) == 0) sgn = 1; - else if (mutt_strcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) + else if (mutt_strxcmp ("PUBLIC KEY BLOCK-----\n", buf + 15) == 0) key = 1; } } @@ -1197,9 +1197,9 @@ BODY *pgp_sign_message (BODY *a) */ while (fgets (buffer, sizeof (buffer) - 1, pgpout) != NULL) { - if (mutt_strcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) + if (mutt_strxcmp ("-----BEGIN PGP MESSAGE-----\n", buffer) == 0) fputs ("-----BEGIN PGP SIGNATURE-----\n", fp); - else if (mutt_strcmp("-----END PGP MESSAGE-----\n", buffer) == 0) + else if (mutt_strxcmp("-----END PGP MESSAGE-----\n", buffer) == 0) fputs ("-----END PGP SIGNATURE-----\n", fp); else fputs (buffer, fp); ++++++ mutt-1.6.2-gpgme_set_sender.patch ++++++ --- crypt-gpgme.c | 2 +- crypt-gpgme.h | 2 +- crypt-mod-pgp-gpgme.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) --- crypt-gpgme.c +++ crypt-gpgme.c 2016-11-23 10:35:10.336974209 +0000 @@ -4946,7 +4946,7 @@ int smime_gpgme_verify_sender (HEADER *h return verify_sender (h, GPGME_PROTOCOL_CMS); } -void gpgme_set_sender (const char *sender) +void mutt_gpgme_set_sender (const char *sender) { mutt_error ("[setting sender] mailbox: %s\n", sender); FREE (¤t_sender); --- crypt-gpgme.h +++ crypt-gpgme.h 2016-11-23 10:34:54.745294760 +0000 @@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, int smime_gpgme_verify_sender (HEADER *h); -void gpgme_set_sender (const char *sender); +void mutt_gpgme_set_sender (const char *sender); #endif --- crypt-mod-pgp-gpgme.c +++ crypt-mod-pgp-gpgme.c 2016-11-23 10:35:45.700247187 +0000 @@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_atta static void crypt_mod_pgp_set_sender (const char *sender) { - gpgme_set_sender (sender); + mutt_gpgme_set_sender (sender); } struct crypt_module_specs crypt_mod_pgp_gpgme =
