From 5afa6aa06ca3d9868ca92e0388ab92d7bc78009c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Fri, 11 Jan 2019 21:25:05 +0000 Subject: [PATCH] - updated to 0.4.0, note: some options from patches are now merged but use different switches --- spamass-milter-authuser.patch | 91 ---------- spamass-milter-bits.patch | 289 -------------------------------- spamass-milter-group.patch | 66 +++----- spamass-milter-ipv6.patch | 297 --------------------------------- spamass-milter-rcvd.patch | 8 +- spamass-milter-rejectmsg.patch | 58 ------- spamass-milter-syntax.patch | 248 --------------------------- spamass-milter.spec | 20 +-- 8 files changed, 30 insertions(+), 1047 deletions(-) delete mode 100644 spamass-milter-authuser.patch delete mode 100644 spamass-milter-bits.patch delete mode 100644 spamass-milter-ipv6.patch delete mode 100644 spamass-milter-rejectmsg.patch delete mode 100644 spamass-milter-syntax.patch diff --git a/spamass-milter-authuser.patch b/spamass-milter-authuser.patch deleted file mode 100644 index 7d3c7c5..0000000 --- a/spamass-milter-authuser.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -up spamass-milter-0.3.1/spamass-milter.cpp.authuser spamass-milter-0.3.1/spamass-milter.cpp ---- spamass-milter-0.3.1/spamass-milter.cpp.authuser 2010-03-23 21:04:56.976920217 +0000 -+++ spamass-milter-0.3.1/spamass-milter.cpp 2010-03-23 21:07:12.508020535 +0000 -@@ -172,6 +172,7 @@ char *spambucket; - bool flag_full_email = false; /* pass full email address to spamc */ - bool flag_expand = false; /* alias/virtusertable expansion */ - bool warnedmacro = false; /* have we logged that we couldn't fetch a macro? */ -+bool ignore_authenticated_senders = false; /* authenticated users bypass spam checks */ - - // {{{ main() - -@@ -179,7 +180,7 @@ int - main(int argc, char* argv[]) - { - int c, err = 0; -- const char *args = "fd:mMp:P:r:u:D:i:b:B:e:x"; -+ const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:x"; - char *sock = NULL; - bool dofork = false; - char *pidfilename = NULL; -@@ -211,6 +212,10 @@ main(int argc, char* argv[]) - debug(D_MISC, "Parsing ignore list"); - parse_networklist(optarg, &ignorenets); - break; -+ case 'I': -+ debug(D_MISC, "Ignore authenticated senders"); -+ ignore_authenticated_senders = true; -+ break; - case 'm': - dontmodifyspam = true; - smfilter.xxfi_flags &= ~SMFIF_CHGBODY; -@@ -278,7 +283,7 @@ main(int argc, char* argv[]) - cout << PACKAGE_NAME << " - Version " << PACKAGE_VERSION << endl; - cout << "SpamAssassin Sendmail Milter Plugin" << endl; - cout << "Usage: spamass-milter -p socket [-b|-B bucket] [-d xx[,yy...]] [-D host]" << endl; -- cout << " [-e defaultdomain] [-f] [-i networks] [-m] [-M]" << endl; -+ cout << " [-e defaultdomain] [-f] [-i networks] [-I] [-m] [-M]" << endl; - cout << " [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl; - cout << " [-- spamc args ]" << endl; - cout << " -p socket: path to create socket" << endl; -@@ -292,6 +297,7 @@ main(int argc, char* argv[]) - cout << " -f: fork into background" << endl; - cout << " -i: skip (ignore) checks from these IPs or netblocks" << endl; - cout << " example: -i 192.168.12.5,10.0.0.0/8,172.16.0.0/255.255.0.0" << endl; -+ cout << " -I: skip (ignore) checks if sender is authenticated" << endl; - cout << " -m: don't modify body, Content-type: or Subject:" << endl; - cout << " -M: don't modify the message at all" << endl; - cout << " -P pidfile: Put processid in pidfile" << endl; -@@ -746,6 +752,22 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - } - /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */ - -+ if (ignore_authenticated_senders) -+ { -+ char *auth_authen; -+ -+ auth_authen = smfi_getsymval(ctx, const_cast("{auth_authen}")); -+ debug(D_MISC, "auth_authen=%s", auth_authen ?: ""); -+ -+ if (auth_authen) -+ { -+ debug(D_MISC, "sender authenticated (%s) - accepting message", -+ auth_authen); -+ debug(D_FUNC, "mlfi_envfrom: exit ignore"); -+ return SMFIS_ACCEPT; -+ } -+ } -+ - debug(D_FUNC, "mlfi_envfrom: enter"); - try { - // launch new SpamAssassin -diff -up spamass-milter-0.3.1/spamass-milter.1.in.authuser spamass-milter-0.3.1/spamass-milter.1.in ---- spamass-milter-0.3.1/spamass-milter.1.in.authuser 2004-03-18 18:37:08.000000000 +0000 -+++ spamass-milter-0.3.1/spamass-milter.1.in 2010-03-23 21:06:27.148897685 +0000 -@@ -14,6 +14,7 @@ - .Op Fl e Ar defaultdomain - .Op Fl f - .Op Fl i Ar networks -+.Op Fl I - .Op Fl m - .Op Fl M - .Op Fl P Ar pidfile -@@ -119,6 +120,8 @@ Multiple - flags will append to the list. - For example, if you list all your internal networks, no outgoing emails - will be filtered. -+.It Fl I -+Ignores messages if the sender has authenticated via SMTP AUTH. - .It Fl m - Disables modification of the - .Ql Subject: diff --git a/spamass-milter-bits.patch b/spamass-milter-bits.patch deleted file mode 100644 index 8b1cc75..0000000 --- a/spamass-milter-bits.patch +++ /dev/null @@ -1,289 +0,0 @@ -Add authenticated bits information into the dummy generated -Received-header for SpamAssassin to facilitate adding a rule -to score mail from authenticated clients. - -Discussion: -http://bugzilla.redhat.com/496769 -http://www.gossamer-threads.com/lists/spamassassin/users/146948 - -This patch also moves some of the macro collection to the -ENVFROM callback, where the required macros are available by default. - -diff -up spamass-milter-0.3.2/README.bits spamass-milter-0.3.2/README ---- spamass-milter-0.3.2/README.bits 2008-04-23 17:11:42.000000000 +0100 -+++ spamass-milter-0.3.2/README 2011-02-15 11:02:47.877271392 +0000 -@@ -55,15 +55,26 @@ configuring sendmail through m4 & the se - adding the lines - - INPUT_MAIL_FILTER(`spamassassin', `S=local:/var/run/sendmail/spamass.sock, F=, T=C:15m;S:4m;R:4m;E:10m')dnl --define(`confMILTER_MACROS_CONNECT',`t, b, j, _, {daemon_name}, {if_name}, {if_addr}')dnl --define(`confMILTER_MACROS_HELO',`s, {tls_version}, {cipher}, {cipher_bits}, {cert_subject}, {cert_issuer}')dnl --define(`confMILTER_MACROS_ENVRCPT',`r, v, Z')dnl -+define(`confMILTER_MACROS_ENVRCPT',confMILTER_MACROS_ENVRCPT`, b, r, v, Z')dnl - - should do the trick. Of course you need to modify the path of the - socket if you put another one into the startup script. The timeouts - have been increased somewhat because SpamAssassin may chew on it for a - little while on a slow machine. - -+If you are using multiple milter mail filters on your mail server, you may -+have overridden the default values of some of the confMILTER_MACROS_* -+macros whilst configuring the other filters. You need to ensure that at -+least the following values are present: -+ -+confMILTER_MACROS_CONNECT must include the {j} and {_} macros -+(all included by default) -+ -+confMILTER_MACROS_ENVFROM must include the {i}, {auth_authen} and {auth_ssf} -+macros (all included by default) -+ -+confMILTER_MACROS_ENVRCPT must include the {b}, {r}, {v}, and {Z} macros -+ - Now recreate sendmail.cf, restart sendmail and experiment around a bit - with the setup to make sure it is working. - -diff -up spamass-milter-0.3.2/spamass-milter.cpp.bits spamass-milter-0.3.2/spamass-milter.cpp ---- spamass-milter-0.3.2/spamass-milter.cpp.bits 2011-02-15 10:53:49.349259089 +0000 -+++ spamass-milter-0.3.2/spamass-milter.cpp 2011-02-15 10:53:49.353259721 +0000 -@@ -678,6 +678,7 @@ sfsistat - mlfi_connect(SMFICTX * ctx, char *hostname, _SOCK_ADDR * hostaddr) - { - struct context *sctx; -+ const char *macro_j, *macro__; - int rv; - - debug(D_FUNC, "mlfi_connect: enter"); -@@ -695,8 +696,31 @@ mlfi_connect(SMFICTX * ctx, char *hostna - } - sctx->assassin = NULL; - sctx->helo = NULL; -- -- /* store a pointer to it with setpriv */ -+ sctx->our_fqdn = NULL; -+ sctx->sender_address = NULL; -+ sctx->queueid = NULL; -+ sctx->auth_authen = NULL; -+ sctx->auth_ssf = NULL; -+ -+ /* store our FQDN */ -+ macro_j = smfi_getsymval(ctx, const_cast("j")); -+ if (!macro_j) -+ { -+ macro_j = "localhost"; -+ warnmacro("j", "CONNECT"); -+ } -+ sctx->our_fqdn = strdup(macro_j); -+ -+ /* store the validated sending site's address */ -+ macro__ = smfi_getsymval(ctx, const_cast("_")); -+ if (!macro__) -+ { -+ macro__ = "unknown"; -+ warnmacro("_", "CONNECT"); -+ } -+ sctx->sender_address = strdup(macro__); -+ -+ /* store a pointer to our private data with setpriv */ - rv = smfi_setpriv(ctx, sctx); - if (rv != MI_SUCCESS) - { -@@ -745,7 +769,7 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - { - SpamAssassin* assassin; - struct context *sctx = (struct context *)smfi_getpriv(ctx); -- const char *queueid; -+ const char *queueid, *macro_auth_ssf, *macro_auth_authen; - - if (sctx == NULL) - { -@@ -787,17 +811,44 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - - // remember the MAIL FROM address - assassin->set_from(string(envfrom[0])); -- -+ -+ // remember the queueid for this message - queueid=smfi_getsymval(ctx, const_cast("i")); - if (!queueid) - { - queueid="unknown"; - warnmacro("i", "ENVFROM"); - } -- assassin->queueid = queueid; -- -+ sctx->queueid = strdup(queueid); - debug(D_MISC, "queueid=%s", queueid); - -+ // remember the SMTP AUTH login name -+ macro_auth_authen = smfi_getsymval(ctx, const_cast("{auth_authen}")); -+ if (!macro_auth_authen) -+ { -+ macro_auth_authen = ""; -+ // Don't issue a warning for the auth_authen macro as -+ // it is likely to be unset much of the time - it's -+ // only set if the client has authenticated. -+ // -+ // Similarly, we only issue warnings for the other -+ // auth-related macros if {auth_authen) is available. -+ // -+ // warnmacro("auth_authen", "ENVFROM"); -+ } -+ sctx->auth_authen = strdup(macro_auth_authen); -+ -+ // remember the SASL cipher bits -+ macro_auth_ssf = smfi_getsymval(ctx, const_cast("{auth_ssf}")); -+ if (!macro_auth_ssf) -+ { -+ macro_auth_ssf = ""; -+ if (strlen(macro_auth_authen)) { -+ warnmacro("auth_ssf", "ENVFROM"); -+ } -+ } -+ sctx->auth_ssf = strdup(macro_auth_ssf); -+ - // tell Milter to continue - debug(D_FUNC, "mlfi_envfrom: exit"); - -@@ -888,7 +939,8 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - - */ - const char *macro_b, *macro_i, *macro_j, *macro_r, -- *macro_s, *macro_v, *macro_Z, *macro__; -+ *macro_s, *macro_v, *macro_Z, *macro__, -+ *macro_auth_ssf, *macro_auth_authen; - char date[32]; - - /* RFC 822 date. */ -@@ -903,20 +955,13 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* queue ID */ -- macro_i = smfi_getsymval(ctx, const_cast("i")); -- if (!macro_i) -- { -- macro_i = "unknown"; -- warnmacro("i", "ENVRCPT"); -- } -+ macro_i = sctx->queueid; - -- /* FQDN of this site */ -- macro_j = smfi_getsymval(ctx, const_cast("j")); -- if (!macro_j) -- { -- macro_j = "localhost"; -- warnmacro("j", "ENVRCPT"); -- } -+ /* FQDN */ -+ macro_j = sctx->our_fqdn; -+ -+ /* Sender address */ -+ macro__ = sctx->sender_address; - - /* Protocol used to receive the message */ - macro_r = smfi_getsymval(ctx, const_cast("r")); -@@ -925,7 +970,11 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - macro_r = "SMTP"; - warnmacro("r", "ENVRCPT"); - } -- -+ -+ /* SMTP AUTH details */ -+ macro_auth_authen = sctx->auth_authen; -+ macro_auth_ssf = sctx->auth_ssf; -+ - /* Sendmail currently cannot pass us the {s} macro, but - I do not know why. Leave this in for the day sendmail is - fixed. Until that day, use the value remembered by -@@ -953,22 +1002,25 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - warnmacro("Z", "ENVRCPT"); - } - -- /* Validated sending site's address */ -- macro__ = smfi_getsymval(ctx, const_cast("_")); -- if (!macro__) -+ assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n"); -+ assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n"); -+ -+ string rec_header; -+ -+ rec_header = (string) "Received: from " + macro_s + " (" + macro__ + ")\r\n\t"; -+ -+ if (strlen(macro_auth_ssf)) - { -- macro__ = "unknown"; -- warnmacro("_", "ENVRCPT"); -+ rec_header += (string) "(authenticated bits=" + macro_auth_ssf + ")\r\n\t"; - } - -- assassin->output((string)"X-Envelope-From: "+assassin->from()+"\r\n"); -- assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n"); -+ rec_header += (string) "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " + -+ macro_r + " id " + macro_i + ";\r\n\t" + -+ macro_b + "\r\n\t" + -+ "(envelope-from " + assassin->from() + ")\r\n"; - -- assassin->output((string) -- "Received: from "+macro_s+" ("+macro__+")\r\n\t"+ -- "by "+macro_j+" ("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+";\r\n\t"+ -- macro_b+"\r\n\t"+ -- "(envelope-from "+assassin->from()+")\r\n"); -+ debug(D_SPAMC, "Received header for spamc: %s", rec_header.c_str()); -+ assassin->output(rec_header); - - } else - assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n"); -@@ -1214,16 +1266,27 @@ mlfi_close(SMFICTX* ctx) - { - struct context *sctx; - debug(D_FUNC, "mlfi_close"); -- -+ - sctx = (struct context*)smfi_getpriv(ctx); - if (sctx == NULL) - return SMFIS_ACCEPT; - - if (sctx->helo) - free(sctx->helo); -+ if (sctx->our_fqdn) -+ free(sctx->our_fqdn); -+ if (sctx->sender_address) -+ free(sctx->sender_address); -+ if (sctx->queueid) -+ free(sctx->queueid); -+ if (sctx->auth_authen) -+ free(sctx->auth_authen); -+ if (sctx->auth_ssf) -+ free(sctx->auth_ssf); -+ - free(sctx); - smfi_setpriv(ctx, NULL); -- -+ - return SMFIS_ACCEPT; - } - -diff -up spamass-milter-0.3.2/spamass-milter.h.bits spamass-milter-0.3.2/spamass-milter.h ---- spamass-milter-0.3.2/spamass-milter.h.bits 2011-02-15 10:53:49.342257983 +0000 -+++ spamass-milter-0.3.2/spamass-milter.h 2011-02-15 10:53:49.354259879 +0000 -@@ -154,9 +154,6 @@ public: - // List of recipients after alias/virtusertable expansion - list expandedrcpt; - -- // the sendmail queue id for this message; used for logging -- string queueid; -- - // Process handling variables - pid_t pid; - int pipe_io[2][2]; -@@ -167,6 +164,11 @@ struct context - { - struct in_addr connect_ip; // remote IP address - char *helo; -+ char *our_fqdn; -+ char *sender_address; -+ char *queueid; -+ char *auth_authen; -+ char *auth_ssf; - SpamAssassin *assassin; // pointer to the SA object if we're processing a message - }; - diff --git a/spamass-milter-group.patch b/spamass-milter-group.patch index 1e2a418..c5e3b19 100644 --- a/spamass-milter-group.patch +++ b/spamass-milter-group.patch @@ -6,48 +6,48 @@ root and would otherwise be unable to use the socket). http://bugzilla.redhat.com/452248 -diff -up spamass-milter-0.3.1/spamass-milter.cpp.group spamass-milter-0.3.1/spamass-milter.cpp ---- spamass-milter-0.3.1/spamass-milter.cpp.group 2010-03-24 13:30:19.030834527 +0000 -+++ spamass-milter-0.3.1/spamass-milter.cpp 2010-03-24 13:40:54.712898107 +0000 -@@ -89,6 +89,8 @@ - #endif +diff -urNpa spamass-milter-0.4.0.orig/spamass-milter.cpp spamass-milter-0.4.0/spamass-milter.cpp +--- spamass-milter-0.4.0.orig/spamass-milter.cpp 2014-09-11 00:38:00.000000000 +0000 ++++ spamass-milter-0.4.0/spamass-milter.cpp 2019-01-11 21:15:22.855000000 +0000 +@@ -90,6 +90,8 @@ #include + #include +#include + // C++ includes #include #include -@@ -180,8 +182,9 @@ int +@@ -184,8 +186,9 @@ int main(int argc, char* argv[]) { int c, err = 0; -- const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:x"; -+ const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:"; +- const char *args = "afd:mMp:P:r:u:D:i:b:B:e:xS:R:C:"; ++ const char *args = "afd:mMp:P:r:u:D:i:b:B:e:xS:R:C:g:"; char *sock = NULL; + char *group = NULL; bool dofork = false; char *pidfilename = NULL; FILE *pidfile = NULL; -@@ -228,6 +231,9 @@ main(int argc, char* argv[]) - case 'p': - sock = strdup(optarg); - break; -+ case 'g': -+ group = strdup(optarg); -+ break; - case 'P': - pidfilename = strdup(optarg); - break; -@@ -287,6 +293,7 @@ main(int argc, char* argv[]) - cout << " [-P pidfile] [-r nn] [-u defaultuser] [-x]" << endl; +@@ -216,6 +219,9 @@ main(int argc, char* argv[]) + flag_full_email = true; + defaultdomain = strdup(optarg); + break; ++ case 'g': ++ group = strdup(optarg); ++ break; + case 'i': + debug(D_MISC, "Parsing ignore list"); + parse_networklist(optarg, &ignorenets); +@@ -301,6 +307,7 @@ main(int argc, char* argv[]) + cout << " [-C rejectcode] [ -R rejectmsg ]" << endl; cout << " [-- spamc args ]" << endl; cout << " -p socket: path to create socket" << endl; + cout << " -g group: socket group (perms to 660 as well)" << endl; cout << " -b bucket: redirect spam to this mail address. The orignal" << endl; cout << " recipient(s) will not receive anything." << endl; cout << " -B bucket: add this mail address as a BCC recipient of spam." << endl; -@@ -354,6 +361,30 @@ main(int argc, char* argv[]) +@@ -378,6 +385,30 @@ main(int argc, char* argv[]) } else { debug(D_MISC, "smfi_register succeeded"); } @@ -78,27 +78,3 @@ diff -up spamass-milter-0.3.1/spamass-milter.cpp.group spamass-milter-0.3.1/spam debug(D_ALWAYS, "spamass-milter %s starting", PACKAGE_VERSION); err = smfi_main(); debug(D_ALWAYS, "spamass-milter %s exiting", PACKAGE_VERSION); -diff -up spamass-milter-0.3.1/spamass-milter.1.in.group spamass-milter-0.3.1/spamass-milter.1.in ---- spamass-milter-0.3.1/spamass-milter.1.in.group 2010-03-24 13:30:19.026834927 +0000 -+++ spamass-milter-0.3.1/spamass-milter.1.in 2010-03-24 13:30:19.033834685 +0000 -@@ -13,6 +13,7 @@ - .Op Fl D Ar host - .Op Fl e Ar defaultdomain - .Op Fl f -+.Op Fl g Ar group - .Op Fl i Ar networks - .Op Fl I - .Op Fl m -@@ -108,6 +109,12 @@ flag. - Causes - .Nm - to fork into the background. -+.It Fl g Ar group -+Makes the socket for communication with the MTA group-writable (mode 0750) -+and sets the socket's group to -+.Ar group . -+This option is intended for use with MTA's like Postfix that do not run as -+root, and is incompatible with Sendmail usage. - .It Fl i Ar networks - Ignores messages if the originating IP is in the network(s) listed. - The message will be passed through without calling SpamAssassin at all. diff --git a/spamass-milter-ipv6.patch b/spamass-milter-ipv6.patch deleted file mode 100644 index 6fb1467..0000000 --- a/spamass-milter-ipv6.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -up spamass-milter-0.3.1/spamass-milter.cpp.ipv6 spamass-milter-0.3.1/spamass-milter.cpp ---- spamass-milter-0.3.1/spamass-milter.cpp.ipv6 2010-09-23 16:26:36.227224902 +0100 -+++ spamass-milter-0.3.1/spamass-milter.cpp 2010-09-23 17:25:22.307099331 +0100 -@@ -88,6 +88,7 @@ - #include "subst_poll.h" - #endif - #include -+#include - - #include - -@@ -718,12 +719,18 @@ mlfi_connect(SMFICTX * ctx, char *hostna - sctx = (struct context *)malloc(sizeof(*sctx)); - if (!hostaddr) - { -+ static struct sockaddr_in localhost; -+ - /* not a socket; probably a local user calling sendmail directly */ - /* set to 127.0.0.1 */ -- sctx->connect_ip.s_addr = htonl(INADDR_LOOPBACK); -+ strcpy(sctx->connect_ip, "127.0.0.1"); -+ localhost.sin_family = AF_INET; -+ localhost.sin_addr.s_addr = htonl(INADDR_LOOPBACK); -+ hostaddr = (struct sockaddr*) &localhost; - } else - { -- sctx->connect_ip = ((struct sockaddr_in *) hostaddr)->sin_addr; -+ getnameinfo(hostaddr, sizeof(struct sockaddr_in6), -+ sctx->connect_ip, 63, NULL, 0, NI_NUMERICHOST); - } - sctx->assassin = NULL; - sctx->helo = NULL; -@@ -758,12 +765,12 @@ mlfi_connect(SMFICTX * ctx, char *hostna - debug(D_ALWAYS, "smfi_setpriv failed!"); - return SMFIS_TEMPFAIL; - } -- /* debug(D_ALWAYS, "ZZZ set private context to %p", sctx); */ - -- if (ip_in_networklist(sctx->connect_ip, &ignorenets)) -+ debug(D_NET, "Checking %s against:", sctx->connect_ip); -+ if (ip_in_networklist(hostaddr, &ignorenets)) - { - debug(D_NET, "%s is in our ignore list - accepting message", -- inet_ntoa(sctx->connect_ip)); -+ sctx->connect_ip); - debug(D_FUNC, "mlfi_connect: exit ignore"); - return SMFIS_ACCEPT; - } -@@ -807,7 +814,6 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - debug(D_ALWAYS, "smfi_getpriv failed!"); - return SMFIS_TEMPFAIL; - } -- /* debug(D_ALWAYS, "ZZZ got private context %p", sctx); */ - - if (ignore_authenticated_senders) - { -@@ -835,7 +841,7 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - return SMFIS_TEMPFAIL; - }; - -- assassin->set_connectip(string(inet_ntoa(sctx->connect_ip))); -+ assassin->set_connectip(string(sctx->connect_ip)); - - // Store a pointer to the assassin object in our context struct - sctx->assassin = assassin; -@@ -2128,69 +2134,135 @@ void parse_networklist(char *string, str - { - char *tnet = strsep(&token, "/"); - char *tmask = token; -- struct in_addr net, mask; -+ struct in_addr net; -+ struct in6_addr net6; - - if (list->num_nets % 10 == 0) -- list->nets = (struct net*)realloc(list->nets, sizeof(*list->nets) * (list->num_nets + 10)); -+ list->nets = (union net*)realloc(list->nets, sizeof(*list->nets) * (list->num_nets + 10)); - -- if (!inet_aton(tnet, &net)) -+ if (inet_pton(AF_INET, tnet, &net)) - { -- fprintf(stderr, "Could not parse \"%s\" as a network\n", tnet); -- exit(1); -- } -+ struct in_addr mask; -+ -+ if (tmask) -+ { -+ if (strchr(tmask, '.') == NULL) -+ { -+ /* CIDR */ -+ unsigned int bits; -+ int ret; -+ ret = sscanf(tmask, "%u", &bits); -+ if (ret != 1 || bits > 32) -+ { -+ fprintf(stderr,"%s: bad CIDR value", tmask); -+ exit(1); -+ } -+ mask.s_addr = htonl(~((1L << (32 - bits)) - 1) & 0xffffffff); -+ } else if (!inet_pton(AF_INET6, tmask, &mask)) -+ { -+ fprintf(stderr, "Could not parse \"%s\" as a netmask\n", tmask); -+ exit(1); -+ } -+ } else -+ mask.s_addr = 0xffffffff; - -- if (tmask) -- { -- if (strchr(tmask, '.') == NULL) -+ net.s_addr = net.s_addr & mask.s_addr; -+ list->nets[list->num_nets].net4.af = AF_INET; -+ list->nets[list->num_nets].net4.network = net; -+ list->nets[list->num_nets].net4.netmask = mask; -+ } else if (inet_pton(AF_INET6, tnet, &net6)) -+ { -+ int mask; -+ -+ if (tmask) - { -- /* CIDR */ -- unsigned int bits; -- int ret; -- ret = sscanf(tmask, "%u", &bits); -- if (ret != 1 || bits > 32) -+ if (sscanf(tmask, "%d", &mask) != 1 || mask > 128) - { - fprintf(stderr,"%s: bad CIDR value", tmask); - exit(1); - } -- mask.s_addr = htonl(~((1L << (32 - bits)) - 1) & 0xffffffff); -- } else if (!inet_aton(tmask, &mask)) -- { -- fprintf(stderr, "Could not parse \"%s\" as a netmask\n", tmask); -- exit(1); -- } -+ } else -+ mask = 128; -+ -+ list->nets[list->num_nets].net6.af = AF_INET6; -+ list->nets[list->num_nets].net6.network = net6; -+ list->nets[list->num_nets].net6.netmask = mask; - } else -- mask.s_addr = 0xffffffff; -+ { -+ fprintf(stderr, "Could not parse \"%s\" as a network\n", tnet); -+ exit(1); -+ } - - { -- char *snet = strdup(inet_ntoa(net)); -- debug(D_MISC, "Adding %s/%s to network list", snet, inet_ntoa(mask)); -- free(snet); -+ int af = list->nets[list->num_nets].net.af; -+ char addrbuf[INET6_ADDRSTRLEN]; -+ char maskbuf[4]; -+ char *maskstr; -+ -+ if (af == AF_INET6) { -+ inet_ntop(af, &list->nets[list->num_nets].net6.network, -+ addrbuf, INET6_ADDRSTRLEN); -+ sprintf(maskbuf, "%d", list->nets[list->num_nets].net6.netmask); -+ maskstr = maskbuf; -+ list->nets[list->num_nets].net6.addrstr = strdup(addrbuf); -+ list->nets[list->num_nets].net6.maskstr = strdup(maskbuf); -+ } else -+ { -+ inet_ntop(af, &list->nets[list->num_nets].net4.network, -+ addrbuf, INET6_ADDRSTRLEN); -+ maskstr = inet_ntoa(list->nets[list->num_nets].net4.netmask); -+ list->nets[list->num_nets].net4.addrstr = strdup(addrbuf); -+ list->nets[list->num_nets].net4.maskstr = strdup(maskstr); -+ } -+ debug(D_MISC, "Added %s/%s to network list", addrbuf, maskstr); - } - -- net.s_addr = net.s_addr & mask.s_addr; -- list->nets[list->num_nets].network = net; -- list->nets[list->num_nets].netmask = mask; - list->num_nets++; - } - free(string); - } - --int ip_in_networklist(struct in_addr ip, struct networklist *list) -+int ip_in_networklist(struct sockaddr *addr, struct networklist *list) - { - int i; - - if (list->num_nets == 0) - return 0; -- -- debug(D_NET, "Checking %s against:", inet_ntoa(ip)); -+ - for (i = 0; i < list->num_nets; i++) - { -- debug(D_NET, "%s", inet_ntoa(list->nets[i].network)); -- debug(D_NET, "/%s", inet_ntoa(list->nets[i].netmask)); -- if ((ip.s_addr & list->nets[i].netmask.s_addr) == list->nets[i].network.s_addr) -- { -- debug(D_NET, "Hit!"); -- return 1; -+ if (list->nets[i].net.af == AF_INET && addr->sa_family == AF_INET) -+ { -+ struct in_addr ip = ((struct sockaddr_in *)addr)->sin_addr; -+ -+ debug(D_NET, "%s/%s", list->nets[i].net4.addrstr, list->nets[i].net4.maskstr); -+ if ((ip.s_addr & list->nets[i].net4.netmask.s_addr) == list->nets[i].net4.network.s_addr) -+ { -+ debug(D_NET, "Hit!"); -+ return 1; -+ } -+ } else if (list->nets[i].net.af == AF_INET6 && addr->sa_family == AF_INET6) -+ { -+ u_int8_t *ip = ((struct sockaddr_in6 *)addr)->sin6_addr.s6_addr; -+ int mask, j; -+ -+ debug(D_NET, "%s/%s", list->nets[i].net6.addrstr, list->nets[i].net6.maskstr); -+ mask = list->nets[i].net6.netmask; -+ for (j = 0; j < 16 && mask > 0; j++, mask -= 8) -+ { -+ unsigned char bytemask; -+ -+ bytemask = (mask < 8) ? ~((1L << (8 - mask)) - 1) : 0xff; -+ -+ if ((ip[j] & bytemask) != (list->nets[i].net6.network.s6_addr[j] & bytemask)) -+ break; -+ } -+ -+ if (mask <= 0) -+ { -+ debug(D_NET, "Hit!"); -+ return 1; -+ } - } - } - -diff -up spamass-milter-0.3.1/spamass-milter.h.ipv6 spamass-milter-0.3.1/spamass-milter.h ---- spamass-milter-0.3.1/spamass-milter.h.ipv6 2010-09-23 16:26:36.224160445 +0100 -+++ spamass-milter-0.3.1/spamass-milter.h 2010-09-23 17:00:16.487410690 +0100 -@@ -56,16 +56,34 @@ sfsistat mlfi_abort(SMFICTX*); - extern struct smfiDesc smfilter; - - /* struct describing a single network */ --struct net -+union net - { -- struct in_addr network; -- struct in_addr netmask; -+ struct -+ { -+ uint8_t af; -+ } net; -+ struct -+ { -+ uint8_t af; -+ struct in_addr network; -+ struct in_addr netmask; -+ char *addrstr; -+ char *maskstr; -+ } net4; -+ struct -+ { -+ uint8_t af; -+ struct in6_addr network; -+ int netmask; /* Just the number of bits for IPv6 */ -+ char *addrstr; -+ char *maskstr; -+ } net6; - }; - - /* an array of networks */ - struct networklist - { -- struct net *nets; -+ union net *nets; - int num_nets; - }; - -@@ -162,7 +180,7 @@ public: - /* Private data structure to carry per-client data between calls */ - struct context - { -- struct in_addr connect_ip; // remote IP address -+ char connect_ip[64]; // remote IP address - char *helo; - char *our_fqdn; - char *sender_address; -@@ -184,7 +202,7 @@ string::size_type find_nocase(const stri - int cmp_nocase_partial(const string&, const string&); - void closeall(int fd); - void parse_networklist(char *string, struct networklist *list); --int ip_in_networklist(struct in_addr ip, struct networklist *list); -+int ip_in_networklist(struct sockaddr *addr, struct networklist *list); - void parse_debuglevel(char* string); - char *strlwr(char *str); - void warnmacro(const char *macro, const char *scope); diff --git a/spamass-milter-rcvd.patch b/spamass-milter-rcvd.patch index 7db55b1..1cded5e 100644 --- a/spamass-milter-rcvd.patch +++ b/spamass-milter-rcvd.patch @@ -9,10 +9,10 @@ https://savannah.nongnu.org/bugs/index.php?17178 http://bugs.debian.org/510665 http://bugzilla.redhat.com/496763 -diff -up spamass-milter-0.3.2/spamass-milter.cpp.rcvd spamass-milter-0.3.2/spamass-milter.cpp ---- spamass-milter-0.3.2/spamass-milter.cpp.rcvd 2011-02-15 10:46:55.000000000 +0000 -+++ spamass-milter-0.3.2/spamass-milter.cpp 2011-02-15 10:50:25.538111680 +0000 -@@ -966,7 +966,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp +diff -urNpa spamass-milter-0.4.0.orig/spamass-milter.cpp spamass-milter-0.4.0/spamass-milter.cpp +--- spamass-milter-0.4.0.orig/spamass-milter.cpp 2014-09-11 00:38:00.000000000 +0000 ++++ spamass-milter-0.4.0/spamass-milter.cpp 2019-01-11 21:07:24.916000000 +0000 +@@ -996,7 +996,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp assassin->output((string) "Received: from "+macro_s+" ("+macro__+")\r\n\t"+ diff --git a/spamass-milter-rejectmsg.patch b/spamass-milter-rejectmsg.patch deleted file mode 100644 index 31fec5a..0000000 --- a/spamass-milter-rejectmsg.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- spamass-milter.cpp.orig 2011-07-14 21:30:24.147827542 +0200 -+++ spamass-milter.cpp 2011-07-14 21:35:35.195373664 +0200 -@@ -176,6 +176,8 @@ - bool flag_expand = false; /* alias/virtusertable expansion */ - bool warnedmacro = false; /* have we logged that we couldn't fetch a macro? */ - bool ignore_authenticated_senders = false; /* authenticated users bypass spam checks */ -+bool flag_customreject = false; -+char *reject_message; - - // {{{ main() - -@@ -183,7 +185,7 @@ - main(int argc, char* argv[]) - { - int c, err = 0; -- const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:"; -+ const char *args = "fd:mMp:P:r:u:D:i:Ib:B:e:xg:c:"; - char *sock = NULL; - char *group = NULL; - bool dofork = false; -@@ -270,6 +272,10 @@ - case 'x': - flag_expand = true; - break; -+ case 'c': -+ flag_customreject = true; -+ reject_message = strdup(optarg); -+ break; - case '?': - err = 1; - break; -@@ -314,6 +320,7 @@ - cout << " -u defaultuser: pass the recipient's username to spamc.\n" - " Uses 'defaultuser' if there are multiple recipients." << endl; - cout << " -x: pass email address through alias and virtusertable expansion." << endl; -+ cout << " -c: custom reject message." << endl; - cout << " -- spamc args: pass the remaining flags to spamc." << endl; - - exit(EX_USAGE); -@@ -487,8 +494,16 @@ - } - if (do_reject) - { -- debug(D_MISC, "Rejecting"); -- smfi_setreply(ctx, const_cast("550"), const_cast("5.7.1"), const_cast("Blocked by SpamAssassin")); -+ if (flag_customreject) -+ { -+ debug(D_MISC, "Rejecting with custom message"); -+ smfi_setreply(ctx, const_cast("550"), const_cast("5.7.1"), const_cast(reject_message)); -+ } -+ else -+ { -+ debug(D_MISC, "Rejecting"); -+ smfi_setreply(ctx, const_cast("550"), const_cast("5.7.1"), const_cast("Blocked by SpamAssassin")); -+ } - - - if (flag_bucket) diff --git a/spamass-milter-syntax.patch b/spamass-milter-syntax.patch deleted file mode 100644 index ad987b8..0000000 --- a/spamass-milter-syntax.patch +++ /dev/null @@ -1,248 +0,0 @@ -Fix compiler warnings in recent gcc versions, mainly relating to deprecated -conversions from string constants to char *. - -Most of these relate to missing "const" declarations in the libmilter API -so I just used const_cast to clear them. For non libmilter-related issues, -I tried to fix them more cleanly. - -The only other change of note is to check the result of the fwrite() -function and log a warning if all of the data wasn't written (this is in -the spambucket code). - -diff -up spamass-milter-0.3.2/spamass-milter.cpp.syntax spamass-milter-0.3.2/spamass-milter.cpp ---- spamass-milter-0.3.2/spamass-milter.cpp.syntax 2011-02-14 21:53:02.000000000 +0000 -+++ spamass-milter-0.3.2/spamass-milter.cpp 2011-02-15 10:09:59.748036059 +0000 -@@ -129,9 +129,11 @@ int daemon(int nochdir, int noclose); - - static const char Id[] = "$Id$"; - -+static char FilterName[] = "SpamAssassin"; -+ - struct smfiDesc smfilter = - { -- "SpamAssassin", // filter name -+ FilterName, // filter name - SMFI_VERSION, // version code -- leave untouched - SMFIF_ADDHDRS|SMFIF_CHGHDRS|SMFIF_CHGBODY, // flags - mlfi_connect, // info filter callback -@@ -357,7 +359,7 @@ main(int argc, char* argv[]) - // }}} - - /* Update a header if SA changes it, or add it if it is new. */ --void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, char *header ) -+void update_or_insert(SpamAssassin* assassin, SMFICTX* ctx, string oldstring, t_setter setter, const char *header ) - { - string::size_type eoh1 = assassin->d().find("\n\n"); - string::size_type eoh2 = assassin->d().find("\n\r\n"); -@@ -383,12 +385,12 @@ void update_or_insert(SpamAssassin* assa - if (oldsize > 0) - { - debug(D_UORI, "u_or_i: changing"); -- smfi_chgheader(ctx, header, 1, newstring.size() > 0 ? -+ smfi_chgheader(ctx, const_cast(header), 1, newstring.size() > 0 ? - cstr : NULL ); - } else if (newstring.size() > 0) - { - debug(D_UORI, "u_or_i: inserting"); -- smfi_addheader(ctx, header, cstr); -+ smfi_addheader(ctx, const_cast(header), cstr); - } - } else - { -@@ -448,7 +450,7 @@ assassinate(SMFICTX* ctx, SpamAssassin* - if (do_reject) - { - debug(D_MISC, "Rejecting"); -- smfi_setreply(ctx, "550", "5.7.1", "Blocked by SpamAssassin"); -+ smfi_setreply(ctx, const_cast("550"), const_cast("5.7.1"), const_cast("Blocked by SpamAssassin")); - - - if (flag_bucket) -@@ -457,14 +459,11 @@ assassinate(SMFICTX* ctx, SpamAssassin* - send another copy. The milter API will not let you send the - message AND return a failure code to the sender, so this is - the only way to do it. */ -- char *popen_argv[3]; -+ char sendmail_prog[] = SENDMAIL; -+ char * const popen_argv[3] = { sendmail_prog, spambucket, NULL }; - FILE *p; - pid_t pid; - -- popen_argv[0] = SENDMAIL; -- popen_argv[1] = spambucket; -- popen_argv[2] = NULL; -- - debug(D_COPY, "calling %s %s", SENDMAIL, spambucket); - p = popenv(popen_argv, "w", &pid); - if (!p) -@@ -473,7 +472,10 @@ assassinate(SMFICTX* ctx, SpamAssassin* - } else - { - // Send message provided by SpamAssassin -- fwrite(assassin->d().c_str(), assassin->d().size(), 1, p); -+ if (fwrite(assassin->d().c_str(), assassin->d().size(), 1, p) != 1) -+ { -+ debug(D_COPY, "fwrite incomplete (%s) when copying to spambucket", strerror(errno)); -+ } - fclose(p); p = NULL; - waitpid(pid, NULL, 0); - } -@@ -494,7 +496,7 @@ assassinate(SMFICTX* ctx, SpamAssassin* - // time. Note, this may generate multiple X-Spam-Orig-To - // headers, but that's okay. - while( !assassin->recipients.empty()) { -- if ( smfi_addheader( ctx, "X-Spam-Orig-To", (char *)assassin->recipients.front().c_str()) != MI_SUCCESS ) { -+ if ( smfi_addheader( ctx, const_cast("X-Spam-Orig-To"), (char *)assassin->recipients.front().c_str()) != MI_SUCCESS ) { - throw string( "Failed to save recipient" ); - } - -@@ -737,7 +739,7 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - { - SpamAssassin* assassin; - struct context *sctx = (struct context *)smfi_getpriv(ctx); -- char *queueid; -+ const char *queueid; - - if (sctx == NULL) - { -@@ -764,7 +766,7 @@ mlfi_envfrom(SMFICTX* ctx, char** envfro - // remember the MAIL FROM address - assassin->set_from(string(envfrom[0])); - -- queueid=smfi_getsymval(ctx,"i"); -+ queueid=smfi_getsymval(ctx, const_cast("i")); - if (!queueid) - { - queueid="unknown"; -@@ -802,14 +804,11 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - /* open a pipe to sendmail so we can do address expansion */ - - char buf[1024]; -- char *popen_argv[4]; -+ char sendmail_prog[] = SENDMAIL; -+ char sendmail_mode[] = "-bv"; -+ char * const popen_argv[4] = { sendmail_prog, sendmail_mode, envrcpt[0], NULL }; - pid_t pid; - -- popen_argv[0] = SENDMAIL; -- popen_argv[1] = "-bv"; -- popen_argv[2] = envrcpt[0]; -- popen_argv[3] = NULL; -- - debug(D_RCPT, "calling %s -bv %s", SENDMAIL, envrcpt[0]); - - p = popenv(popen_argv, "r", &pid); -@@ -871,7 +870,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - char date[32]; - - /* RFC 822 date. */ -- macro_b = smfi_getsymval(ctx, "b"); -+ macro_b = smfi_getsymval(ctx, const_cast("b")); - if (!macro_b) - { - time_t tval; -@@ -882,7 +881,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* queue ID */ -- macro_i = smfi_getsymval(ctx, "i"); -+ macro_i = smfi_getsymval(ctx, const_cast("i")); - if (!macro_i) - { - macro_i = "unknown"; -@@ -890,7 +889,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* FQDN of this site */ -- macro_j = smfi_getsymval(ctx, "j"); -+ macro_j = smfi_getsymval(ctx, const_cast("j")); - if (!macro_j) - { - macro_j = "localhost"; -@@ -898,7 +897,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* Protocol used to receive the message */ -- macro_r = smfi_getsymval(ctx, "r"); -+ macro_r = smfi_getsymval(ctx, const_cast("r")); - if (!macro_r) - { - macro_r = "SMTP"; -@@ -910,14 +909,14 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - fixed. Until that day, use the value remembered by - mlfi_helo() - */ -- macro_s = smfi_getsymval(ctx, "s"); -+ macro_s = smfi_getsymval(ctx, const_cast("s")); - if (!macro_s) - macro_s = sctx->helo; - if (!macro_s) - macro_s = "nohelo"; - - /* Sendmail binary version */ -- macro_v = smfi_getsymval(ctx, "v"); -+ macro_v = smfi_getsymval(ctx, const_cast("v")); - if (!macro_v) - { - macro_v = "8.13.0"; -@@ -925,7 +924,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* Sendmail .cf version */ -- macro_Z = smfi_getsymval(ctx, "Z"); -+ macro_Z = smfi_getsymval(ctx, const_cast("Z")); - if (!macro_Z) - { - macro_Z = "8.13.0"; -@@ -933,7 +932,7 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp - } - - /* Validated sending site's address */ -- macro__ = smfi_getsymval(ctx, "_"); -+ macro__ = smfi_getsymval(ctx, const_cast("_")); - if (!macro__) - { - macro__ = "unknown"; -@@ -1321,10 +1320,10 @@ void SpamAssassin::Connect() - // XXX arbitrary 100-argument max - int argc = 0; - char** argv = (char**) malloc(100*sizeof(char*)); -- argv[argc++] = SPAMC; -+ argv[argc++] = strdup(SPAMC); - if (flag_sniffuser) - { -- argv[argc++] = "-u"; -+ argv[argc++] = strdup("-u"); - if ( expandedrcpt.size() != 1 ) - { - // More (or less?) than one recipient, so we pass the default -@@ -1349,7 +1348,7 @@ void SpamAssassin::Connect() - } - if (spamdhost) - { -- argv[argc++] = "-d"; -+ argv[argc++] = strdup("-d"); - argv[argc++] = spamdhost; - } - if (spamc_argc) -@@ -2091,7 +2090,7 @@ char *strlwr(char *str) - } - - /* Log a message about missing milter macros, but only the first time */ --void warnmacro(char *macro, char *scope) -+void warnmacro(const char *macro, const char *scope) - { - if (warnedmacro) - return; -diff -up spamass-milter-0.3.2/spamass-milter.h.syntax spamass-milter-0.3.2/spamass-milter.h ---- spamass-milter-0.3.2/spamass-milter.h.syntax 2011-02-14 21:53:02.000000000 +0000 -+++ spamass-milter-0.3.2/spamass-milter.h 2011-02-15 10:06:33.788736593 +0000 -@@ -185,7 +185,7 @@ void parse_networklist(char *string, str - int ip_in_networklist(struct in_addr ip, struct networklist *list); - void parse_debuglevel(char* string); - char *strlwr(char *str); --void warnmacro(char *macro, char *scope); -+void warnmacro(const char *macro, const char *scope); - FILE *popenv(char *const argv[], const char *type, pid_t *pid); - - #endif diff --git a/spamass-milter.spec b/spamass-milter.spec index 771044e..f18bc7f 100644 --- a/spamass-milter.spec +++ b/spamass-milter.spec @@ -1,21 +1,16 @@ Summary: Spamassassin Milter Summary(pl.UTF-8): Milter dla Spamassassina Name: spamass-milter -Version: 0.3.2 -Release: 2 +Version: 0.4.0 +Release: 1 License: GPL Group: Daemons Source0: http://savannah.nongnu.org/download/spamass-milt/%{name}-%{version}.tar.gz -# Source0-md5: 964b011fe7d7eddfdb6d94f4767feab8 +# Source0-md5: aae2624770f5cb5a8b6484afb0fe5baa Source1: %{name}.init Source2: %{name}.sysconfig -Patch0: %{name}-syntax.patch -Patch1: %{name}-authuser.patch -Patch2: %{name}-rcvd.patch -Patch3: %{name}-bits.patch -Patch4: %{name}-group.patch -Patch5: %{name}-ipv6.patch -Patch6: %{name}-rejectmsg.patch +Patch0: %{name}-rcvd.patch +Patch1: %{name}-group.patch URL: https://savannah.nongnu.org/projects/spamass-milt/ BuildRequires: libmilter-devel BuildRequires: libstdc++-devel @@ -44,11 +39,6 @@ konfigurowalny filtr antyspamowy. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p0 %build %configure \ -- 2.44.0