Upgrade to 1.6.0
This commit is contained in:
Fabio Alessandro Locati
parent
58fea354c1
commit
cadc7b4eb3
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ mutt-1.5.22.tar.gz
|
||||
mutt-1.5.23.tar.gz
|
||||
/mutt-1.5.23-20150609hg17a4f92e4a95.tar.gz
|
||||
/mutt-1.5.24.tar.gz
|
||||
/mutt-1.6.0.tar.gz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up mutt-1.5.21/imap/imap.c.syncdebug mutt-1.5.21/imap/imap.c
|
||||
--- mutt-1.5.21/imap/imap.c.syncdebug 2012-03-27 10:05:44.978962551 +0200
|
||||
+++ mutt-1.5.21/imap/imap.c 2012-03-27 10:05:54.223252267 +0200
|
||||
@@ -1128,7 +1128,7 @@ static int sync_helper (IMAP_DATA* idata
|
||||
|
||||
char buf[LONG_STRING];
|
||||
|
||||
- if (!mutt_bit_isset (idata->ctx->rights, right))
|
||||
+ if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
|
||||
return 0;
|
||||
|
||||
if (right == M_ACL_WRITE && !imap_has_flag (idata->flags, name))
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up ./doc/manual.xml.head.add_debug_option ./doc/manual.xml.head
|
||||
--- ./doc/manual.xml.head.add_debug_option 2014-04-30 17:31:42.062694536 +0200
|
||||
+++ ./doc/manual.xml.head 2014-04-30 17:53:10.230668282 +0200
|
||||
@@ -8182,6 +8182,7 @@ mailboxes and to send messages from the
|
||||
<row><entry>-a</entry><entry>attach a file to a message</entry></row>
|
||||
<row><entry>-b</entry><entry>specify a blind carbon-copy (BCC) address</entry></row>
|
||||
<row><entry>-c</entry><entry>specify a carbon-copy (Cc) address</entry></row>
|
||||
+<row><entry>-d</entry><entry>log debugging output to ~/.muttdebug0 if mutt was complied with +DEBUG; it can range from 1-5 and affects verbosity (a value of 2 is recommended)</entry></row>
|
||||
<row><entry>-D</entry><entry>print the value of all Mutt variables to stdout</entry></row>
|
||||
<row><entry>-e</entry><entry>specify a config command to be run after initialization files are read</entry></row>
|
||||
<row><entry>-f</entry><entry>specify a mailbox to load</entry></row>
|
||||
@ -1,27 +0,0 @@
|
||||
diff -rup mutt-1.5.23/init.c mutt-1.5.23-new/init.c
|
||||
--- mutt-1.5.23/init.c 2014-03-12 17:03:45.000000000 +0100
|
||||
+++ mutt-1.5.23-new/init.c 2015-06-01 12:28:34.178727003 +0200
|
||||
@@ -2890,7 +2890,8 @@ void mutt_init (int skip_sys_rc, LIST *c
|
||||
{
|
||||
struct passwd *pw;
|
||||
struct utsname utsname;
|
||||
- char *p, buffer[STRING];
|
||||
+ char *p;
|
||||
+ char buffer[STRING] = "";
|
||||
int i, default_rc = 0, need_pause = 0;
|
||||
BUFFER err;
|
||||
|
||||
@@ -2968,11 +2969,11 @@ void mutt_init (int skip_sys_rc, LIST *c
|
||||
|
||||
#ifndef DOMAIN
|
||||
#define DOMAIN buffer
|
||||
- if (!p && getdnsdomainname (buffer, sizeof (buffer)) == -1)
|
||||
+ if (p == NULL && getdnsdomainname (buffer, sizeof (buffer)) == -1 && strlen(Hostname) == 0)
|
||||
Fqdn = safe_strdup ("@");
|
||||
else
|
||||
#endif /* DOMAIN */
|
||||
- if (*DOMAIN != '@')
|
||||
+ if (*DOMAIN != '@' && strlen(DOMAIN) != 0)
|
||||
{
|
||||
Fqdn = safe_malloc (mutt_strlen (DOMAIN) + mutt_strlen (Hostname) + 2);
|
||||
sprintf (Fqdn, "%s.%s", NONULL(Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
|
||||
12
mutt-1.6.0-syncdebug.patch
Normal file
12
mutt-1.6.0-syncdebug.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -ur mutt-1.6.0-orig/imap/imap.c mutt-1.6.0/imap/imap.c
|
||||
--- mutt-1.6.0-orig/imap/imap.c 2016-04-02 19:12:22.000000000 +0100
|
||||
+++ mutt-1.6.0/imap/imap.c 2016-04-18 14:08:01.016584276 +0100
|
||||
@@ -1125,7 +1125,7 @@
|
||||
if (!idata->ctx)
|
||||
return -1;
|
||||
|
||||
- if (!mutt_bit_isset (idata->ctx->rights, right))
|
||||
+ if (!idata->ctx || !mutt_bit_isset (idata->ctx->rights, right))
|
||||
return 0;
|
||||
|
||||
if (right == M_ACL_WRITE && !imap_has_flag (idata->flags, name))
|
||||
20
mutt.spec
20
mutt.spec
@ -17,23 +17,21 @@
|
||||
|
||||
Summary: A text mode mail user agent
|
||||
Name: mutt
|
||||
Version: 1.5.24
|
||||
Release: 2%{?dist}
|
||||
Version: 1.6.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
|
||||
License: GPLv2+ and Public Domain
|
||||
Group: Applications/Internet
|
||||
# hg snapshot created from http://dev.mutt.org/hg/mutt
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
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.5.21-cabundle.patch
|
||||
# FIXME find on dev.mutt.org
|
||||
Patch3: mutt-1.5.21-syncdebug.patch
|
||||
# https://dev.mutt.org/trac/ticket/3569
|
||||
Patch3: mutt-1.6.0-syncdebug.patch
|
||||
# FIXME make it to upstream
|
||||
Patch4: mutt-1.5.23-add_debug_option.patch
|
||||
Patch7: mutt-1.5.23-domainname.patch
|
||||
Patch8: mutt-1.5.23-system_certs.patch
|
||||
Patch9: mutt-1.5.23-ssl_ciphers.patch
|
||||
Url: http://www.mutt.org/
|
||||
@ -82,8 +80,6 @@ autoreconf --install
|
||||
%patch1 -p1 -b .muttrc
|
||||
%patch2 -p1 -b .cabundle
|
||||
%patch3 -p1 -b .syncdebug
|
||||
%patch4 -p1 -b .add_debug_option
|
||||
%patch7 -p1 -b .domainname
|
||||
%patch8 -p1 -b .system_certs
|
||||
%patch9 -p1 -b .ssl_ciphers
|
||||
|
||||
@ -195,10 +191,14 @@ ln -sf ./muttrc.5 $RPM_BUILD_ROOT%{_mandir}/man5/muttrc.local.5
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Apr 18 2016 Fabio Alessandro Locati <fabio@locati.cc> - 5:1.6.0-1
|
||||
- Upgrade to 1.6.0
|
||||
- Drop patch domainname since it should not be needed any more
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5:1.5.24-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu 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
|
||||
- New release, resolves rhbz#1259332
|
||||
|
||||
* Wed Aug 26 2015 Matej Muzila <mmuzila@redhat.com> - 5:1.5.23-11.20150609hg17a4f92e4a95
|
||||
|
||||
Loading…
Reference in New Issue
Block a user