- updated to 2.12.1, partial PLD merge master
authorMarcin Krol <hawk@tld-linux.org>
Sun, 24 Jan 2021 20:28:54 +0000 (21:28 +0100)
committerMarcin Krol <hawk@tld-linux.org>
Sun, 24 Jan 2021 20:28:54 +0000 (21:28 +0100)
amavisd-new-config.patch
amavisd-new-tools-dbdir.patch
amavisd-new.init [changed mode: 0644->0755]
amavisd-new.spec

index 5b739cb029a0b7a7da36bcd28b960fcd3735264a..14a02572a174602822da6557ed3de1a1e7cea46c 100644 (file)
@@ -1,7 +1,7 @@
-diff -urp amavisd-new-2.11.0.orig/amavisd.conf amavisd-new-2.11.0/amavisd.conf
---- amavisd-new-2.11.0.orig/amavisd.conf       2016-04-26 19:24:26.000000000 +0000
-+++ amavisd-new-2.11.0/amavisd.conf    2016-08-18 08:17:22.756554000 +0000
-@@ -10,29 +10,29 @@ use strict;
+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
@@ -9,6 +9,9 @@ diff -urp amavisd-new-2.11.0.orig/amavisd.conf amavisd-new-2.11.0/amavisd.conf
 +@bypass_spam_checks_maps  = (1);  # controls running of anti-spam code
  # $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
  
+ # $myprogram_name = $0; # set to 'amavisd' or similar to avoid process name
+                         # truncation in /proc/<pid>/stat and ps -e output
  $max_servers = 2;            # num of pre-forked children (2..30 is common), -m
 -$daemon_user  = 'vscan';     # (no default;  customary: vscan or amavis), -u
 -$daemon_group = 'vscan';     # (no default;  customary: vscan or amavis), -g
@@ -40,7 +43,7 @@ diff -urp amavisd-new-2.11.0.orig/amavisd.conf amavisd-new-2.11.0/amavisd.conf
  #NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
  
  $log_level = 0;              # verbosity 0..5, -d
-@@ -52,7 +52,8 @@ $enable_dkim_signing = 1;    # load DKIM
+@@ -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 );
  
@@ -50,7 +53,7 @@ diff -urp amavisd-new-2.11.0.orig/amavisd.conf amavisd-new-2.11.0/amavisd.conf
                 # option(s) -p overrides $inet_socket_port and $unix_socketname
  
  $inet_socket_port = 10024;   # listen on this local TCP port(s)
-@@ -379,16 +380,15 @@ $banned_filename_re = new_RE(
+@@ -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
  
@@ -76,7 +79,7 @@ diff -urp amavisd-new-2.11.0.orig/amavisd.conf amavisd-new-2.11.0/amavisd.conf
  
  # ### http://www.clamav.net/ and CPAN  (memory-hungry! clamd is preferred)
  # # note that Mail::ClamAV requires perl to be build with threading!
-@@ -577,16 +577,21 @@ $banned_filename_re = new_RE(
+@@ -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
  
index cf4701afe716e595fe134c076dc73d8bf4315f1c..4fe74d1c77cfbca566c6ede885fb0dbe8943e7d2 100644 (file)
@@ -1,6 +1,6 @@
-diff -urp amavisd-new-2.11.0.orig/amavisd-agent amavisd-new-2.11.0/amavisd-agent
---- amavisd-new-2.11.0.orig/amavisd-agent      2014-01-27 18:33:06.000000000 +0000
-+++ amavisd-new-2.11.0/amavisd-agent   2016-08-18 08:18:28.740554000 +0000
+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';
@@ -10,9 +10,9 @@ diff -urp amavisd-new-2.11.0.orig/amavisd-agent amavisd-new-2.11.0/amavisd-agent
  
  my($wakeuptime) = 10;  # -w, sleep time in seconds, may be fractional
  my($repeatcount);      # -c, repeat count (when defined)
-diff -urp amavisd-new-2.11.0.orig/amavisd-nanny amavisd-new-2.11.0/amavisd-nanny
---- amavisd-new-2.11.0.orig/amavisd-nanny      2014-01-27 18:33:58.000000000 +0000
-+++ amavisd-new-2.11.0/amavisd-nanny   2016-08-18 08:18:28.740554000 +0000
+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';
old mode 100644 (file)
new mode 100755 (executable)
index 8e57baa7b19c94022620b2f2157a3903ded4b247..c987456144b081df2f9bef74bb0b3b73b2250742 100644 (file)
@@ -1,23 +1,23 @@
 # TODO:
+# - consider following upstream and renaming to amavis
 # - Add polish info mail templates
 # - move amavis part of tmpwatch configuration from tmpwatch.spec
 #
-%include       /usr/lib/rpm/macros.perl
 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.11.0
+Version:       2.12.1
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Applications/Mail
-Source0:       http://www.ijs.si/software/amavisd/%{name}-%{version}.tar.xz
-# Source0-md5: 4642d63c5d3f0daafbcacb9bb553e6f3
+Source0:       https://gitlab.com/amavis/amavis/-/archive/v%{version}/amavis-v%{version}.tar.bz2
+# Source0-md5: bf62d0331f6bf11e2873be798dc26276
 Source1:       %{name}.init
 Source3:       %{name}.tmpwatch
 Patch0:                %{name}-config.patch
 Patch1:                %{name}-tools-dbdir.patch
-URL:           http://www.ijs.si/software/amavisd/
+URL:           https://gitlab.com/amavis/amavis/
 BuildRequires: rpm-perlprov
 BuildRequires: rpmbuild(macros) >= 1.671
 BuildRequires: tar >= 1:1.22
@@ -69,10 +69,12 @@ Suggests:   unarj
 #Suggests:     perl-IO-Socket-INET6
 # required when doing SQL lookups
 Suggests:      p0f
+Suggests:      perl-Crypt-OpenSSL-RSA
 #Suggests:     perl-DBD-mysql
 Suggests:      perl-Digest-MD5
 Suggests:      perl-Mail-DKIM >= 0.31
 Suggests:      perl-Mail-SpamAssassin > 3.3.0
+Suggests:      perl-Net-DNS
 Suggests:      perl-Razor
 Suggests:      perl-SAVI
 Suggests:      perl-ldap
@@ -117,6 +119,9 @@ Summary:    Amavisd-new LDAP schema
 Summary(pl.UTF-8):     Schemat LDAP dla amavisd-new
 Group:         Networking/Daemons
 Requires:      openldap-servers
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n openldap-schema-amavisd-new
 This package contains LDAP schema for use with amavisd-new.
@@ -125,7 +130,7 @@ This package contains LDAP schema for use with amavisd-new.
 Ten pakiet zawiera schemat LDAP do używania z amavisd-new.
 
 %prep
-%setup -q
+%setup -q -n amavis-v%{version}
 %patch0 -p1
 %patch1 -p1