From 8d5c9918eff67bf435a14212a35baeecd9acef6f Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 17 Aug 2020 06:56:20 +0000 Subject: [PATCH] Accepting request 826781 from home:AndreasStieger:branches:server:mail mutt 1.14.6, with a run of spec-cleaner OBS-URL: https://build.opensuse.org/request/show/826781 OBS-URL: https://build.opensuse.org/package/show/server:mail/mutt?expand=0&rev=224 --- mutt-1.14.4.tar.gz | 3 - mutt-1.14.6.tar.gz | 3 + mutt.changes | 9 ++ mutt.spec | 271 ++++++++++++++++++++++----------------------- 4 files changed, 146 insertions(+), 140 deletions(-) delete mode 100644 mutt-1.14.4.tar.gz create mode 100644 mutt-1.14.6.tar.gz diff --git a/mutt-1.14.4.tar.gz b/mutt-1.14.4.tar.gz deleted file mode 100644 index c2ae852..0000000 --- a/mutt-1.14.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca8e56f8210b4fffa91ea08958b62b811cce552fe4fd7d726111cf53079ed3c3 -size 5007437 diff --git a/mutt-1.14.6.tar.gz b/mutt-1.14.6.tar.gz new file mode 100644 index 0000000..58290aa --- /dev/null +++ b/mutt-1.14.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47972a0152b81b9f67ff322a0a6682b914c15545bfdeac6bcc2f2c0bf9361844 +size 5010137 diff --git a/mutt.changes b/mutt.changes index d16e00a..b32dbc8 100644 --- a/mutt.changes +++ b/mutt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Aug 15 06:32:50 UTC 2020 - Andreas Stieger + +- 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 + ------------------------------------------------------------------- Mon Jun 22 13:57:52 UTC 2020 - Dr. Werner Fink diff --git a/mutt.spec b/mutt.spec index 832b94d..325dd63 100644 --- a/mutt.spec +++ b/mutt.spec @@ -16,87 +16,30 @@ # +%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 -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: cyrus-sasl-gssapi -BuildRequires: docbook-xsl-stylesheets -BuildRequires: hunspell -BuildRequires: iso_ent -BuildRequires: libgpgme-devel -BuildRequires: libxslt-tools -BuildRequires: opensp -BuildRequires: pkgconfig(gssrpc) -BuildRequires: pkgconfig(krb5) -%if 0%{?suse_version} > 1315 -BuildRequires: pkgconfig(kyotocabinet) -%else -BuildRequires: libkyotocabinet-devel -%endif -%if 0%{?suse_version} > 1315 -BuildRequires: pkgconfig(libidn2) -%else -BuildRequires: pkgconfig(libidn) -%endif -BuildRequires: pkgconfig(libsasl2) -%if 0%{?suse_version} > 1315 -BuildRequires: pkgconfig(ncurses) -%else -BuildRequires: ncurses-devel -%endif -%if 0%{?suse_version} > 1130 -BuildRequires: pkgconfig(shared-mime-info) -%endif -%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 +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 -Source0: https://bitbucket.org/mutt/mutt/downloads/mutt-%version.tar.gz +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 +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 +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 @@ -114,8 +57,64 @@ Patch19: bsc907453-CVE-2014-9116-jessie.patch 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} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: cyrus-sasl-gssapi +BuildRequires: docbook-xsl-stylesheets +BuildRequires: hunspell +BuildRequires: iso_ent +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 +BuildRequires: libkyotocabinet-devel +%endif +%if 0%{?suse_version} > 1315 +BuildRequires: pkgconfig(libidn2) +%else +BuildRequires: pkgconfig(libidn) +%endif +%if 0%{?suse_version} > 1315 +BuildRequires: pkgconfig(ncurses) +%else +BuildRequires: ncurses-devel +%endif +%if 0%{?suse_version} > 1130 +BuildRequires: pkgconfig(shared-mime-info) +%endif +%if 0%{?suse_version} +BuildRequires: update-desktop-files +%endif +%if 0%{?suse_version} > 1130 +Requires(post): shared-mime-info +Requires(postun): shared-mime-info +%endif %description A very powerful mail user agent. It supports (among other nice things) @@ -127,10 +126,10 @@ enhancements. 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 @@ Some extend documentation about mutt together with muttrc examples 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 @@ autoreconf -fi 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,--as-needed LDFLAGS 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 @@ $KRB5CFGPATH --version %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 @@ mv %{buildroot}%{_mandir}/man5/mbox.5 \ %{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 @@ install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ 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 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify %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 @@ rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-notify %{_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