In amavisd-new there is also a script to reinject a quarantined message
on the mail queue.
Added to PLIST and regen patches.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 4 Jan 2008 02:53:52 -0000 1.6
+++ Makefile 22 Feb 2008 15:18:34 -0000
@@ -3,6 +3,7 @@
COMMENT= interface between mailer MTA and content checkers
DISTNAME= amavisd-new-2.5.3
+PKGNAME= ${DISTNAME}p0
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@@ -45,6 +46,8 @@ PKG_ARCH= *
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release \
+ ${PREFIX}/bin/amavisd-release
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/AAAREADME.first \
${PREFIX}/share/doc/amavisd-new
Index: patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.4
diff -u -p -r1.4 patch-amavisd
--- patches/patch-amavisd 27 Nov 2007 13:53:19 -0000 1.4
+++ patches/patch-amavisd 22 Feb 2008 15:18:34 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd,v 1.4 2007/11/27 13:53:19 okan Exp $
---- amavisd.orig Wed Jun 27 12:43:00 2007
-+++ amavisd Sat Nov 24 10:18:12 2007
+--- amavisd.orig Wed Dec 12 12:28:26 2007
++++ amavisd Fri Feb 22 16:08:35 2008
@@ -153,7 +153,7 @@ sub fetch_modules($$@) {
BEGIN {
@@ -10,7 +10,7 @@ $OpenBSD: patch-amavisd,v 1.4 2007/11/27
IO::Handle IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename
Compress::Zlib MIME::Base64 MIME::QuotedPrint MIME::Words
-@@ -17909,7 +17909,7 @@ sub initializeSpamAssassin {
+@@ -17995,7 +17995,7 @@ sub initializeSpamAssassin {
local_tests_only => $sa_local_tests_only,
home_dir_for_helpers => $helpers_home,
stop_at_threshold => 0,
Index: patches/patch-amavisd-release
===================================================================
RCS file: patches/patch-amavisd-release
diff -N patches/patch-amavisd-release
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-amavisd-release 22 Feb 2008 15:18:34 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- amavisd-release.orig Fri Feb 22 16:11:37 2008
++++ amavisd-release Fri Feb 22 16:12:33 2008
+@@ -11,7 +11,7 @@
+ # To be placed in amavisd.conf:
+ # $interface_policy{'SOCK'} = 'AM.PDP';
+ # $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'};
+-# $unix_socketname='/var/amavis/amavisd.sock';
++# $unix_socketname='/var/amavisd/amavisd.sock';
+ #or:
+ # $interface_policy{'9998'} = 'AM.PDP';
+ # $policy_bank{'AM.PDP'} = {protocol=>'AM.PDP'};
+@@ -79,7 +79,7 @@ use vars qw($log_level $socketname);
+
+ $log_level = 1;
+ # $socketname = '127.0.0.1:9998';
+- $socketname = '/var/amavis/amavisd.sock';
++ $socketname = '/var/amavisd/amavisd.sock';
+
+ sub sanitize_str {
+ my($str, $keep_eol) = @_;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 27 Nov 2007 13:53:19 -0000 1.6
+++ pkg/PLIST 22 Feb 2008 15:18:34 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2007/11/27 13:53:19 okan Exp $
@newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
+bin/amavisd-release
sbin/amavisd
share/doc/amavisd-new/
share/doc/amavisd-new/AAAREADME.first
