diff --git a/.gitignore b/.gitignore index 5249668..c8f911e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ /cyrus-imapd-3.6.0.tar.gz.sig /cyrus-imapd-3.8.0.tar.gz /cyrus-imapd-3.8.0.tar.gz.sig +/cyrus-imapd-3.8.1.tar.gz +/cyrus-imapd-3.8.1.tar.gz.sig diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec index 972f636..ed5f463 100644 --- a/cyrus-imapd.spec +++ b/cyrus-imapd.spec @@ -4,13 +4,13 @@ # Cassandane was split into separate CI test: # https://src.fedoraproject.org/tests/cyrus-imapd/blob/main/f/Sanity/cassandane # Run: `rpmbuild '--with cassandane'` to enable it. -# Run: `echo '%_with_cassandane 1' >> ~/.rpmmacros && dnf builddep rpmbuild/SPECS/cyrus-imapd.spec` +# Run: `echo '%%_with_cassandane 1' >> ~/.rpmmacros && dnf builddep rpmbuild/SPECS/cyrus-imapd.spec` # to install dependencies for it. %bcond_with cassandane Name: cyrus-imapd -Version: 3.8.0 -Release: 4%{?dist} +Version: 3.8.1 +Release: 1%{?dist} %define ssl_pem_file_prefix /etc/pki/%name/%name @@ -46,7 +46,6 @@ Source17: cyrus-imapd-init.service Source18: cyrus-imapd.tmpfiles.conf Source19: cyrus-imapd.sysusers -%if %{with cassandane} # Source files for running the Cassandane test suite at build time. Source80: https://github.com/brong/Net-CalDAVTalk/archive/%{testdata_commit}/cassandane-testdata-%{testdata_short}.tar.gz # A template config file for cassandane; we will substitute in varions values. @@ -64,7 +63,6 @@ Source92: patch-cassandane-fix-annotator # try to get fixed the below upstream to work on Fedora: # https://github.com/cyrusimap/cyrus-imapd/commit/f10eee167313418d84e63d215310477d4fe68e94 Source93: patch-cassandane-xapian-delve-path -%endif # Adapt a timeout to handle our slower builders Patch0: patch-cyrus-testsuite-timeout @@ -82,6 +80,7 @@ Patch3: patch-cyrus-perl-linking # https://bugzilla.redhat.com/show_bug.cgi?id=2223951 # TODO: report upstream with patch Patch4: patch-cyrus-remove-always-inline-for-buf-len +Patch5: patch-cyrus-rename-imtest BuildRequires: autoconf automake bison flex gcc gcc-c++ git glibc-langpack-en BuildRequires: groff libtool make pkgconfig rsync systemd transfig @@ -475,6 +474,10 @@ mv %buildroot/%_mandir/man8/master.8 %buildroot/%_mandir/man8/master.8cyrus # Rename 'httpd' manpage to avoid clash with Apache mv %buildroot/%_mandir/man8/httpd.8 %buildroot/%_mandir/man8/httpd.8cyrus +# Fix conflict with imtest from python-fslpy +mv %buildroot/%_bindir/imtest %buildroot/%_bindir/cyr_imtest +mv %buildroot/%_mandir/man1/imtest.1 %buildroot/%_mandir/man1/cyr_imtest.1 + # Old cyrus packages used to keep the deliver executable in # /usr/lib/cyrus-imapd, and MTA configurations might rely on this. # Remove this hack in the F30 timeframe. @@ -761,19 +764,15 @@ exclude+=("!Master.maxforkrate") %files libs %license COPYING -%{_libdir}/libcyrus.so.0 -%{_libdir}/libcyrus.so.0.0.0 -%{_libdir}/libcyrus_imap.so.0 -%{_libdir}/libcyrus_imap.so.0.0.0 -%{_libdir}/libcyrus_min.so.0 -%{_libdir}/libcyrus_min.so.0.0.0 -%{_libdir}/libcyrus_sieve.so.0 -%{_libdir}/libcyrus_sieve.so.0.0.0 +%{_libdir}/libcyrus.so.0* +%{_libdir}/libcyrus_imap.so.0* +%{_libdir}/libcyrus_min.so.0* +%{_libdir}/libcyrus_sieve.so.0* %files utils %{_bindir}/cyradm %{_bindir}/httptest -%{_bindir}/imtest +%{_bindir}/cyr_imtest %{_bindir}/installsieve %{_bindir}/lmtptest %{_bindir}/mupdatetest @@ -786,7 +785,7 @@ exclude+=("!Master.maxforkrate") %{_bindir}/synctest %{_mandir}/man1/cyradm.1* %{_mandir}/man1/httptest.1* -%{_mandir}/man1/imtest.1* +%{_mandir}/man1/cyr_imtest.1* %{_mandir}/man1/installsieve.1* %{_mandir}/man1/lmtptest.1* %{_mandir}/man1/mupdatetest.1* @@ -816,6 +815,12 @@ exclude+=("!Master.maxforkrate") %{_mandir}/man3/Cyrus::SIEVE::managesieve.3pm* %changelog +* Wed Sep 13 2023 Martin Osvald - 3.8.1-1 +- New version 3.8.1 (rhbz#2238280) +- Small fix for libs sub-package to better conform with packaging guidelines +- Include cassandane sources in srpm +- Rename imtest to cyr_imtest to solve conflict with python-fslpy (rhbz#2227990) + * Thu Aug 03 2023 Martin Osvald - 3.8.0-4 - Improve spec file to conform with packaging guidelines (rhbz#2228751) diff --git a/patch-cyrus-rename-imtest b/patch-cyrus-rename-imtest new file mode 100644 index 0000000..aff3c6c --- /dev/null +++ b/patch-cyrus-rename-imtest @@ -0,0 +1,40 @@ +diff --git a/Makefile.am b/Makefile.am +index 71333b0..52317da 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -2092,14 +2092,14 @@ endif + ## The @$(MKDIR_P) line is added due to a bug in Automake 1.10 and can be removed if using Automake 1.12. + @$(MKDIR_P) $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir) && \ +- $(LN_S) -f imtest httptest && \ +- $(LN_S) -f imtest lmtptest && \ +- $(LN_S) -f imtest mupdatetest && \ +- $(LN_S) -f imtest nntptest && \ +- $(LN_S) -f imtest pop3test && \ +- $(LN_S) -f imtest sivtest && \ +- $(LN_S) -f imtest smtptest && \ +- $(LN_S) -f imtest synctest ++ $(LN_S) -f cyr_imtest httptest && \ ++ $(LN_S) -f cyr_imtest lmtptest && \ ++ $(LN_S) -f cyr_imtest mupdatetest && \ ++ $(LN_S) -f cyr_imtest nntptest && \ ++ $(LN_S) -f cyr_imtest pop3test && \ ++ $(LN_S) -f cyr_imtest sivtest && \ ++ $(LN_S) -f cyr_imtest smtptest && \ ++ $(LN_S) -f cyr_imtest synctest + + uninstall-hook: cyrus-makemaker-uninstall-workaround + if PERL +diff --git a/imtest/imtest.c b/imtest/imtest.c +index 725ff62..d9406e1 100644 +--- a/imtest/imtest.c ++++ b/imtest/imtest.c +@@ -3040,7 +3040,7 @@ int main(int argc, char **argv) + } + + if (!*prot) { +- if (!strcasecmp(prog, "imtest")) ++ if (!strcasecmp(prog, "cyr_imtest")) + prot = "imap"; + else if (!strcasecmp(prog, "pop3test")) + prot = "pop3"; diff --git a/sources b/sources index 752e94e..7d71013 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (cyrus-imapd-3.8.0.tar.gz) = e218639447c56a3608a1d02fbe23033fd38b8805fe672771e5e92477168d877374d0b7cbfaa3b6fcb1272c54f2b791729e24e20c16fb984675ac0632c2fc2073 -SHA512 (cyrus-imapd-3.8.0.tar.gz.sig) = 7fb7fa9cb1fd1ab73e2699f35f5237fade8eb64fb444cef190def223769cc705d7eb353a352c3d569bf5c18769e849d6a5142bf84fb7229d7575a1b012e8d611 +SHA512 (cyrus-imapd-3.8.1.tar.gz) = 95473c7fbe0ccfae2b4f4dddd0448b33079c50848334054d9ce0489e74c70bc99c53f12ec3e46c9d8055480b31cc412896fc26a60ae2844cb8d7f61f9867caed +SHA512 (cyrus-imapd-3.8.1.tar.gz.sig) = 82ffa7791e643dc8ae38c763538a0d819708dc4cc18e0597f2de3c1e243adf6d27d4f41a7b96b5ffa4757ad5e206b4a494262d1936eca58d074355dd606db6f0 SHA512 (cassandane-testdata-ca669d4b.tar.gz) = c153ab0a57d04d9deeabc5ef724eaecc05030c23b170abaa44eaea2e7df409efcdeb24871f7896759e85d64193fb9f289a470b0af9a593a740ffcc45c80033ff