changeset: 6498:f675e853af12 user: Kevin McCarthy <ke...@8t8.us> date: Wed Sep 02 18:11:28 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/f675e853af12
Add time_t conversion to fix gpgme segfault on OpenBSD. time_t isn't the same size as gpgme_subkey_t->timestamp on OpenBSD. Passing &subkey->timestamp to localtime was therefore passing an address to the wrong size int and was causing a segfault. Thanks to Hannes Wenzel for reporting the bug and providing a patch. changeset: 6499:5700b43f1e5b user: Kevin McCarthy <ke...@8t8.us> date: Wed Sep 02 18:14:26 2015 -0700 link: http://dev.mutt.org/hg/mutt/rev/5700b43f1e5b merge stable diffs (115 lines): diff -r 62730ecbc17d -r 5700b43f1e5b alias.c --- a/alias.c Mon Aug 31 09:32:04 2015 -0700 +++ b/alias.c Wed Sep 02 18:14:26 2015 -0700 @@ -256,7 +256,7 @@ mutt_check_alias_name (tmp, buf, sizeof (buf)); retry_name: - /* add a new alias */ + /* L10N: prompt to add a new alias */ if (mutt_get_field (_("Alias as: "), buf, sizeof (buf), 0) != 0 || !buf[0]) return; diff -r 62730ecbc17d -r 5700b43f1e5b crypt-gpgme.c --- a/crypt-gpgme.c Mon Aug 31 09:32:04 2015 -0700 +++ b/crypt-gpgme.c Wed Sep 02 18:14:26 2015 -0700 @@ -2018,6 +2018,7 @@ char date[STRING]; int more; int rc = -1; + time_t tt; if ((err = gpgme_new (&tmpctx)) != GPG_ERR_NO_ERROR) { @@ -2081,7 +2082,8 @@ len = mutt_strlen (subkey->keyid); if (len > 8) shortid += len - 8; - strftime (date, sizeof (date), "%Y-%m-%d", localtime (&subkey->timestamp)); + tt = subkey->timestamp; + strftime (date, sizeof (date), "%Y-%m-%d", localtime (&tt)); if (!more) fprintf (*fp, "%s %5.5s %d/%8s %s %s\n", more ? "sub" : "pub", @@ -4676,6 +4678,10 @@ if (is_smime) { prompt = _("S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? "); + /* L10N: The 'f' is from "forget it", an old undocumented synonym of + * 'clear'. Please use a corresponding letter in your language. + * Alternatively, you may duplicate the letter 'c' is translated to. + * This comment also applies to the five following letter sequences. */ letters = _("sapfco"); choices = "SapFCo"; } diff -r 62730ecbc17d -r 5700b43f1e5b curs_main.c --- a/curs_main.c Mon Aug 31 09:32:04 2015 -0700 +++ b/curs_main.c Wed Sep 02 18:14:26 2015 -0700 @@ -903,7 +903,7 @@ else { char buf[STRING]; - /* i18n: ask for a limit to apply */ + /* L10N: ask for a limit to apply */ snprintf (buf, sizeof(buf), _("Limit: %s"),Context->pattern); mutt_message ("%s", buf); } diff -r 62730ecbc17d -r 5700b43f1e5b doc/devel-notes.txt --- a/doc/devel-notes.txt Mon Aug 31 09:32:04 2015 -0700 +++ b/doc/devel-notes.txt Wed Sep 02 18:14:26 2015 -0700 @@ -196,6 +196,10 @@ from the times when this was an iso-8859-1 source code tree, please feel free to fix them. +- prefix translator comments with L10N: + /* L10N: this is a translator comment */ + puts(_("String to translate)); + Documentation ------------- diff -r 62730ecbc17d -r 5700b43f1e5b pgp.c --- a/pgp.c Mon Aug 31 09:32:04 2015 -0700 +++ b/pgp.c Wed Sep 02 18:14:26 2015 -0700 @@ -1682,6 +1682,10 @@ _("PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "), (msg->security & INLINE) ? _("PGP/M(i)ME") : _("(i)nline")); prompt = promptbuf; + /* L10N: The 'f' is from "forget it", an old undocumented synonym of + * 'clear'. Please use a corresponding letter in your language. + * Alternatively, you may duplicate the letter 'c' is translated to. + * This comment also applies to the five following letter sequences. */ letters = _("safcoi"); choices = "SaFCoi"; } diff -r 62730ecbc17d -r 5700b43f1e5b po/Makefile.in.in --- a/po/Makefile.in.in Mon Aug 31 09:32:04 2015 -0700 +++ b/po/Makefile.in.in Wed Sep 02 18:14:26 2015 -0700 @@ -91,11 +91,11 @@ $(PACKAGE).pot: $(POTFILES) $(BUILT_POTFILES) $(srcdir)/POTFILES.in rm -f $(PACKAGE).pot $(PACKAGE).po $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ + --add-comments=L10N --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ && \ $(XGETTEXT) --default-domain=$(PACKAGE) \ - --add-comments --keyword=_ --keyword=N_ \ + --add-comments=L10N --keyword=_ --keyword=N_ \ --join $(BUILT_POTFILES) \ && test ! -f $(PACKAGE).po \ || ( rm -f $(PACKAGE).pot \ diff -r 62730ecbc17d -r 5700b43f1e5b smime.c --- a/smime.c Mon Aug 31 09:32:04 2015 -0700 +++ b/smime.c Wed Sep 02 18:14:26 2015 -0700 @@ -2052,6 +2052,10 @@ if (option (OPTCRYPTOPPORTUNISTICENCRYPT) && (msg->security & OPPENCRYPT)) { prompt = _("S/MIME (s)ign, encrypt (w)ith, sign (a)s, (c)lear, or (o)ppenc mode off? "); + /* L10N: The 'f' is from "forget it", an old undocumented synonym of + * 'clear'. Please use a corresponding letter in your language. + * Alternatively, you may duplicate the letter 'c' is translated to. + * This comment also applies to the two following letter sequences. */ letters = _("swafco"); choices = "SwaFCo"; }
