Date: Thu, 29 Jun 2006 16:45:52 -0400 From: "Michael Scheidell" <scheidell@secnap.net> To: <amavis-user@lists.sourceforge.net> Cc: ports@freebsd.org, gkovesdan@t-hosting.hu Subject: Patch 4 FREEBSD, was [AMaViS-user] Getting blank emails on 2.4.1 Message-ID: <B3BCAF4246A8A84983A80DAB50FE724268AF93@secnap2.secnap.com>
next in thread | raw e-mail | index | archive | help
> It is likely to be the following bug, fixed in 2.4.2: >=20 > - ensure that notification would not be sent if notification=20 > template is empty, For anyone wanting to use FREEBSD ports, here are the patches to take ports 2.4.1_1 to 2.4.2: (unofficial patches, or you could wait for ports maintainer to update it) diff -bBru ./Makefile /tmp/amavisd.new/Makefile --- ./Makefile Fri May 26 20:02:37 2006 +++ /tmp/amavisd.new/Makefile Thu Jun 29 16:02:27 2006 @@ -7,8 +7,7 @@ # Based on amavisd ports makefile. =20 PORTNAME=3D amavisd-new -PORTVERSION=3D 2.4.1 -PORTREVISION=3D 1 +PORTVERSION=3D 2.4.2 PORTEPOCH=3D 1 CATEGORIES=3D security MASTER_SITES=3D http://www.ijs.si/software/amavisd/ \ diff -bBru ./distinfo /tmp/amavisd.new/distinfo --- ./distinfo Fri May 12 20:03:39 2006 +++ /tmp/amavisd.new/distinfo Thu Jun 29 16:05:04 2006 @@ -1,3 +1,3 @@ -MD5 (amavisd-new-2.4.1.tar.gz) =3D bf770a3c7eee8a9c93932a04485e6a35 -SHA256 (amavisd-new-2.4.1.tar.gz) =3D c067cbae60ccff3932574fcaf7971c04b118f6b2e9fe6db772d33538b53b0a54 -SIZE (amavisd-new-2.4.1.tar.gz) =3D 841988 +MD5 (amavisd-new-2.4.2.tar.gz) =3D d750176de7481498ebd1011e08a488da +SHA256 (amavisd-new-2.4.2.tar.gz) =3D 80023cc0397560d082dd4152c96b7efc49d3cc2695b4d578ed01b08c3af2bb9a +SIZE (amavisd-new-2.4.2.tar.gz) =3D 854326 Only in ./files: patch-LDAP.schema diff -bBru ./files/patch-amavisd-sample.conf /tmp/amavisd.new/files/patch-amavisd-sample.conf --- ./files/patch-amavisd-sample.conf Wed Aug 25 07:57:53 2004 +++ /tmp/amavisd.new/files/patch-amavisd-sample.conf Thu Jun 29 16:24:38 2006 @@ -1,40 +1,40 @@ ---- amavisd.conf-sample.orig Mon Aug 16 03:03:09 2004 -+++ amavisd.conf-sample Mon Aug 16 10:47:54 2004 -@@ -58,7 +58,7 @@ +--- amavisd.conf-sample.orig Tue Jun 27 07:31:44 2006 ++++ amavisd.conf-sample Thu Jun 29 16:23:11 2006 +@@ -63,7 +63,7 @@ # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. # $MYHOME is not used directly by the program. No trailing slash! --#$MYHOME =3D '/var/lib/amavis'; # (default is '/var/amavis') -+$MYHOME =3D '%%AMAVISDIR%%'; # (default is '/var/amavis') +-#$MYHOME =3D '/var/lib/amavis'; # (default is '/var/amavis'), -H ++$MYHOME =3D '%%AMAVISDIR%%'; # (default is '/var/amavis'), -H =20 # $mydomain serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. -@@ -69,8 +69,8 @@ +@@ -74,8 +74,8 @@ =20 # Set the user and group to which the daemon will change if started as root # (otherwise just keeps the UID unchanged, and these settings have no effect): --$daemon_user =3D 'vscan'; # (no default; customary: vscan or = amavis) --$daemon_group =3D 'vscan'; # (no default; customary: vscan or = amavis or sweep) -+$daemon_user =3D '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis) -+$daemon_group =3D '%%AMAVISGROUP%%'; # (no default; customary: = vscan or amavis or sweep) +-$daemon_user =3D 'vscan'; # (no default; customary: vscan or amavis), -u +-$daemon_group =3D 'vscan'; # (no default; customary: vscan or amavis), -g ++$daemon_user =3D '%%AMAVISUSER%%'; # (no default; customary: vscan or amavis), -u ++$daemon_group =3D '%%AMAVISGROUP%%'; # (no default; customary: = vscan or amavis), -g =20 # Runtime working directory (cwd), and a place where # temporary directories for unpacking mail are created. -@@ -284,7 +284,7 @@ +@@ -310,7 +310,7 @@ # 3: server, client # 4: decompose parts # 5: more debug details --$log_level =3D 2; # (defaults to 0) -+$log_level =3D 0; # (defaults to 0) +-$log_level =3D 2; # (defaults to 0), -d ++$log_level =3D 0; # (defaults to 0), -d =20 # Customizable template for the most interesting log file entry (e.g. with # $log_level=3D0) (take care to properly quote Perl special characters like '\') -@@ -567,7 +567,7 @@ +@@ -684,7 +684,7 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # --$QUARANTINEDIR =3D '/var/virusmails'; -+$QUARANTINEDIR =3D '%%AMAVISQUARANTINE%%'; +-$QUARANTINEDIR =3D '/var/virusmails'; # -Q ++$QUARANTINEDIR =3D '%%AMAVISQUARANTINE%%'; # -Q +=20 + #$quarantine_subdir_levels =3D 1; # add level of subdirs to disperse quarantine =20 - #$virus_quarantine_method =3D 'local:virus-%i-%n'; # default - #$spam_quarantine_method =3D 'local:spam-%b-%i-%n'; # default diff -bBru ./files/patch-amavisd.conf /tmp/amavisd.new/files/patch-amavisd.conf --- ./files/patch-amavisd.conf Thu Apr 28 13:05:48 2005 +++ /tmp/amavisd.new/files/patch-amavisd.conf Thu Jun 29 16:29:45 2006 @@ -1,22 +1,22 @@ ---- amavisd.conf.orig Mon Apr 25 01:23:26 2005 -+++ amavisd.conf Mon Apr 25 09:58:07 2005 +--- amavisd.conf.orig Tue Jun 27 07:31:50 2006 ++++ amavisd.conf Thu Jun 29 16:29:03 2006 @@ -14,15 +14,15 @@ # @bypass_spam_checks_maps =3D (1); # uncomment to DISABLE anti-spam code =20 - $max_servers =3D 2; # number of pre-forked children (2..15 = is common) --$daemon_user =3D 'vscan'; # (no default; customary: vscan or amavis) --$daemon_group =3D 'vscan'; # (no default; customary: vscan or amavis) -+$daemon_user =3D '%%AMAVISUSER%%'; # (no default; customary: = vscan or amavis) -+$daemon_group =3D '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis) + $max_servers =3D 2; # num of pre-forked children (2..15 is common), -m +-$daemon_user =3D 'vscan'; # (no default; customary: vscan or amavis), -u +-$daemon_group =3D 'vscan'; # (no default; customary: vscan or amavis), -g ++$daemon_user =3D '%%AMAVISUSER%%'; # (no default; customary: = vscan or amavis), -u ++$daemon_group =3D '%%AMAVISGROUP%%'; # (no default; customary: vscan or amavis), -g =20 $mydomain =3D 'example.com'; # a convenient default for other = settings =20 --$MYHOME =3D '/var/amavis'; # a convenient default for other = settings -+$MYHOME =3D '%%AMAVISDIR%%'; # a convenient default for other settings - $TEMPBASE =3D "$MYHOME/tmp"; # working directory, needs to be = created manually +-# $MYHOME =3D '/var/amavis'; # a convenient default for other settings, -H ++$MYHOME =3D '%%AMAVISDIR%%'; # a convenient default for other settings, -H + $TEMPBASE =3D "$MYHOME/tmp"; # working directory, needs to exist, -T $ENV{TMPDIR} =3D $TEMPBASE; # environment variable TMPDIR --$QUARANTINEDIR =3D '/var/virusmails'; -+$QUARANTINEDIR =3D '%%AMAVISQUARANTINE%%'; +-$QUARANTINEDIR =3D '/var/virusmails'; # -Q ++$QUARANTINEDIR =3D '%%AMAVISQUARANTINE%%'; # -Q # $quarantine_subdir_levels =3D 1; # add level of subdirs to disperse quarantine =20 - # $daemon_chroot_dir =3D $MYHOME; # chroot directory or undef + # $daemon_chroot_dir =3D $MYHOME; # chroot directory or undef, -R
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B3BCAF4246A8A84983A80DAB50FE724268AF93>