From a28488a87034c879cf94523ce2157ed3b87fbfca Mon Sep 17 00:00:00 2001 From: Fabio Alessandro Locati Date: Feb 25 2017 16:14:00 +0000 Subject: Update to 1.8.0 --- diff --git a/.gitignore b/.gitignore index b87ff45..81ed90e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ mutt-1.5.23.tar.gz /mutt-1.7.0.tar.gz /mutt-1.7.1.tar.gz /mutt-1.7.2.tar.gz +/mutt-1.8.0.tar.gz diff --git a/mutt-1.5.18-muttrc.patch b/mutt-1.5.18-muttrc.patch deleted file mode 100644 index 22d72b2..0000000 --- a/mutt-1.5.18-muttrc.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up mutt-1.5.18/doc/Muttrc.head.muttrc mutt-1.5.18/doc/Muttrc.head ---- mutt-1.5.18/doc/Muttrc.head.muttrc 2008-01-30 05:26:50.000000000 +0100 -+++ mutt-1.5.18/doc/Muttrc.head 2008-05-19 10:58:21.000000000 +0200 -@@ -19,11 +19,15 @@ macro index,pager,attach,compose \cb "\ - - # Show documentation when pressing F1 - macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" -+# and also F2, as some terminals use F1 -+macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" - - # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" - macro index,pager y "?" "show incoming mailboxes list" - bind browser y exit - -+bind editor delete-char -+ - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. - # -diff -up mutt-1.5.18/contrib/sample.muttrc mutt-1.5.18/contrib/sample diff --git a/mutt-1.7.1-cabundle.patch b/mutt-1.7.1-cabundle.patch deleted file mode 100644 index 76193ba..0000000 --- a/mutt-1.7.1-cabundle.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -ur mutt-1.7.1.orig/contrib/Makefile.am mutt-1.7.1/contrib/Makefile.am ---- mutt-1.7.1.orig/contrib/Makefile.am 2016-10-09 12:08:41.081976100 +0100 -+++ mutt-1.7.1/contrib/Makefile.am 2016-10-09 12:10:16.019451571 +0100 -@@ -5,7 +5,7 @@ - SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ - sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \ - sample.vimrc-sidebar colors.default colors.linux smime.rc \ -- ca-bundle.crt smime_keys_test.pl mutt_xtitle -+ smime_keys_test.pl mutt_xtitle - - EXTRA_DIST = language.txt language50.txt \ - patch.slang-1.2.2.keypad.1 \ -diff -ur mutt-1.7.1.orig/doc/smime-notes.txt mutt-1.7.1/doc/smime-notes.txt ---- mutt-1.7.1.orig/doc/smime-notes.txt 2016-10-09 12:08:41.071976366 +0100 -+++ mutt-1.7.1/doc/smime-notes.txt 2016-10-09 12:11:11.964963896 +0100 -@@ -40,8 +40,10 @@ - - Edit the smime_sign_as line in your muttrc, replacing the keyid with your - own. - --- You probably want to import the trusted roots in -- contrib/ca-bundle.crt. This makes you trust anything that was ultimately -+- There is no more ca-bundle.crt file with the trusted roots to import shipped -+ in mutt. The upstream file is out-dated and user is encouraged to use -+ ca-bundle.crt from ca-certificate package. -+ This makes you trust anything that was ultimately - signed by one of them. You can use "smime_keys add_root" to do so, or - just copy ca-bundle.crt into the place you point mutt's smime_ca_location - variable to. diff --git a/mutt-1.8.0-cabundle.patch b/mutt-1.8.0-cabundle.patch new file mode 100644 index 0000000..3752474 --- /dev/null +++ b/mutt-1.8.0-cabundle.patch @@ -0,0 +1,28 @@ +diff -ur mutt-1.8.0.orig/contrib/Makefile.am mutt-1.8.0/contrib/Makefile.am +--- mutt-1.8.0.orig/contrib/Makefile.am 2017-02-25 15:28:22.124997366 +0000 ++++ mutt-1.8.0/contrib/Makefile.am 2017-02-25 15:48:10.834036861 +0000 +@@ -5,7 +5,7 @@ + SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ + sample.mailcap sample.muttrc sample.muttrc-sidebar sample.muttrc-tlr \ + sample.muttrc-compress sample.vimrc-sidebar colors.default colors.linux smime.rc \ +- ca-bundle.crt smime_keys_test.pl mutt_xtitle ++ smime_keys_test.pl mutt_xtitle + + EXTRA_DIST = language.txt language50.txt \ + patch.slang-1.2.2.keypad.1 \ +diff -ur mutt-1.8.0.orig/doc/smime-notes.txt mutt-1.8.0/doc/smime-notes.txt +--- mutt-1.8.0.orig/doc/smime-notes.txt 2017-02-25 15:28:22.119997501 +0000 ++++ mutt-1.8.0/doc/smime-notes.txt 2017-02-25 16:06:38.986242390 +0000 +@@ -40,8 +40,10 @@ + - Edit the smime_sign_as line in your muttrc, replacing the keyid with your + own. + +-- You probably want to import the trusted roots in +- contrib/ca-bundle.crt. This makes you trust anything that was ultimately ++- There is no more ca-bundle.crt file with the trusted roots to import shipped ++ in mutt. The upstream file is out-dated and user is encouraged to use ++ ca-bundle.crt from ca-certificate package. ++ This makes you trust anything that was ultimately + signed by one of them. You can use "smime_keys add_root" to do so, or + just copy ca-bundle.crt into the place you point mutt's smime_ca_location + variable to. diff --git a/mutt-1.8.0-muttrc.patch b/mutt-1.8.0-muttrc.patch new file mode 100644 index 0000000..6933b4c --- /dev/null +++ b/mutt-1.8.0-muttrc.patch @@ -0,0 +1,19 @@ +diff -ur mutt-1.8.0.orig/doc/Muttrc.head mutt-1.8.0/doc/Muttrc.head +--- mutt-1.8.0.orig/doc/Muttrc.head 2017-02-25 15:28:22.120997474 +0000 ++++ mutt-1.8.0/doc/Muttrc.head 2017-02-25 15:30:10.643079681 +0000 +@@ -24,11 +24,15 @@ + + # Show documentation when pressing F1 + macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" ++# and also F2, as some terminals use F1 ++macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" + + # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" + macro index,pager y "?" "show incoming mailboxes list" + bind browser y exit + ++bind editor delete-char ++ + # Handler for gzip compressed mailboxes + # open-hook '\.gz$' "gzip -cd '%f' > '%t'" + # close-hook '\.gz$' "gzip -c '%t' > '%f'" diff --git a/mutt.spec b/mutt.spec index c0032cd..c9fc420 100644 --- a/mutt.spec +++ b/mutt.spec @@ -18,8 +18,8 @@ Summary: A text mode mail user agent Name: mutt -Version: 1.7.2 -Release: 3%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Epoch: 5 # The entire source code is GPLv2+ except # pgpewrap.c setenv.c sha1.c wcwidth.c which are Public Domain @@ -28,8 +28,8 @@ Group: Applications/Internet # hg snapshot created from http://dev.mutt.org/hg/mutt Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz Source1: mutt_ldap_query -Patch1: mutt-1.5.18-muttrc.patch -Patch2: mutt-1.7.1-cabundle.patch +Patch1: mutt-1.8.0-muttrc.patch +Patch2: mutt-1.8.0-cabundle.patch # https://dev.mutt.org/trac/ticket/3569 Patch3: mutt-1.7.0-syncdebug.patch # FIXME make it to upstream @@ -196,29 +196,34 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5 %changelog +* Sat Feb 25 2017 Fabio Alessandro Locati - 5:1.8.0-1 +- Upgrade to 1.8.0 +- Rebase muttrc patch +- Rebase cabundle patch + * Fri Feb 10 2017 Fedora Release Engineering - 5:1.7.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild * Sat Dec 10 2016 Igor Gnatenko - 5:1.7.2-2 - Rebuild for gpgme 1.18 -* Mon Dec 05 2016 Fabio Alessandro Locati - 5:1.7.2-1 +* Mon Dec 05 2016 Fabio Alessandro Locati - 5:1.7.2-1 - Upgrade to 1.7.2 -* Sun Oct 09 2016 Fabio Alessandro Locati - 5:1.7.1-1 +* Sun Oct 09 2016 Fabio Alessandro Locati - 5:1.7.1-1 - Upgrade to 1.7.1 - Rebase cabundle patch -* Sat Aug 20 2016 Fabio Alessandro Locati - 5:1.7.0-1 +* Sat Aug 20 2016 Fabio Alessandro Locati - 5:1.7.0-1 - Upgrade to 1.7.0 * Thu Jul 07 2016 Jon Ciesla - 5:1.6.2-1 - Upgrade to 1.6.2 -* Mon May 02 2016 Fabio Alessandro Locati - 5:1.6.1-1 +* Mon May 02 2016 Fabio Alessandro Locati - 5:1.6.1-1 - Upgrade to 1.6.1 -* Mon Apr 18 2016 Fabio Alessandro Locati - 5:1.6.0-1 +* Mon Apr 18 2016 Fabio Alessandro Locati - 5:1.6.0-1 - Upgrade to 1.6.0 - Drop patch domainname since it should not be needed any more diff --git a/sources b/sources index 4752655..cf37a9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -15425c4c9946d58c22ccb44901544e6d mutt-1.7.2.tar.gz +SHA512 (mutt-1.8.0.tar.gz) = 20120baa1d6c528281ba02faf8f19a3cbe3fce5bb5907a3513d3ec98592cd63db2b5f02884002c45dc18a4947d5cf2ac30e2ca4e059ad7a37ca0b22734e3bf1d