From 167d3ce4dea1427852022158f8c339b77b1cf12c Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 3 Apr 2022 12:51:46 +0200 Subject: [PATCH] - updated to 2.12.2 --- amavisd-new-config.patch | 15 ++++++++------- amavisd-new-tools-dbdir.patch | 15 ++++++++------- amavisd-new.spec | 5 +++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/amavisd-new-config.patch b/amavisd-new-config.patch index 667308c..14a0257 100644 --- a/amavisd-new-config.patch +++ b/amavisd-new-config.patch @@ -1,6 +1,7 @@ ---- amavisd-new-2.7.0/amavisd.conf~ 2011-07-01 19:21:01.000000000 +0300 -+++ amavisd-new-2.7.0/amavisd.conf 2011-08-08 13:03:11.992905314 +0300 -@@ -10,32 +10,32 @@ +diff -urp amavis-v2.12.1.orig/amavisd.conf amavis-v2.12.1/amavisd.conf +--- amavis-v2.12.1.orig/amavisd.conf 2020-11-13 13:55:37.000000000 +0100 ++++ amavis-v2.12.1/amavisd.conf 2021-01-24 21:25:54.841592502 +0100 +@@ -10,32 +10,32 @@ use strict; # COMMONLY ADJUSTED SETTINGS: # @bypass_virus_checks_maps = (1); # controls running of anti-virus code @@ -42,7 +43,7 @@ #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually $log_level = 0; # verbosity 0..5, -d -@@ -51,7 +51,8 @@ +@@ -55,7 +55,8 @@ $enable_dkim_signing = 1; # load DKIM @mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 ); @@ -52,8 +53,8 @@ # option(s) -p overrides $inet_socket_port and $unix_socketname $inet_socket_port = 10024; # listen on this local TCP port(s) -@@ -370,16 +371,15 @@ - # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m +@@ -382,16 +383,15 @@ $banned_filename_re = new_RE( + # qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ], # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1 -# ### http://www.clamav.net/ @@ -78,7 +79,7 @@ # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) # # note that Mail::ClamAV requires perl to be build with threading! -@@ -566,16 +566,21 @@ +@@ -580,16 +580,21 @@ $banned_filename_re = new_RE( # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783 diff --git a/amavisd-new-tools-dbdir.patch b/amavisd-new-tools-dbdir.patch index b60072a..4fe74d1 100644 --- a/amavisd-new-tools-dbdir.patch +++ b/amavisd-new-tools-dbdir.patch @@ -1,6 +1,7 @@ ---- amavisd-new-2.6.0/amavisd-agent.orig 2008-04-10 21:47:12.000000000 +0300 -+++ amavisd-new-2.6.0/amavisd-agent 2008-05-07 13:48:25.000000000 +0300 -@@ -50,7 +50,7 @@ +diff -urp amavis-v2.12.1.orig/amavisd-agent amavis-v2.12.1/amavisd-agent +--- amavis-v2.12.1.orig/amavisd-agent 2020-11-13 13:55:37.000000000 +0100 ++++ amavis-v2.12.1/amavisd-agent 2021-01-24 21:28:13.409592502 +0100 +@@ -53,7 +53,7 @@ use BerkeleyDB; my($dbfile) = 'snmp.db'; my($db_home) = # DB databases directory @@ -9,9 +10,10 @@ my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional my($repeatcount); # -c, repeat count (when defined) ---- amavisd-new-2.6.0/amavisd-nanny.orig 2008-03-29 00:55:02.000000000 +0200 -+++ amavisd-new-2.6.0/amavisd-nanny 2008-05-07 13:49:19.000000000 +0300 -@@ -58,7 +58,7 @@ +diff -urp amavis-v2.12.1.orig/amavisd-nanny amavis-v2.12.1/amavisd-nanny +--- amavis-v2.12.1.orig/amavisd-nanny 2020-11-13 13:55:37.000000000 +0100 ++++ amavis-v2.12.1/amavisd-nanny 2021-01-24 21:28:13.409592502 +0100 +@@ -61,7 +61,7 @@ my($activettl) = 10*60; # stuck active c my($dbfile) = 'nanny.db'; my($db_home) = # DB databases directory @@ -20,4 +22,3 @@ my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional my($repeatcount); # -c, repeat count (when defined) - diff --git a/amavisd-new.spec b/amavisd-new.spec index b9130f0..35b324e 100644 --- a/amavisd-new.spec +++ b/amavisd-new.spec @@ -3,16 +3,17 @@ # - Add polish info mail templates # - move amavis part of tmpwatch configuration from tmpwatch.spec # +%define _debugsource_packages 0 Summary: A Mail Virus Scanner with SpamAssassin support - daemon Summary(pl.UTF-8): Antywirusowy skaner poczty elektronicznej z obsługą SpamAssasina - demon Name: amavisd-new -Version: 2.12.0 +Version: 2.12.2 Release: 1 Epoch: 1 License: GPL Group: Applications/Mail Source0: https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2 -# Source0-md5: 67cdd043d5d7046ec5995564444ec10f +# Source0-md5: d2ccce027ff4e8502326638e9ef2142b Source1: %{name}.init Source2: %{name}.tmpfiles Source3: %{name}.tmpwatch -- 2.44.0