Date: Fri, 16 Jan 2015 14:19:33 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377174 - in head/mail/exim: . files Message-ID: <201501161419.t0GEJXdC087060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Fri Jan 16 14:19:32 2015 New Revision: 377174 URL: https://svnweb.freebsd.org/changeset/ports/377174 QAT: https://qat.redports.org/buildarchive/r377174/ Log: - Add rspamd extra patch and option [1] - Remove obsoleted POST-INSTALL note [2] - Bump revision since options have been changed Submitted by: swappers at gmail.com [1], pi@ [2] Added: head/mail/exim/files/extra-patch-rspamd (contents, props changed) Modified: head/mail/exim/Makefile head/mail/exim/files/POST-INSTALL-NOTES head/mail/exim/options Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Fri Jan 16 13:46:16 2015 (r377173) +++ head/mail/exim/Makefile Fri Jan 16 14:19:32 2015 (r377174) @@ -3,7 +3,7 @@ PORTNAME= exim PORTVERSION?= ${EXIM_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/} MASTER_SITE_SUBDIR= exim4/:exim @@ -59,6 +59,7 @@ SPF_LIB_DEPENDS= libspf2.so:${PORTSDIR}/ SQLITE_USE= sqlite=yes SQLITE_USES= pkgconfig XCLIENT_EXTRA_PATCHES= ${FILESDIR}/extra-patch-xclient +RSPAMD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-rspamd .include <bsd.port.options.mk> Modified: head/mail/exim/files/POST-INSTALL-NOTES ============================================================================== --- head/mail/exim/files/POST-INSTALL-NOTES Fri Jan 16 13:46:16 2015 (r377173) +++ head/mail/exim/files/POST-INSTALL-NOTES Fri Jan 16 14:19:32 2015 (r377174) @@ -37,17 +37,6 @@ You may also want to configure newsyslog %%LOGDIR%%/mainlog mailnull:mail 640 7 * @T00 ZN %%LOGDIR%%/rejectlog mailnull:mail 640 7 * @T00 ZN -NOTE TO OPERATORS UPGRADING FROM exim-3.xx: - -There was a big reworking of the way mail routing works for release -4.00. Previously used "directors" were abolished, and all routing is -now done by routers. Policy controls for incoming mail are now done by -Access Control Lists instead of separate options. All this means that -pre-4.00 configuration files have to be massively converted. If you -are coming from a 3.xx release, please read the document in the file -%%DOCSDIR%%/Exim4.upgrade, and allow some time to complete -the upgrade. - Additional scripts to help upgrading are installed in: %%EXAMPLESDIR%% Added: head/mail/exim/files/extra-patch-rspamd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/exim/files/extra-patch-rspamd Fri Jan 16 14:19:32 2015 (r377174) @@ -0,0 +1,489 @@ +diff -ruN src/expand.c src/expand.c +--- src/expand.c 2015-01-16 15:21:40.000000000 +0200 ++++ src/expand.c 2015-01-16 15:21:51.000000000 +0200 +@@ -652,6 +652,7 @@ + { "sn8", vtype_filter_int, &filter_sn[8] }, + { "sn9", vtype_filter_int, &filter_sn[9] }, + #ifdef WITH_CONTENT_SCAN ++ { "spam_action", vtype_stringptr, &spam_action }, + { "spam_bar", vtype_stringptr, &spam_bar }, + { "spam_report", vtype_stringptr, &spam_report }, + { "spam_score", vtype_stringptr, &spam_score }, +diff -ruN src/globals.c src/globals.c +--- src/globals.c 2015-01-16 15:21:40.000000000 +0200 ++++ src/globals.c 2015-01-16 15:21:51.000000000 +0200 +@@ -1276,6 +1276,7 @@ + uschar *spamd_address = US"127.0.0.1 783"; + uschar *spam_bar = NULL; + uschar *spam_report = NULL; ++uschar *spam_action = NULL; + uschar *spam_score = NULL; + uschar *spam_score_int = NULL; + #endif +diff -ruN src/globals.h src/globals.h +--- src/globals.h 2015-01-16 15:21:40.000000000 +0200 ++++ src/globals.h 2015-01-16 15:21:51.000000000 +0200 +@@ -819,6 +819,7 @@ + extern uschar *spamd_address; /* address for the spamassassin daemon */ + extern uschar *spam_bar; /* the spam "bar" (textual representation of spam_score) */ + extern uschar *spam_report; /* the spamd report (multiline) */ ++extern uschar *spam_action; /* the spamd action */ + extern uschar *spam_score; /* the spam score (float) */ + extern uschar *spam_score_int; /* spam_score * 10 (int) */ + #endif +diff -ruN src/spam.c src/spam.c +--- src/spam.c 2015-01-16 15:21:40.000000000 +0200 ++++ src/spam.c 2015-01-16 15:21:51.000000000 +0200 +@@ -14,12 +14,20 @@ + uschar spam_score_buffer[16]; + uschar spam_score_int_buffer[16]; + uschar spam_bar_buffer[128]; ++uschar spam_action_buffer[32]; + uschar spam_report_buffer[32600]; + uschar prev_user_name[128] = ""; + int spam_ok = 0; + int spam_rc = 0; + uschar *prev_spamd_address_work = NULL; + ++/* push formatted line into vector */ ++static int spam_push_line(struct iovec *iov, int i, const char *fmt, ...); ++/* write io vector to the socket */ ++static int spam_write_vector(int sock, size_t size, struct iovec *iov, time_t now); ++/* poll socket to obtain write readiness */ ++static int spam_poll_socket (int sock, time_t start); ++ + int + spam(uschar **listptr) + { +@@ -31,10 +39,11 @@ + FILE *mbox_file; + int spamd_sock = -1; + uschar spamd_buffer[32600]; +- int i, j, offset, result; ++ int i, j, offset, result, is_rspamd; + uschar spamd_version[8]; ++ uschar spamd_short_result[8]; + uschar spamd_score_char; +- double spamd_threshold, spamd_score; ++ double spamd_threshold, spamd_score, spamd_reject_score; + int spamd_report_offset; + uschar *p,*q; + int override = 0; +@@ -128,8 +137,15 @@ + spamd_address_container *this_spamd = + (spamd_address_container *)store_get(sizeof(spamd_address_container)); + ++ /* Check for spamd variant */ ++ if( Ustrstr(address, "variant=rspamd") != NULL ) { ++ this_spamd->is_rspamd = 1; ++ } ++ else { ++ this_spamd->is_rspamd = 0; ++ } + /* grok spamd address and port */ +- if (sscanf(CS address, "%23s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2) ++ if (sscanf(CS address, "%23s %hu", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2) + { + log_write(0, LOG_MAIN, + "spam acl condition: warning - invalid spamd address: '%s'", address); +@@ -174,6 +190,7 @@ + spamd_address_vector[current_server]->tcp_port, + 5 ) > -1) { + /* connection OK */ ++ is_rspamd = spamd_address_vector[current_server]->is_rspamd; + break; + }; + +@@ -210,12 +227,28 @@ + } + + server.sun_family = AF_UNIX; +- Ustrcpy(server.sun_path, spamd_address_work); ++ p = Ustrstr(spamd_address_work, "variant=rspamd"); ++ if( p != NULL ) { ++ is_rspamd = TRUE; ++ /* strip spaces */ ++ p --; ++ while (p > spamd_address_work && isspace (*p)) { ++ p --; ++ } ++ Ustrncpy(server.sun_path, spamd_address_work, p - spamd_address_work + 1); ++ /* zero terminate */ ++ server.sun_path[p - spamd_address_work + 1] = 0; ++ } ++ else { ++ is_rspamd = FALSE; ++ Ustrcpy(server.sun_path, spamd_address_work); ++ } ++ + + if (connect(spamd_sock, (struct sockaddr *) &server, sizeof(struct sockaddr_un)) < 0) { + log_write(0, LOG_MAIN|LOG_PANIC, + "malware acl condition: spamd: unable to connect to UNIX socket %s (%s)", +- spamd_address_work, strerror(errno) ); ++ server.sun_path, strerror(errno) ); + (void)fclose(mbox_file); + (void)close(spamd_sock); + return DEFER; +@@ -231,22 +264,67 @@ + return DEFER; + } + ++ (void)fcntl(spamd_sock, F_SETFL, O_NONBLOCK); + /* now we are connected to spamd on spamd_sock */ +- (void)string_format(spamd_buffer, +- sizeof(spamd_buffer), +- "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n", +- user_name, +- mbox_size); ++ if (is_rspamd) { ++ /* rspamd variant */ ++ int r, request_p = 0; ++ const char *helo; ++ struct iovec *request_v; ++ ++ request_v = store_get(sizeof(struct iovec) * (8 + recipients_count)); ++ if (request_v == NULL) { ++ (void)close(spamd_sock); ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: store_get failed: %s", strerror(errno)); ++ (void)fclose(mbox_file); ++ (void)close(spamd_sock); ++ return DEFER; ++ } ++ r = 0; ++ r += spam_push_line(request_v, request_p++, "CHECK RSPAMC/1.3\r\n"); ++ r += spam_push_line(request_v, request_p++, "Content-length: %lu\r\n", mbox_size); ++ r += spam_push_line(request_v, request_p++, "Queue-Id: %s\r\n", message_id); ++ r += spam_push_line(request_v, request_p++, "From: <%s>\r\n", sender_address); ++ r += spam_push_line(request_v, request_p++, "Recipient-Number: %d\r\n", recipients_count); ++ /* copy all recipients as well */ ++ for (i = 0; i < recipients_count; i ++) ++ r += spam_push_line(request_v, request_p++, "Rcpt: <%s>\r\n", recipients_list[i].address); ++ if ((helo = expand_string(US"$sender_helo_name")) != NULL && *helo != '\0') ++ r += spam_push_line(request_v, request_p++, "Helo: %s\r\n", helo); ++ if (sender_host_address != NULL) ++ r += spam_push_line(request_v, request_p++, "IP: %s\r\n", sender_host_address); ++ r += spam_push_line(request_v, request_p++, "\r\n"); ++ if (spam_write_vector (spamd_sock, request_p, request_v, start) < 0) { ++ (void)close(spamd_sock); ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: spamd (rspamd) send failed: %s", strerror(errno)); ++ (void)fclose(mbox_file); ++ (void)close(spamd_sock); ++ return DEFER; ++ } ++ } ++ else { ++ /* spamassassin variant */ ++ struct iovec req_iov; ++ (void)string_format(spamd_buffer, ++ sizeof(spamd_buffer), ++ "REPORT SPAMC/1.2\r\nUser: %s\r\nContent-length: %ld\r\n\r\n", ++ user_name, ++ mbox_size); ++ /* send our request */ ++ req_iov.iov_len = Ustrlen(spamd_buffer); ++ req_iov.iov_base = spamd_buffer; ++ if (spam_write_vector (spamd_sock, 1, &req_iov, start) < 0) { ++ (void)close(spamd_sock); ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: spamd send failed: %s", strerror(errno)); ++ (void)fclose(mbox_file); ++ (void)close(spamd_sock); ++ return DEFER; ++ }; ++ } + +- /* send our request */ +- if (send(spamd_sock, spamd_buffer, Ustrlen(spamd_buffer), 0) < 0) { +- (void)close(spamd_sock); +- log_write(0, LOG_MAIN|LOG_PANIC, +- "spam acl condition: spamd send failed: %s", strerror(errno)); +- (void)fclose(mbox_file); +- (void)close(spamd_sock); +- return DEFER; +- }; + + /* now send the file */ + /* spamd sometimes accepts conections but doesn't read data off +@@ -349,60 +427,93 @@ + /* reading done */ + (void)close(spamd_sock); + +- /* dig in the spamd output and put the report in a multiline header, if requested */ +- if( sscanf(CS spamd_buffer,"SPAMD/%7s 0 EX_OK\r\nContent-length: %*u\r\n\r\n%lf/%lf\r\n%n", +- spamd_version,&spamd_score,&spamd_threshold,&spamd_report_offset) != 3 ) { +- +- /* try to fall back to pre-2.50 spamd output */ +- if( sscanf(CS spamd_buffer,"SPAMD/%7s 0 EX_OK\r\nSpam: %*s ; %lf / %lf\r\n\r\n%n", +- spamd_version,&spamd_score,&spamd_threshold,&spamd_report_offset) != 3 ) { ++ if (!is_rspamd) { ++ /* dig in the spamd output and put the report in a multiline header, if requested */ ++ if( sscanf(CS spamd_buffer,"SPAMD/%7s 0 EX_OK\r\nContent-length: %*u\r\n\r\n%lf/%lf\r\n%n", ++ spamd_version,&spamd_score,&spamd_threshold,&spamd_report_offset) != 3 ) { ++ ++ /* try to fall back to pre-2.50 spamd output */ ++ if( sscanf(CS spamd_buffer,"SPAMD/%7s 0 EX_OK\r\nSpam: %*s ; %lf / %lf\r\n\r\n%n", ++ spamd_version,&spamd_score,&spamd_threshold,&spamd_report_offset) != 3 ) { ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: cannot parse spamd output"); ++ return DEFER; ++ }; ++ }; ++ ++ if( spamd_score >= spamd_threshold ) { ++ Ustrcpy(spam_action_buffer, "reject"); ++ } ++ else { ++ Ustrcpy(spam_action_buffer, "no action"); ++ } ++ } ++ else { ++ /* rspamd variant of reply */ ++ int r; ++ if( (r = sscanf(CS spamd_buffer,"RSPAMD/%7s 0 EX_OK\r\nMetric: default; %7s %lf / %lf / %lf\r\n%n", ++ spamd_version,spamd_short_result,&spamd_score,&spamd_threshold,&spamd_reject_score,&spamd_report_offset)) != 5 ) { + log_write(0, LOG_MAIN|LOG_PANIC, +- "spam acl condition: cannot parse spamd output"); ++ "spam acl condition: cannot parse spamd output: %d", r); + return DEFER; + }; +- }; ++ /* now parse action */ ++ p = &spamd_buffer[spamd_report_offset]; ++ ++ if( Ustrncmp(p, "Action: ", sizeof("Action: ") - 1) == 0 ) { ++ p += sizeof("Action: ") - 1; ++ q = &spam_action_buffer[0]; ++ while (*p && *p != '\r' && (q - spam_action_buffer) < sizeof(spam_action_buffer) - 1) { ++ *q++ = *p++; ++ } ++ *q = '\0'; ++ } ++ } + + /* Create report. Since this is a multiline string, + we must hack it into shape first */ + p = &spamd_buffer[spamd_report_offset]; + q = spam_report_buffer; + while (*p != '\0') { +- /* skip \r */ +- if (*p == '\r') { +- p++; +- continue; +- }; +- *q = *p; +- q++; +- if (*p == '\n') { +- /* add an extra space after the newline to ensure +- that it is treated as a header continuation line */ +- *q = ' '; +- q++; +- }; +- p++; ++ /* skip \r */ ++ if (*p == '\r') { ++ p++; ++ continue; ++ }; ++ *q = *p; ++ q++; ++ if (*p == '\n') { ++ /* add an extra space after the newline to ensure ++ that it is treated as a header continuation line */ ++ *q = ' '; ++ q++; ++ }; ++ p++; + }; + /* NULL-terminate */ + *q = '\0'; + q--; + /* cut off trailing leftovers */ + while (*q <= ' ') { +- *q = '\0'; +- q--; ++ *q = '\0'; ++ q--; + }; ++ ++ /* common spamd actions */ + spam_report = spam_report_buffer; ++ spam_action = spam_action_buffer; + + /* create spam bar */ + spamd_score_char = spamd_score > 0 ? '+' : '-'; + j = abs((int)(spamd_score)); + i = 0; + if( j != 0 ) { +- while((i < j) && (i <= MAX_SPAM_BAR_CHARS)) +- spam_bar_buffer[i++] = spamd_score_char; ++ while((i < j) && (i <= MAX_SPAM_BAR_CHARS)) ++ spam_bar_buffer[i++] = spamd_score_char; + } + else{ +- spam_bar_buffer[0] = '/'; +- i = 1; ++ spam_bar_buffer[0] = '/'; ++ i = 1; + } + spam_bar_buffer[i] = '\0'; + spam_bar = spam_bar_buffer; +@@ -418,12 +529,12 @@ + + /* compare threshold against score */ + if (spamd_score >= spamd_threshold) { +- /* spam as determined by user's threshold */ +- spam_rc = OK; ++ /* spam as determined by user's threshold */ ++ spam_rc = OK; + } + else { +- /* not spam */ +- spam_rc = FAIL; ++ /* not spam */ ++ spam_rc = FAIL; + }; + + /* remember expanded spamd_address if needed */ +@@ -443,4 +554,126 @@ + }; + } + ++#ifdef __GNUC__ ++static int ++spam_push_line(struct iovec *iov, const int i, const char *fmt, ...) __attribute__ ((format (printf, 3, 4))); ++#endif ++static int ++spam_push_line(struct iovec *iov, const int i, const char *fmt, ...) ++{ ++ va_list ap; ++ size_t len; ++ char buf[512]; ++ ++ va_start(ap, fmt); ++ len = vsnprintf(buf, sizeof(buf), fmt, ap); ++ va_end(ap); ++ ++ iov[i].iov_base = string_copy(US buf); ++ iov[i].iov_len = len; ++ ++ if (len >= sizeof(buf)) { ++ log_write(0, LOG_MAIN, "rspam: error, string was longer than %d", (int)sizeof(buf)); ++ return (-1); ++ } ++ ++ return 0; ++} ++ ++static int ++spam_write_vector(int sock, size_t size, struct iovec *iov, time_t start) ++{ ++ int r, i; ++ ++ for (;;) { ++ if (spam_poll_socket(sock, start) == -1) { ++ return -1; ++ } ++ r = writev(sock, iov, size); ++ if (r == -1) { ++ if (errno == EINTR) ++ continue; ++ ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: %s on spamd socket", strerror(errno)); ++ return -1; ++ } ++ else { ++ /* check for partial writev */ ++ for (i = 0; i < size; i ++) { ++ if (r >= iov[i].iov_len) { ++ r -= iov[i].iov_len; ++ } ++ else { ++ /* partial iov write */ ++ iov[i].iov_base += r; ++ break; ++ } ++ if (r == 0) ++ break; ++ } ++ ++ if (i == size - 1 && r == 0) { ++ /* we have written everything */ ++ break; ++ } ++ else { ++ /* move iov to the last unreaded element */ ++ iov = &iov[i]; ++ size -= i; ++ } ++ } ++ } ++ ++ return 0; ++ ++} ++ ++static int ++spam_poll_socket (int sock, time_t start) ++{ ++#ifndef NO_POLL_H ++ struct pollfd pollfd; ++#else /* Patch posted by Erik ? for OS X */ ++ struct timeval select_tv; /* and applied by PH */ ++ fd_set select_fd; ++#endif ++ int r; ++ ++#ifndef NO_POLL_H ++ pollfd.fd = sock; ++ pollfd.events = POLLOUT; ++#endif ++ for (;;) { ++#ifndef NO_POLL_H ++ r = poll(&pollfd, 1, 1000); ++ ++/* Patch posted by Erik ? for OS X and applied by PH */ ++#else ++ select_tv.tv_sec = 1; ++ select_tv.tv_usec = 0; ++ FD_ZERO(&select_fd); ++ FD_SET(sock, &select_fd); ++ r = select(sock+1, NULL, &select_fd, NULL, &select_tv); ++#endif ++/* End Erik's patch */ ++ ++ if (r == -1 && errno == EINTR) ++ continue; ++ else if (r < 1) { ++ if (r == -1) ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: %s on spamd socket", strerror(errno)); ++ else { ++ if (time(NULL) - start < SPAMD_TIMEOUT) ++ continue; ++ ++ log_write(0, LOG_MAIN|LOG_PANIC, ++ "spam acl condition: timed out writing spamd socket"); ++ } ++ } ++ return r; ++ } ++} ++ + #endif +diff -ruN src/spam.h src/spam.h +--- src/spam.h 2015-01-16 15:21:40.000000000 +0200 ++++ src/spam.h 2015-01-16 15:21:51.000000000 +0200 +@@ -22,7 +22,8 @@ + + typedef struct spamd_address_container { + uschar tcp_addr[24]; +- unsigned int tcp_port; ++ unsigned short int tcp_port; ++ unsigned is_rspamd:1; + } spamd_address_container; + + #endif Modified: head/mail/exim/options ============================================================================== --- head/mail/exim/options Fri Jan 16 13:46:16 2015 (r377173) +++ head/mail/exim/options Fri Jan 16 14:19:32 2015 (r377174) @@ -62,7 +62,7 @@ OPTIONS_GROUP_LOOKUP= CDB BDB DNSDB DSEA LOOKUP_DESC= Lookup support OPTIONS_GROUP_STORAGE= MAILDIR MAILSTORE MBX STORAGE_DESC= Supported storage formats -OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN EVENT PROXY SPF +OPTIONS_GROUP_EXPERIMENTAL= CERTNAMES DANE DCC DMARC DSN EVENT PROXY SPF RSPAMD EXPERIMENTAL_DESC= Experimental options OPTIONS_GROUP= AUTH LOOKUP STORAGE EXPERIMENTAL @@ -112,6 +112,7 @@ REDIS_DESC= Enable redis lookups (exper SASLAUTHD_DESC= Enable use of Cyrus SASL auth daemon SA_EXIM_DESC= Build with Spamassassin local scan SPF_DESC= Enable Sender Policy Framework checking +RSPAMD_DESC= Build with Rspamd support SQLITE_DESC= Enable SQLite lookups SRS_DESC= Enable Sender Rewriting Scheme SUID_DESC= Install the exim binary suid root
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501161419.t0GEJXdC087060>