From 29085d0e9482097f259e08a8dc0617b92f521b03 Mon Sep 17 00:00:00 2001 From: Nishant Limbachia Date: Tue, 25 Nov 2014 13:22:53 +0700 Subject: network/amavisd-new: Updated for version 2.10.1. Signed-off-by: Willy Sudiarto Raharjo --- network/amavisd-new/patches/amavis-mc.patch | 16 ++++++++++++++++ network/amavisd-new/patches/amavis-services.patch | 11 +++++++++++ network/amavisd-new/patches/amavisd-agent.patch | 11 +++++++++++ network/amavisd-new/patches/amavisd-nanny.patch | 11 +++++++++++ network/amavisd-new/patches/amavisd-release.patch | 11 +++++++++++ network/amavisd-new/patches/amavisd-signer.patch | 17 +++++++++++++++++ network/amavisd-new/patches/amavisd-snmp-subagent.patch | 11 +++++++++++ network/amavisd-new/patches/amavisd-submit.patch | 14 ++++++++++++++ 8 files changed, 102 insertions(+) create mode 100644 network/amavisd-new/patches/amavis-mc.patch create mode 100644 network/amavisd-new/patches/amavis-services.patch create mode 100644 network/amavisd-new/patches/amavisd-agent.patch create mode 100644 network/amavisd-new/patches/amavisd-nanny.patch create mode 100644 network/amavisd-new/patches/amavisd-release.patch create mode 100644 network/amavisd-new/patches/amavisd-signer.patch create mode 100644 network/amavisd-new/patches/amavisd-snmp-subagent.patch create mode 100644 network/amavisd-new/patches/amavisd-submit.patch (limited to 'network/amavisd-new/patches') diff --git a/network/amavisd-new/patches/amavis-mc.patch b/network/amavisd-new/patches/amavis-mc.patch new file mode 100644 index 0000000000..ee6958d903 --- /dev/null +++ b/network/amavisd-new/patches/amavis-mc.patch @@ -0,0 +1,16 @@ +--- amavis-mc.orig 2014-11-08 20:40:11.560673812 -0600 ++++ amavis-mc 2014-11-08 20:41:17.561010101 -0600 +@@ -70,10 +70,10 @@ + + ### USER CONFIGURABLE: + +-$daemon_user = 'vscan'; +-$daemon_group = 'vscan'; ++$daemon_user = 'amavis'; ++$daemon_group = 'amavis'; + +-$pid_file = '/var/amavis/amavis-mc.pid'; ++$pid_file = '/var/run/amavis/amavis-mc.pid'; + + $log_level = 0; + $syslog_ident = 'amavis-mc'; diff --git a/network/amavisd-new/patches/amavis-services.patch b/network/amavisd-new/patches/amavis-services.patch new file mode 100644 index 0000000000..1c71da09b0 --- /dev/null +++ b/network/amavisd-new/patches/amavis-services.patch @@ -0,0 +1,11 @@ +--- amavis-services.orig 2014-11-08 20:45:03.199992749 -0600 ++++ amavis-services 2014-11-08 20:45:51.805711423 -0600 +@@ -71,7 +71,7 @@ + $syslog_facility = LOG_MAIL; + $syslog_ident = $myproduct_name; + +-$MYHOME = '/var/amavis'; ++$MYHOME = '/var/lib/amavis'; + + # A socket to which amavisd child processes report their data. + # should match one of the sockets in @zmq_sockets in amavisd.conf diff --git a/network/amavisd-new/patches/amavisd-agent.patch b/network/amavisd-new/patches/amavisd-agent.patch new file mode 100644 index 0000000000..d56723cfb2 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-agent.patch @@ -0,0 +1,11 @@ +--- amavisd-agent.orig 2014-11-08 20:48:15.953806621 -0600 ++++ amavisd-agent 2014-11-08 20:48:21.655008087 -0600 +@@ -53,7 +53,7 @@ + + my($dbfile) = 'snmp.db'; + my($db_home) = # DB databases directory +- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; ++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db'; + + my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional + my($repeatcount); # -c, repeat count (when defined) diff --git a/network/amavisd-new/patches/amavisd-nanny.patch b/network/amavisd-new/patches/amavisd-nanny.patch new file mode 100644 index 0000000000..245c32bec3 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-nanny.patch @@ -0,0 +1,11 @@ +--- amavisd-nanny.orig 2014-11-08 20:50:59.129571221 -0600 ++++ amavisd-nanny 2014-11-08 20:51:20.573328532 -0600 +@@ -61,7 +61,7 @@ + + my($dbfile) = 'nanny.db'; + my($db_home) = # DB databases directory +- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; ++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db'; + my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional + my($repeatcount); # -c, repeat count (when defined) + diff --git a/network/amavisd-new/patches/amavisd-release.patch b/network/amavisd-new/patches/amavisd-release.patch new file mode 100644 index 0000000000..55cc609de7 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-release.patch @@ -0,0 +1,11 @@ +--- amavisd-release.orig 2014-11-08 20:52:13.295190231 -0600 ++++ amavisd-release 2014-11-08 20:52:29.313755808 -0600 +@@ -86,7 +86,7 @@ + + $log_level = 1; + # $socketname = '127.0.0.1:9998'; +- $socketname = '/var/amavis/amavisd.sock'; ++ $socketname = '/var/run/amavis/amavisd.sock'; + + ### END OF USER CONFIGURABLE + } diff --git a/network/amavisd-new/patches/amavisd-signer.patch b/network/amavisd-new/patches/amavisd-signer.patch new file mode 100644 index 0000000000..e1c17266c4 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-signer.patch @@ -0,0 +1,17 @@ +--- amavisd-signer.orig 2014-11-08 21:02:36.183683393 -0600 ++++ amavisd-signer 2014-11-08 21:04:50.079221328 -0600 +@@ -86,11 +86,11 @@ + # Please adjust the following settings as necessary: + # + +-$daemon_user = 'vscan'; +-$daemon_group = 'vscan'; ++$daemon_user = 'amavis'; ++$daemon_group = 'amavis'; + # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef + +-# $daemonize = 1; ++$daemonize = 1; + + $log_level = 2; # 0..5 + $syslog_facility = 'mail'; diff --git a/network/amavisd-new/patches/amavisd-snmp-subagent.patch b/network/amavisd-new/patches/amavisd-snmp-subagent.patch new file mode 100644 index 0000000000..344108b9b3 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-snmp-subagent.patch @@ -0,0 +1,11 @@ +--- amavisd-snmp-subagent.orig 2014-11-08 20:58:13.439786270 -0600 ++++ amavisd-snmp-subagent 2014-11-08 21:01:24.141242836 -0600 +@@ -69,7 +69,7 @@ + $syslog_facility = LOG_MAIL; + + my($db_home) = # DB databases directory +- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db'; ++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/lib/amavis/db'; + + my($mta_queue_dir); + diff --git a/network/amavisd-new/patches/amavisd-submit.patch b/network/amavisd-new/patches/amavisd-submit.patch new file mode 100644 index 0000000000..9362191cb2 --- /dev/null +++ b/network/amavisd-new/patches/amavisd-submit.patch @@ -0,0 +1,14 @@ +--- amavisd-submit.orig 2014-11-08 20:54:37.766290064 -0600 ++++ amavisd-submit 2014-11-08 20:55:19.205752430 -0600 +@@ -72,9 +72,9 @@ + ### USER CONFIGURABLE: + + $log_level = 0; +- $tempbase = '/var/amavis/tmp'; # where to create a temp directory with a msg ++ $tempbase = '/var/lib/amavis/tmp'; # where to create a temp directory with a msg + +- $socketname = '/var/amavis/amavisd.sock'; ++ $socketname = '/var/run/amavis/amavisd.sock'; + # $socketname = '127.0.0.1:9998'; + # $socketname = '[::1]:9998'; + -- cgit v1.2.3