.tito/packages/smeserver-zabbix-agent

@@ -1 +1 @@
-0.4.8-1 ./
+0.4.7-1 ./

root/var/lib/zabbix/bin/util_parse_mail_in

@@ -87,8 +87,8 @@ while (<STDIN>) {
         next;
     }
 
-    # Queued, not tagged as spam (or spam filtering disabled), those are the clean emails
-    elsif ($line =~ m/queued\s+<.*>(\s+No,\s+(score|hits)=.+)?/){
+    # Queued, not tagged as spam, those are the clean emails
+    elsif ($line =~ m/queued\s+<.*>\s+No,\s+(score|hits)=/){
         $cnt{queued}++;
         next;
     }

smeserver-zabbix-agent.spec

@@ -1,6 +1,6 @@
 Summary: sme server integration of zabbix agent
 Name: smeserver-zabbix-agent
-Version: 0.4.8
+Version: 0.4.7
 Release: 1%{?dist}
 License: GNU GPL version 2
 URL: http://www.zabbix.com/
@@ -27,10 +27,6 @@ Zabbix is an entreprise-class open source distributed monitoring
 solution
 
 %changelog
-* Fri May 29 2020 Daniel Berteaud <daniel@firewall-services.com> 0.4.8-1
-- Adapt regex to match queued emails when spam filtering is disabled
-  (daniel@firewall-services.com)
-
 * Thu Feb 27 2020 Daniel Berteaud <daniel@firewall-services.com> 0.4.7-1
 - Rewrite util_send_status_mail to go through the SMTP server (daniel@firewall-
   services.com)