update to amavisd-new 2.3.2

from Sigfred Haversen <bsdlist at mumak.com>
This commit is contained in:
sturm 2005-08-07 21:25:55 +00:00
parent 98dc794504
commit 3c6a6bf4a7
5 changed files with 60 additions and 53 deletions

View File

@ -1,11 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2004/04/23 15:24:54 robert Exp $
# $OpenBSD: Makefile,v 1.2 2005/08/07 21:25:55 sturm Exp $
COMMENT= "interface between mailer MTA and content checkers"
V=20030616
VPATCH=p9
DISTNAME= amavisd-new-${V}-${VPATCH}
PKGNAME= amavisd-new-${V}pl9
VERSION= 2.3.2
DISTNAME= amavisd-new-${VERSION}
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@ -25,22 +23,25 @@ RUN_DEPENDS= ::archivers/arc \
::archivers/lha \
::archivers/lzop \
::archivers/p5-Archive-Tar \
::archivers/p5-Archive-Zip \
:p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \
::archivers/p5-Compress-Zlib \
::archivers/unarj \
::archivers/unrar \
::archivers/unzip \
::archivers/zoo \
::converters/p5-Convert-TNEF \
::converters/p5-Convert-UUlib \
:p5-Convert-UUlib->=1.05:converters/p5-Convert-UUlib \
::devel/p5-Net-Server \
::mail/p5-Mail-SpamAssassin \
::mail/p5-MIME-tools \
::sysutils/p5-Unix-Syslog
WRKDIST= ${WRKDIR}/amavisd-new-${V}
WRKDIST= ${WRKDIR}/amavisd-new-${VERSION}
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd
@ -54,7 +55,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/README_FILES/README.* \
${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amavisd-new
${INSTALL_DATA} ${WRKSRC}/amavisd.conf \
${PREFIX}/share/doc/amavisd-new/amavisd.conf
${PREFIX}/share/examples/amavisd-new/amavisd.conf
${INSTALL_DATA} ${WRKSRC}/amavisd.conf-default \
${PREFIX}/share/examples/amavisd-new/amavisd.conf-default
${INSTALL_DATA} ${WRKSRC}/amavisd.conf-sample \
${PREFIX}/share/examples/amavisd-new/amavisd.conf-sample
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
MD5 (amavisd-new-20030616-p9.tar.gz) = 4c96fadc57a5de84cc3bc6b548b46aff
RMD160 (amavisd-new-20030616-p9.tar.gz) = 89fad98e6e9f74c2fbe3726af613fb33a709fa61
SHA1 (amavisd-new-20030616-p9.tar.gz) = 8d44167b9d1bbf1344fcf45696dd295785894d0f
SIZE (amavisd-new-20030616-p9.tar.gz) = 363756
MD5 (amavisd-new-2.3.2.tar.gz) = 4af47f7e0b2aaf71bd5783dc26a576a8
RMD160 (amavisd-new-2.3.2.tar.gz) = 639c8a52d9d0fddf16b7403bb9b9fdc0047b5426
SHA1 (amavisd-new-2.3.2.tar.gz) = 34c276310b98edd06a4eb4df54e25c42d2bad802
SIZE (amavisd-new-2.3.2.tar.gz) = 786156

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-amavisd,v 1.1.1.1 2004/04/23 15:24:54 robert Exp $
--- amavisd.orig 2004-04-21 21:29:30.000000000 -0500
+++ amavisd 2004-04-21 21:31:06.000000000 -0500
@@ -109,7 +109,7 @@ sub fetch_modules($$@) {
$OpenBSD: patch-amavisd,v 1.2 2005/08/07 21:25:55 sturm Exp $
--- amavisd.orig Sat Jul 16 21:05:50 2005
+++ amavisd Sat Jul 16 21:07:13 2005
@@ -128,7 +128,7 @@ sub fetch_modules($$@) {
BEGIN {
fetch_modules('REQUIRED BASIC MODULES', 1, qw(
- Exporter POSIX Fcntl Socket Errno Carp Time::HiRes
+ Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes
IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Handle IO::Wrap IO::Stringy
Digest::MD5 Unix::Syslog File::Basename File::Copy
fetch_modules('REQUIRED BASIC MODULES', 1, qw(
- Exporter POSIX Fcntl Socket Errno Carp Time::HiRes
+ Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy Time::HiRes
IO::Handle IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename
Mail::Field Mail::Address Mail::Header Mail::Internet Compress::Zlib

View File

@ -1,32 +1,28 @@
$OpenBSD: patch-amavisd_conf,v 1.1.1.1 2004/04/23 15:24:54 robert Exp $
--- amavisd.conf.orig 2004-04-21 21:27:54.000000000 -0500
+++ amavisd.conf 2004-04-21 21:29:04.000000000 -0500
@@ -51,7 +51,7 @@ use strict;
# $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 = '/var/lib/amavis'; # (default is '/var/amavis')
+$MYHOME = '/var/amavisd'; # (default is '/var/amavis')
$OpenBSD: patch-amavisd_conf,v 1.2 2005/08/07 21:25:55 sturm Exp $
--- amavisd.conf.orig Wed Jun 29 12:26:05 2005
+++ amavisd.conf Sun Aug 7 19:15:35 2005
@@ -14,12 +14,12 @@ use strict;
# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code
# $mydomain serves as a quick default for some other configuration settings.
# More refined control is available with each individual setting further down.
@@ -62,8 +62,8 @@ $mydomain = 'example.com'; # (no us
$max_servers = 2; # number of pre-forked children (2..15 is common)
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis)
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis)
+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis)
+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis)
# 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 = 'vscan'; # (no default; customary: vscan or amavis)
-$daemon_group = 'sweep'; # (no default; customary: vscan or amavis)
+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis)
+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis)
$mydomain = 'example.com'; # a convenient default for other settings
# Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created.
@@ -276,7 +276,7 @@ $LOGFILE = "$MYHOME/amavis.log"; # (def
# 3: server, client
# 4: decompose parts
# 5: more debug details
-$log_level = 2; # (defaults to 0)
+$log_level = 0; # (defaults to 0)
-$MYHOME = '/var/amavis'; # a convenient default for other settings
+$MYHOME = '/var/amavisd'; # a convenient default for other settings
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to be created manually
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR
$QUARANTINEDIR = '/var/virusmails';
@@ -42,7 +42,7 @@ $log_recip_templ = undef; # disable b
$DO_SYSLOG = 1; # log via syslogd (preferred)
$SYSLOG_LEVEL = 'mail.debug';
# Customizable template for the most interesting log file entry (e.g. with
# $log_level=0) (take care to properly quote Perl special characters like '\')
-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny)
$enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1
$inet_socket_port = 10024; # listen on this local TCP port(s) (see $protocol)

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2004/09/24 10:54:53 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2005/08/07 21:25:55 sturm Exp $
@newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
sbin/amavisd
@ -8,6 +8,7 @@ share/doc/amavisd-new/INSTALL
share/doc/amavisd-new/LDAP.schema
share/doc/amavisd-new/LICENSE
share/doc/amavisd-new/MANIFEST
share/doc/amavisd-new/README.banned
share/doc/amavisd-new/README.chroot
share/doc/amavisd-new/README.contributed
share/doc/amavisd-new/README.courier
@ -26,8 +27,12 @@ share/doc/amavisd-new/README.postfix
share/doc/amavisd-new/README.protocol
share/doc/amavisd-new/README.sendmail
share/doc/amavisd-new/README.sendmail-dual
share/doc/amavisd-new/README.sql
share/doc/amavisd-new/RELEASE_NOTES
share/doc/amavisd-new/amavisd.conf
share/examples/amavisd-new/
share/examples/amavisd-new/amavisd.conf-sample
share/examples/amavisd-new/amavisd.conf-default
share/examples/amavisd-new/amavisd.conf
@sample ${SYSCONFDIR}/amavisd.conf
@owner _vscan
@group _vscan