rpms/cyrus-imapd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.0.9.

Browse Source 
clamav 0.101 support is supposed to be there but still seems to be
broken and needs a one-line fix now.  So that patch can't quite go away
yet.
This commit is contained in:
Jason Tibbitts 2019-03-14 22:35:39 -05:00
parent fc862dfc6b
commit c604c5bde7
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cyrus-imapd.spec
View File

@ -8,8 +8,8 @@
%bcond_without cassandane %bcond_without cassandane
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.0.8 Version: 3.0.9
Release: 10%{?dist} Release: 1%{?dist}
%define ssl_pem_file /etc/pki/%name/%name.pem %define ssl_pem_file /etc/pki/%name/%name.pem
@ -693,6 +693,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog %changelog
* Thu Mar 14 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.9-1
- Update to 3.0.9.
* Mon Feb 11 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-10 * Mon Feb 11 2019 Jason L Tibbitts III <tibbs@math.uh.edu> - 3.0.8-10
- Add pam configuration file for httpd auth. Thanks to Jeroen van Meeuwen. - Add pam configuration file for httpd auth. Thanks to Jeroen van Meeuwen.

24
patch-clamav101
View File

@ -1,25 +1,13 @@
diff --git a/imap/cyr_virusscan.c b/imap/cyr_virusscan.c diff --git a/imap/cyr_virusscan.c b/imap/cyr_virusscan.c
index 863a858..b6c8980 100644 index 8f57885..26a2773 100644
--- a/imap/cyr_virusscan.c --- a/imap/cyr_virusscan.c
+++ b/imap/cyr_virusscan.c +++ b/imap/cyr_virusscan.c
@@ -192,9 +192,19 @@ int clamav_scanfile(void *state, const char *fname, @@ -193,7 +193,7 @@ int clamav_scanfile(void *state, const char *fname,
struct clamav_state *st = (struct clamav_state *) state;
int r; int r;
- /* scan file */ /* scan file */
+#ifndef CL_SCAN_ARCHIVE /* clamav >= 0.101 */ -#if LIBCLAMAV_MAJORVER < 9
+ struct cl_scan_options options; +#ifdef CL_SCAN_ARCHIVE
+ memset(&options, 0, sizeof(struct cl_scan_options));
+ options.parse |= ~0; /* enable all parsers */
+ options.general |= CL_SCAN_GENERAL_HEURISTICS; /* enable heuristic alert options */
+
+ r = cl_scanfile(fname, virname, NULL, st->av_engine,
+ &options);
+
+#else
r = cl_scanfile(fname, virname, NULL, st->av_engine, r = cl_scanfile(fname, virname, NULL, st->av_engine,
CL_SCAN_STDOPT); CL_SCAN_STDOPT);
+#endif #else
switch (r) {
case CL_CLEAN:

2
sources
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.8.tar.gz) = f4aa9877e62479439bee2ca29f452bd7e9daa091c19bf3567aa7f493f5163c98b44086b749c70981402212ff90e19d9125b508cfcc077088f8c705e533812960 SHA512 (cyrus-imapd-3.0.9.tar.gz) = d1a65e957ad3bbbd70e4c8c699e226c17911c6f5815839694136b967a7067acaf4261c8aaad223ffb1e41d76ef78e9e7279a2805048de9b05939044ce17cb738