Hello community, here is the log from the commit of package mutt for openSUSE:Factory checked in at 2020-08-17 12:08:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutt (Old) and /work/SRC/openSUSE:Factory/.mutt.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mutt" Mon Aug 17 12:08:49 2020 rev:95 rq:827247 version:1.14.6 Changes: -------- --- /work/SRC/openSUSE:Factory/mutt/mutt.changes 2020-06-25 15:08:37.317590052 +0200 +++ /work/SRC/openSUSE:Factory/.mutt.new.3399/mutt.changes 2020-08-17 12:10:22.498861267 +0200 @@ -1,0 +2,9 @@ +Sat Aug 15 06:32:50 UTC 2020 - Andreas Stieger <[email protected]> + +- mutt 1.14.6: + * fix bug where atimes were not being properly reset for mailbox + entries + * Remove $ssl_starttls check for IMAP PREAUTH + * Don't check IMAP PREAUTH encryption if $tunnel is in use + +------------------------------------------------------------------- Old: ---- mutt-1.14.4.tar.gz New: ---- mutt-1.14.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutt.spec ++++++ --- /var/tmp/diff_new_pack.zkLQSv/_old 2020-08-17 12:10:24.182862206 +0200 +++ /var/tmp/diff_new_pack.zkLQSv/_new 2020-08-17 12:10:24.186862208 +0200 @@ -16,16 +16,47 @@ # +%global _sysconfdir %{_sysconfdir} %bcond_with mutt_openssl %bcond_without mutt_gnutls - Name: mutt -%if %{with mutt_openssl} -BuildRequires: pkgconfig(openssl) -%endif -%if %{with mutt_gnutls} -BuildRequires: pkgconfig(gnutls) -%endif +Version: 1.14.6 +Release: 0 +Summary: Mail Program +# ftp://ftp.mutt.org/mutt/devel/ +# https:///bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz +License: GPL-2.0-or-later +Group: Productivity/Networking/Email/Clients +URL: http://www.mutt.org +Source0: https://bitbucket.org/mutt/mutt/downloads/mutt-%{version}.tar.gz +Source1: Signature_conversion +Source2: README.alternates +Source3: mutt.png +Source4: mutt.desktop +Source5: skel.muttrc +Source9: mutt.mailcap +Patch0: %{name}-1.13.3.dif +# http://www.spinnaker.de/mutt/compressed/ +Patch2: %{name}-1.5.9i-pgpewrap.diff +Patch3: %{name}-1.5.20-sendgroupreplyto.diff +Patch4: %{name}-1.5.15-wrapcolumn.diff +Patch7: mutt-1.6.1-opennfs.dif +Patch9: bug-676388-largefile.patch +# http://www.wolfermann.org/mutt.html +Patch11: aw.listreply.diff +Patch12: patch-1.5.24.vk.pgp_verbose_mime +# 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-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-ENHANCE-SUSE: allow to list current imap folders +Patch20: mutt-1.10.1-imap.patch +# PATCH-ENHANCE-SUSE: boo#1156477 - Mutt has an option to ask before quitting on ^C but quits immediately on ^4 +Patch21: mutt-Fix-SIGQUIT-handling.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: cyrus-sasl-gssapi @@ -35,8 +66,30 @@ BuildRequires: libgpgme-devel BuildRequires: libxslt-tools BuildRequires: opensp +BuildRequires: pkgconfig +BuildRequires: w3m BuildRequires: pkgconfig(gssrpc) BuildRequires: pkgconfig(krb5) +BuildRequires: pkgconfig(libsasl2) +Requires(post): %{_bindir}/cat +Requires(post): %{_bindir}/mkdir +Requires(postun): %{_bindir}/rm +Requires(pre): %{_bindir}/grep +Requires(pre): %{_bindir}/zcat +Recommends: hunspell +Recommends: mutt-doc +Recommends: mutt-lang +Recommends: urlscan +Recommends: urlview +Recommends: w3m +Provides: muttssl +Obsoletes: muttssl +%if %{with mutt_openssl} +BuildRequires: pkgconfig(openssl) +%endif +%if %{with mutt_gnutls} +BuildRequires: pkgconfig(gnutls) +%endif %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(kyotocabinet) %else @@ -47,7 +100,6 @@ %else BuildRequires: pkgconfig(libidn) %endif -BuildRequires: pkgconfig(libsasl2) %if 0%{?suse_version} > 1315 BuildRequires: pkgconfig(ncurses) %else @@ -59,63 +111,10 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -BuildRequires: w3m -URL: http://www.mutt.org -Requires(postun): /usr/bin/rm -Requires(post): /usr/bin/mkdir -Requires(post): /usr/bin/cat -Requires(pre): /usr/bin/zcat -Requires(pre): /usr/bin/grep -Recommends: hunspell -Provides: muttssl -Obsoletes: muttssl -Recommends: mutt-doc -Recommends: mutt-lang -Recommends: urlscan -Recommends: urlview -Recommends: w3m %if 0%{?suse_version} > 1130 Requires(post): shared-mime-info Requires(postun): shared-mime-info %endif -Version: 1.14.4 -Release: 0 -Summary: Mail Program -# ftp://ftp.mutt.org/mutt/devel/ -# https:///bitbucket.org/mutt/mutt/downloads/%%name-%%version.tar.gz -License: GPL-2.0-or-later -Group: Productivity/Networking/Email/Clients -Source0: https://bitbucket.org/mutt/mutt/downloads/mutt-%version.tar.gz -Source1: Signature_conversion -Source2: README.alternates -Source3: mutt.png -Source4: mutt.desktop -Source5: skel.muttrc -Source9: mutt.mailcap -Patch0: %name-1.13.3.dif -# http://www.spinnaker.de/mutt/compressed/ -Patch2: %name-1.5.9i-pgpewrap.diff -Patch3: %name-1.5.20-sendgroupreplyto.diff -Patch4: %name-1.5.15-wrapcolumn.diff -Patch7: mutt-1.6.1-opennfs.dif -Patch9: bug-676388-largefile.patch -# http://www.wolfermann.org/mutt.html -Patch11: aw.listreply.diff -Patch12: patch-1.5.24.vk.pgp_verbose_mime -# 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-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-ENHANCE-SUSE: allow to list current imap folders -Patch20: mutt-1.10.1-imap.patch -# PATCH-ENHANCE-SUSE: boo#1156477 - Mutt has an option to ask before quitting on ^C but quits immediately on ^4 -Patch21: mutt-Fix-SIGQUIT-handling.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%global _sysconfdir %{_sysconfdir} %description A very powerful mail user agent. It supports (among other nice things) @@ -127,10 +126,10 @@ Summary: Additional Documentation about Mutt Group: Documentation/Other Requires: %{name} = %{version} -Requires(post): %install_info_prereq -Requires(preun): %install_info_prereq +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} Recommends: perl(Expect) -Provides: %{name}:%{_docdir}/%name/COPYRIGHT +Provides: %{name}:%{_docdir}/%{name}/COPYRIGHT BuildArch: noarch %description doc @@ -138,37 +137,38 @@ for different environments and requirements. %package lang +# FIXME: consider using %%lang_package macro Summary: Languages for Mutt Group: System/Localization -Provides: mutt:/usr/share/locale/en_GB/LC_MESSAGES/mutt.mo Requires: %{name} = %{version} +Provides: mutt:%{_datadir}/locale/en_GB/LC_MESSAGES/mutt.mo BuildArch: noarch %description lang Provides translations to the package mutt. %prep -%setup -q -n mutt-%version -%patch0 -p0 -b .p0 -%patch2 -p0 -b .pgpewrap -%patch3 -p0 -b .sendgroupreplyto -%patch4 -p0 -b .wrapcolumn -%patch7 -p0 -b .opennfs -%patch9 -p0 -b .largefile -%patch11 -p0 -b .listreply -%patch12 -p0 -b .pgp_verbose_mtime -%patch15 -p0 -b .widechar.sidebar -%patch16 -p0 -b .crlf -%patch18 -p0 -b .mailcap -%patch19 -p0 -b .cvw2014.9116 -%patch20 -p0 -b .imap -%patch21 -p0 -b .quit +%setup -q -n mutt-%{version} +%patch0 -b .p0 +%patch2 -b .pgpewrap +%patch3 -b .sendgroupreplyto +%patch4 -b .wrapcolumn +%patch7 -b .opennfs +%patch9 -b .largefile +%patch11 -b .listreply +%patch12 -b .pgp_verbose_mtime +%patch15 -b .widechar.sidebar +%patch16 -b .crlf +%patch18 -b .mailcap +%patch19 -b .cvw2014.9116 +%patch20 -b .imap +%patch21 -b .quit -cp %{S:2} . +cp %{SOURCE2} . %build %if %{with mutt_gnutls} -echo 'set ssl_ca_certificates_file="/etc/ssl/ca-bundle.pem"' >> doc/Muttrc.head +echo 'set ssl_ca_certificates_file="%{_sysconfdir}/ssl/ca-bundle.pem"' >> doc/Muttrc.head %endif autoreconf -fi cflags () @@ -195,7 +195,7 @@ set +o noclobber } CC=gcc -CFLAGS="-Wall $RPM_OPT_FLAGS -I. -D_GNU_SOURCE" +CFLAGS="-Wall %{optflags} -I. -D_GNU_SOURCE" cflags -fno-strict-aliasing CFLAGS cflags -fstack-protector CFLAGS cflags -fPIE CFLAGS @@ -205,15 +205,15 @@ cflags -Wl,-O2 LDFLAGS cflags -pie LDFLAGS export CC CFLAGS LDFLAGS -export SENDMAIL=/usr/sbin/sendmail -export ISPELL=/usr/bin/hunspell -export PATH="/usr/lib/mit/bin:$PATH" +export SENDMAIL=%{_sbindir}/sendmail +export ISPELL=%{_bindir}/hunspell +export PATH="%{_prefix}/lib/mit/bin:$PATH" export KRB5CFGPATH="$(type -p krb5-config)" $KRB5CFGPATH --cflags gssapi $KRB5CFGPATH --libs gssapi $KRB5CFGPATH --version %configure \ - --with-docdir=%{_docdir}/%name \ + --with-docdir=%{_docdir}/%{name} \ %if %{with mutt_openssl} --without-gnutls \ --with-ssl=%{_prefix} \ @@ -243,13 +243,13 @@ %else --with-idn %endif -make -C doc clean -make -make -C doc +%make_build -C doc clean +%make_build +%make_build -C doc %install -make install DESTDIR=%{buildroot} -install -m 755 %{S:1} %{buildroot}%{_bindir} +%make_install +install -m 755 %{SOURCE1} %{buildroot}%{_bindir} gzip -n -9 doc/manu*.txt rm -f contrib/Makefile* # datadir not automatically created: @@ -261,7 +261,7 @@ %{buildroot}%{_mandir}/man5/mbox_mutt.5 mv %{buildroot}%{_mandir}/man5/mmdf.5 \ %{buildroot}%{_mandir}/man5/mmdf_mutt.5 - %find_lang %name + %find_lang %{name} # We get mime.types from aaa_base rm -f %{buildroot}%{_sysconfdir}/mime.types # Mutt BTS is gone @@ -274,18 +274,18 @@ mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/applications/ install -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/skel/.muttrc -install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%name/mailcap -rm -vf %{buildroot}%{_docdir}/%name/manual.txt -install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%name/ +install -D -m 644 %{SOURCE9} %{buildroot}%{_datadir}/%{name}/mailcap +rm -vf %{buildroot}%{_docdir}/%{name}/manual.txt +install -D -m 644 doc/manual.txt.gz %{buildroot}%{_docdir}/%{name}/ %if 0%{?suse_version} %suse_update_desktop_file mutt %endif %pre -if test $1 -gt 1 -a -e %{_docdir}/%name/manual.txt.gz +if test $1 -gt 1 -a -e %{_docdir}/%{name}/manual.txt.gz then - zcat %{_docdir}/%name/manual.txt.gz | grep -F 'version %{version}' > /run/mutt-version || : + zcat %{_docdir}/%{name}/manual.txt.gz | grep -F 'version %{version}' > /run/mutt-version || : fi %post @@ -311,7 +311,6 @@ %install_info_delete --info-dir=%{_infodir} "%{_infodir}/mutt.info.gz" %files -%defattr(-,root,root) %config(noreplace) %{_sysconfdir}/skel/.muttrc %config(noreplace) %{_sysconfdir}/Muttrc %{_bindir}/mutt @@ -321,42 +320,40 @@ %{_bindir}/Signature_conversion %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/mutt.png -%{_mandir}/man1/mutt.1%{ext_man} -%{_mandir}/man1/*pgp*.1%{ext_man} -%{_mandir}/man1/smime_keys.1%{ext_man} -%{_mandir}/man5/mmdf_mutt.5%{ext_man} -%{_mandir}/man5/muttrc.5%{ext_man} -%{_mandir}/man5/mbox_mutt.5%{ext_man} +%{_mandir}/man1/mutt.1%{?ext_man} +%{_mandir}/man1/*pgp*.1%{?ext_man} +%{_mandir}/man1/smime_keys.1%{?ext_man} +%{_mandir}/man5/mmdf_mutt.5%{?ext_man} +%{_mandir}/man5/muttrc.5%{?ext_man} +%{_mandir}/man5/mbox_mutt.5%{?ext_man} %dir %{_datadir}/mutt/ %{_datadir}/mutt/mailcap -%dir %doc %{_docdir}/%name/ -%doc %{_docdir}/%name/manual.txt.gz +%dir %doc %{_docdir}/%{name}/ +%doc %{_docdir}/%{name}/manual.txt.gz %files doc -%defattr(-,root,root) -%doc %{_docdir}/%name/COPYRIGHT -%doc %{_docdir}/%name/ChangeLog -%doc %{_docdir}/%name/GPL -%doc %{_docdir}/%name/NEWS -%doc %{_docdir}/%name/README* -%doc %{_docdir}/%name/TODO -%doc %{_docdir}/%name/*.html -%doc %{_docdir}/%name/*.txt -%dir %doc %{_docdir}/%name/samples/ -%doc %{_docdir}/%name/samples/*.rc -%doc %{_docdir}/%name/samples/ca-bundle.crt -%doc %{_docdir}/%name/samples/colors.* -%doc %{_docdir}/%name/samples/markdown2html -%doc %{_docdir}/%name/samples/mutt_xtitle -%doc %{_docdir}/%name/samples/sample.* -%doc %{_docdir}/%name/samples/smime_keys_test.pl -%doc %{_docdir}/%name/samples/bgedit-detectgui.sh -%doc %{_docdir}/%name/samples/bgedit-screen-tmux.sh -%dir %doc %{_docdir}/%name/samples/iconv/ -%doc %{_docdir}/%name/samples/iconv/*.rc -%doc %{_infodir}/*.gz +%doc %{_docdir}/%{name}/COPYRIGHT +%doc %{_docdir}/%{name}/ChangeLog +%doc %{_docdir}/%{name}/GPL +%doc %{_docdir}/%{name}/NEWS +%doc %{_docdir}/%{name}/README* +%doc %{_docdir}/%{name}/TODO +%doc %{_docdir}/%{name}/*.html +%doc %{_docdir}/%{name}/*.txt +%dir %doc %{_docdir}/%{name}/samples/ +%doc %{_docdir}/%{name}/samples/*.rc +%doc %{_docdir}/%{name}/samples/ca-bundle.crt +%doc %{_docdir}/%{name}/samples/colors.* +%doc %{_docdir}/%{name}/samples/markdown2html +%doc %{_docdir}/%{name}/samples/mutt_xtitle +%doc %{_docdir}/%{name}/samples/sample.* +%doc %{_docdir}/%{name}/samples/smime_keys_test.pl +%doc %{_docdir}/%{name}/samples/bgedit-detectgui.sh +%doc %{_docdir}/%{name}/samples/bgedit-screen-tmux.sh +%dir %doc %{_docdir}/%{name}/samples/iconv/ +%doc %{_docdir}/%{name}/samples/iconv/*.rc +%{_infodir}/*.gz -%files lang -f %name.lang -%defattr(-,root,root) +%files lang -f %{name}.lang %changelog ++++++ mutt-1.14.4.tar.gz -> mutt-1.14.6.tar.gz ++++++ ++++ 2311 lines of diff (skipped)
