Browse Source

mutt package update 1.10.1

Signed-off-by: tuibuilder_pel7x64builder0 <tuibuilder@powerel.org>
master
tuibuilder_pel7x64builder0 6 years ago
parent
commit
ad7d138861
  1. 20
      SOURCES/mutt-1.10.0-muttrc.patch
  2. 12
      SOURCES/mutt-1.9.4-lynx_no_backscapes.patch
  3. 43
      SOURCES/mutt-1.9.5-nodotlock.patch
  4. 71
      SPECS/mutt.spec

20
SOURCES/mutt-1.10.0-muttrc.patch

@ -0,0 +1,20 @@
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,12 +24,16 @@
# Show documentation when pressing F1
macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
+# and also F2, as some terminals use F1
+macro generic,pager <F2> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
macro index y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
macro pager y "<exit><change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
bind browser y exit
+bind editor <delete> delete-char
+
# Handler for gzip compressed mailboxes
# open-hook '\.gz$' "gzip -cd '%f' > '%t'"
# close-hook '\.gz$' "gzip -c '%t' > '%f'"

12
SOURCES/mutt-1.9.4-lynx_no_backscapes.patch

@ -0,0 +1,12 @@
diff -up mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes mutt-1.9.1/doc/Makefile.am
--- mutt-1.9.1/doc/Makefile.am.lynx_no_backscapes 2018-04-12 15:30:14.881812698 +0200
+++ mutt-1.9.1/doc/Makefile.am 2018-04-12 15:30:25.632968018 +0200
@@ -109,7 +109,7 @@ uninstall-local:
check:
manual.txt: manual.html
- -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+ -LC_ALL=C lynx -dump -nolist -display_charset=us-ascii manual.html > $@ || \
LC_ALL=C w3m -dump manual.html > $@ || \
LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@

43
SOURCES/mutt-1.9.5-nodotlock.patch

@ -0,0 +1,43 @@
diff -up mutt-1.10.0/configure.ac.nodotlock mutt-1.10.0/configure.ac
--- mutt-1.10.0/configure.ac.nodotlock 2018-05-14 23:51:53.000000000 +0200
+++ mutt-1.10.0/configure.ac 2018-05-23 15:09:21.186613968 +0200
@@ -528,9 +528,7 @@ int main (int argc, char **argv)
}]])],[mutt_cv_worldwrite=yes],[mutt_cv_worldwrite=no],[mutt_cv_worldwrite=no])])
mutt_cv_setgid=no
- if test $mutt_cv_worldwrite = yes; then
- AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
- else
+ if test $mutt_cv_worldwrite != yes; then
AC_CACHE_CHECK(if $mutt_cv_mailpath is group writable, mutt_cv_groupwrite, [AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <sys/types.h>
#include <sys/stat.h>
@@ -546,7 +544,6 @@ int main (int argc, char **argv)
}]])],[mutt_cv_groupwrite=yes],[mutt_cv_groupwrite=no],[mutt_cv_groupwrite=no])])
if test $mutt_cv_groupwrite = yes; then
- AC_DEFINE(USE_DOTLOCK,1,[ Define to use dotlocking for mailboxes. ])
AC_DEFINE(USE_SETGID,1,[ Define if mutt should run setgid "mail". ])
mutt_cv_setgid=yes
fi
diff -up mutt-1.10.0/Makefile.am.nodotlock mutt-1.10.0/Makefile.am
--- mutt-1.10.0/Makefile.am.nodotlock 2018-05-23 15:11:05.477977659 +0200
+++ mutt-1.10.0/Makefile.am 2018-05-23 15:11:20.252170843 +0200
@@ -154,17 +154,6 @@ hcversion.h: $(srcdir)/mutt.h $(srcdir)/
patchlist.c: $(srcdir)/PATCHES $(srcdir)/patchlist.sh
$(srcdir)/patchlist.sh < $(srcdir)/PATCHES > patchlist.c
-install-exec-hook:
- if test -f $(DESTDIR)$(bindir)/mutt.dotlock && test -f $(DESTDIR)$(bindir)/mutt_dotlock ; then \
- rm -f $(DESTDIR)$(bindir)/mutt.dotlock ; \
- ln -sf $(DESTDIR)$(bindir)/mutt_dotlock $(DESTDIR)$(bindir)/mutt.dotlock ; \
- fi
- if test -f $(DESTDIR)$(bindir)/mutt_dotlock && test x$(DOTLOCK_GROUP) != x ; then \
- chgrp $(DOTLOCK_GROUP) $(DESTDIR)$(bindir)/mutt_dotlock && \
- chmod $(DOTLOCK_PERMISSION) $(DESTDIR)$(bindir)/mutt_dotlock || \
- { echo "Can't fix mutt_dotlock's permissions! This is required to lock mailboxes in the mail spool directory." >&2 ; exit 1 ; } \
- fi
-
install-data-local:
$(MKDIR_P) $(DESTDIR)$(sysconfdir)
$(INSTALL) -m 644 $(srcdir)/mime.types $(DESTDIR)$(sysconfdir)/mime.types.dist

71
SPECS/mutt.spec

@ -5,7 +5,8 @@
%bcond_without gnutls %bcond_without gnutls
%bcond_without gss %bcond_without gss
%bcond_without sasl %bcond_without sasl
%bcond_without idn %bcond_with idn
%bcond_without idn2
%bcond_without hcache %bcond_without hcache
%bcond_without tokyocabinet %bcond_without tokyocabinet
%bcond_with bdb %bcond_with bdb
@ -18,7 +19,7 @@


Summary: A text mode mail user agent Summary: A text mode mail user agent
Name: mutt Name: mutt
Version: 1.9.2 Version: 1.10.1
Release: 1%{?dist} Release: 1%{?dist}
Epoch: 5 Epoch: 5
# The entire source code is GPLv2+ except # The entire source code is GPLv2+ except
@ -28,24 +29,27 @@ Group: Applications/Internet
# hg snapshot created from http://dev.mutt.org/hg/mutt # hg snapshot created from http://dev.mutt.org/hg/mutt
Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz Source: ftp://ftp.mutt.org/pub/%{name}/%{name}-%{version}.tar.gz
Source1: mutt_ldap_query Source1: mutt_ldap_query
Patch1: mutt-1.8.0-muttrc.patch Patch1: mutt-1.10.0-muttrc.patch
Patch2: mutt-1.8.0-cabundle.patch Patch2: mutt-1.8.0-cabundle.patch
# https://dev.mutt.org/trac/ticket/3569 # https://dev.mutt.org/trac/ticket/3569
Patch3: mutt-1.7.0-syncdebug.patch Patch3: mutt-1.7.0-syncdebug.patch
# FIXME make it to upstream # FIXME make it to upstream
Patch8: mutt-1.5.23-system_certs.patch Patch8: mutt-1.5.23-system_certs.patch
Patch9: mutt-1.9.0-ssl_ciphers.patch Patch9: mutt-1.9.0-ssl_ciphers.patch
Patch10: mutt-1.9.4-lynx_no_backscapes.patch
Patch12: mutt-1.9.5-nodotlock.patch
Url: http://www.mutt.org Url: http://www.mutt.org
Requires: mailcap, urlview Requires: mailcap, urlview
BuildRequires: gcc
BuildRequires: ncurses-devel, gettext, automake BuildRequires: ncurses-devel, gettext, automake
# manual generation # manual generation
BuildRequires: /usr/bin/xsltproc, docbook-style-xsl BuildRequires: /usr/bin/xsltproc, docbook-style-xsl
#BuildRequires: perl-generators, perl-interpreter #BuildRequires: perl-interpreter
# html manual -> txt manual conversion (lynx messes up the encoding) #BuildRequires: perl-generators
BuildRequires: w3m BuildRequires: lynx


%if %{with hcache} %if %{with hcache}
#%{?with_tokyocabinet:BuildRequires: tokyocabinet-devel} %{?with_tokyocabinet:BuildRequires: tokyocabinet-devel}
%{?with_bdb:BuildRequires: db4-devel} %{?with_bdb:BuildRequires: db4-devel}
%{?with_qdbm:BuildRequires: qdbm-devel} %{?with_qdbm:BuildRequires: qdbm-devel}
%{?with_gdbm:BuildRequires: gdbm-devel} %{?with_gdbm:BuildRequires: gdbm-devel}
@ -61,6 +65,7 @@ BuildRequires: w3m
%endif %endif


%{?with_idn:BuildRequires: libidn-devel} %{?with_idn:BuildRequires: libidn-devel}
%{?with_idn2:BuildRequires: libidn2-devel}
%{?with_gpgme:BuildRequires: gpgme-devel} %{?with_gpgme:BuildRequires: gpgme-devel}




@ -75,9 +80,11 @@ for selecting groups of messages.
%prep %prep
# unpack; cd # unpack; cd
%setup -q %setup -q
# disable mutt_dotlock program - disable post-install mutt_dotlock checking
sed -i -r 's|install-exec-hook|my-useless-label|' Makefile.am
# do not run ./prepare -V, because it also runs ./configure # do not run ./prepare -V, because it also runs ./configure

%patch10 -p1 -b .lynx_no_backscapes
%patch12 -p1 -b .nodotlock

autoreconf --install autoreconf --install
%patch1 -p1 -b .muttrc %patch1 -p1 -b .muttrc
%patch2 -p1 -b .cabundle %patch2 -p1 -b .cabundle
@ -86,8 +93,6 @@ autoreconf --install
%patch9 -p1 -b .ssl_ciphers %patch9 -p1 -b .ssl_ciphers


sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure sed -i -r 's/`$GPGME_CONFIG --libs`/"\0 -lgpg-error"/' configure
# disable mutt_dotlock program - remove support from mutt binary
sed -i -r 's|^(.*USE_DOTLOCK.*)$|//\1|' configure


install -p -m644 %{SOURCE1} mutt_ldap_query install -p -m644 %{SOURCE1} mutt_ldap_query


@ -128,7 +133,11 @@ rm -f mutt_ssl.c
%{?with_gss: --with-gss} \ %{?with_gss: --with-gss} \
%endif %endif
\ \
%{?with_idn: --with-idn} \
%{!?with_idn: --without-idn} \ %{!?with_idn: --without-idn} \
%{?with_idn2: --with-idn2} \
%{!?with_idn2: --without-idn2} \
\
%{?with_gpgme: --enable-gpgme} \ %{?with_gpgme: --enable-gpgme} \
%{?with_sidebar: --enable-sidebar} \ %{?with_sidebar: --enable-sidebar} \
--with-docdir=%{_pkgdocdir} --with-docdir=%{_pkgdocdir}
@ -196,6 +205,44 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5




%changelog %changelog
* Tue Jul 17 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.1-1
- Upgrade to 1.10.1

* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.10.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

* Thu May 24 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.0-2
- Disable post-install mutt_dotlock checking by patch, not by sed.

* Tue May 22 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.10.0-1
- Upgrade to 1.10.0

* Thu Apr 19 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-4
- Disable dotlock by patch instead of sed
- Resolves: #1568597

* Wed Apr 18 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-3
- Apply patches of autoreconf related configuration files before running
autoreconf

* Mon Apr 16 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-2
- Use libidn2 instead of libidn

* Mon Apr 16 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.5-1
- Upgrade to 1.9.5

* Fri Apr 13 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.4-2
- Use lynx to generate documentation

* Mon Apr 09 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.4-1
- Upgrade to 1.9.4

* Tue Feb 13 2018 Matej Mužila <mmuzila@redhat.com> - 5:1.9.3-1
- Upgrade to 1.9.3

* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.9.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

* Wed Dec 20 2017 Matej Mužila <mmuzila@redhat.com> - 5:1.9.2-1 * Wed Dec 20 2017 Matej Mužila <mmuzila@redhat.com> - 5:1.9.2-1
- Upgrade to 1.9.2 - Upgrade to 1.9.2


@ -253,7 +300,7 @@ ln -sf ./muttrc.5 %{buildroot}%{_mandir}/man5/muttrc.local.5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild


* Fri Sep 04 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.24-1 * Fri Sep 04 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.24-1
- Updated to 1.5.24 (Resolves: rhbz#1259332) - Updated to 1.5.24 (Resolves: rhbz#1259332)
- Utilize system-wide crypto-policies (Resolves: rhbz#1179324) - Utilize system-wide crypto-policies (Resolves: rhbz#1179324)


* Thu Jun 25 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-9 * Thu Jun 25 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-9

Loading…
Cancel
Save