Update to 3.0.10.

This commit is contained in:
Jason Tibbitts 2019-05-28 14:26:50 -05:00
parent 64295f2be8
commit 94bf6b0836
3 changed files with 8 additions and 21 deletions

View File

@ -8,8 +8,8 @@
%bcond_without cassandane %bcond_without cassandane
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.0.9 Version: 3.0.10
Release: 2%{?dist} Release: 1%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %define ssl_pem_file /etc/pki/%name/%name.pem
@ -43,15 +43,11 @@ Patch2: patch-cyrus-rename-quota
# vzic uses an old makefile that needs hacks to use the proper flags # vzic uses an old makefile that needs hacks to use the proper flags
Patch3: patch-vzic-proper-cflags Patch3: patch-vzic-proper-cflags
# Allows building against clamav 0.101
# https://github.com/cyrusimap/cyrus-imapd/issues/2621
Patch4: patch-clamav101
# Workaround for some compiled Perl modules not being linked against # Workaround for some compiled Perl modules not being linked against
# libpcreposix, which causes them to fail to load. # libpcreposix, which causes them to fail to load.
# https://bugzilla.redhat.com/show_bug.cgi?id=1668723 # https://bugzilla.redhat.com/show_bug.cgi?id=1668723
# https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909 # https://github.com/cyrusimap/cyrus-imapd/issues/2629#issuecomment-456925909
Patch5: patch-cyrus-perl-linking Patch4: patch-cyrus-perl-linking
Source10: cyrus-imapd.logrotate Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config Source11: cyrus-imapd.pam-config
@ -693,6 +689,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog %changelog
* Tue May 28 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.10-1
- Update to 3.0.10.
- Drop upstreamed patch.
* Thu May 16 2019 Pavel Zhukov <pzhukov@redhat.com> - 3.0.9-2 * Thu May 16 2019 Pavel Zhukov <pzhukov@redhat.com> - 3.0.9-2
- Run sscg as mail group for proper certs permissions - Run sscg as mail group for proper certs permissions

View File

@ -1,13 +0,0 @@
diff --git a/imap/cyr_virusscan.c b/imap/cyr_virusscan.c
index 8f57885..26a2773 100644
--- a/imap/cyr_virusscan.c
+++ b/imap/cyr_virusscan.c
@@ -193,7 +193,7 @@ int clamav_scanfile(void *state, const char *fname,
int r;
/* scan file */
-#if LIBCLAMAV_MAJORVER < 9
+#ifdef CL_SCAN_ARCHIVE
r = cl_scanfile(fname, virname, NULL, st->av_engine,
CL_SCAN_STDOPT);
#else

View File

@ -1,3 +1,3 @@
SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420 SHA512 (cassandane-testdata-20170523.tar.gz) = 705f5af6a31fe3b8d6e8027bbddbedb2f64d65997f8a06620ec07fcd30a95d98ac3f3fbef7af5080684ee21be1c5b8bcad2374b2749f0571099e780355a04420
SHA512 (cassandane-c8040fd.tar.gz) = 58c0778be68628984f231aa1bb20abcb45a390f3660135e24bcdda163bfec2d7f5643aeb8d3f9deb03796f5b9b29a7e39515ffe375c1a2805c5ff3ec0f3c7d43 SHA512 (cassandane-c8040fd.tar.gz) = 58c0778be68628984f231aa1bb20abcb45a390f3660135e24bcdda163bfec2d7f5643aeb8d3f9deb03796f5b9b29a7e39515ffe375c1a2805c5ff3ec0f3c7d43
SHA512 (cyrus-imapd-3.0.9.tar.gz) = d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738 SHA512 (cyrus-imapd-3.0.10.tar.gz) = 1ae153a8f181bbe020326bec2dc177b78ef3c442f94e24e89b7a719298d93701006596dd21fa1c3a40afd75f01162b03524cf793dd7438ec7192f9a13f7614d0