cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.5.2 from new MAINTAINER (Giovanni Bechis), plus a tweak or two by me

Browse Source 
ok sturm@ simon@
This commit is contained in:
okan 2007-11-27 13:53:19 +00:00
parent ff506d6ff4
commit 12fa6722af
6 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/amavisd-new/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2007/09/16 00:17:04 merdely Exp $ # $OpenBSD: Makefile,v 1.5 2007/11/27 13:53:19 okan Exp $
COMMENT= interface between mailer MTA and content checkers COMMENT= interface between mailer MTA and content checkers
VERSION= 2.3.2 VERSION= 2.5.2
PKGNAME= ${DISTNAME}p0
DISTNAME= amavisd-new-${VERSION} DISTNAME= amavisd-new-${VERSION}
CATEGORIES= mail security CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/ HOMEPAGE= http://www.ijs.si/software/amavisd/
MAINTAINER= Peter Hessler <spambox@theapt.org> MAINTAINER= Giovanni Bechis <g.bechis@snb.it>
# GPL # GPL
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
@ -20,17 +19,20 @@ MASTER_SITES= ${HOMEPAGE}
RUN_DEPENDS= ::archivers/arc \ RUN_DEPENDS= ::archivers/arc \
::archivers/bzip2 \ ::archivers/bzip2 \
::archivers/cabextract \
::archivers/freeze \ ::archivers/freeze \
::archivers/lha \ ::archivers/lha \
::archivers/lzop \ ::archivers/lzop \
::archivers/p5-Archive-Tar \ ::archivers/p5-Archive-Tar \
:p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \ :p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \
::archivers/p5-Compress-Zlib \ ::archivers/p5-Compress-Zlib \
::archivers/ripole \
::archivers/unarj \ ::archivers/unarj \
::archivers/unrar \ ::archivers/unrar \
::archivers/unzip \ ::archivers/unzip \
::archivers/zoo \ ::archivers/zoo \
::converters/p5-Convert-TNEF \ ::converters/p5-Convert-TNEF \
::converters/rpm2cpio \
:p5-Convert-UUlib->=1.05:converters/p5-Convert-UUlib \ :p5-Convert-UUlib->=1.05:converters/p5-Convert-UUlib \
::devel/p5-Net-Server \ ::devel/p5-Net-Server \
::mail/p5-Mail-SpamAssassin \ ::mail/p5-Mail-SpamAssassin \

10
mail/amavisd-new/distinfo
View File

@ -1,5 +1,5 @@
MD5 (amavisd-new-2.3.2.tar.gz) = SvR/fgsqr3G9V4PcJqV2qA== MD5 (amavisd-new-2.5.2.tar.gz) = UtIn1EL6xkkWSIuD15gG1w==
RMD160 (amavisd-new-2.3.2.tar.gz) = Y5yKUtnQ/d8Wt0A7ubn9wAR7VCY= RMD160 (amavisd-new-2.5.2.tar.gz) = t7yZisNEKLYs904cEUspWp8yJlI=
SHA1 (amavisd-new-2.3.2.tar.gz) = NMJ2MQuY7dBqTrTfVOJcQtK62AI= SHA1 (amavisd-new-2.5.2.tar.gz) = JGUTFEjOENrIURRQaV/2O8Vl5ts=
SHA256 (amavisd-new-2.3.2.tar.gz) = nyjvEj3YigLPRsMDTE1jwtKF0+7bgf39JUaF4X3A3t0= SHA256 (amavisd-new-2.5.2.tar.gz) = X1kIUMUFAXwmM/R87Ug6riPshX4qeC92PrFvn58/zu8=
SIZE (amavisd-new-2.3.2.tar.gz) = 786156 SIZE (amavisd-new-2.5.2.tar.gz) = 788546

17
mail/amavisd-new/patches/patch-amavisd
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-amavisd,v 1.3 2006/10/31 20:41:40 pvalchev Exp $ $OpenBSD: patch-amavisd,v 1.4 2007/11/27 13:53:19 okan Exp $
--- amavisd.orig Wed Jun 29 06:26:11 2005 --- amavisd.orig Wed Jun 27 12:43:00 2007
+++ amavisd Tue Oct 31 08:15:59 2006 +++ amavisd Sat Nov 24 10:18:12 2007
@@ -128,7 +128,7 @@ sub fetch_modules($$@) { @@ -153,7 +153,7 @@ sub fetch_modules($$@) {
BEGIN { BEGIN {
fetch_modules('REQUIRED BASIC MODULES', 1, qw( fetch_modules('REQUIRED BASIC MODULES', 1, qw(
@ -9,12 +9,13 @@ $OpenBSD: patch-amavisd,v 1.3 2006/10/31 20:41:40 pvalchev Exp $
+ Exporter POSIX Fcntl Socket Errno Carp Carp::Heavy 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::Handle IO::File IO::Socket IO::Socket::UNIX IO::Socket::INET
IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename IO::Wrap IO::Stringy Digest::MD5 Unix::Syslog File::Basename
Mail::Field Mail::Address Mail::Header Mail::Internet Compress::Zlib Compress::Zlib MIME::Base64 MIME::QuotedPrint MIME::Words
@@ -12566,6 +12566,7 @@ sub init() { @@ -17909,7 +17909,7 @@ sub initializeSpamAssassin {
local_tests_only => $sa_local_tests_only, local_tests_only => $sa_local_tests_only,
home_dir_for_helpers => $helpers_home, home_dir_for_helpers => $helpers_home,
stop_at_threshold => 0, stop_at_threshold => 0,
-# LOCAL_STATE_DIR => '/var/lib',
+ LOCAL_STATE_DIR => '/var/db/spamassassin', + LOCAL_STATE_DIR => '/var/db/spamassassin',
# PREFIX => '/usr/local',
# DEF_RULES_DIR => '/usr/local/share/spamassassin', # DEF_RULES_DIR => '/usr/local/share/spamassassin',
# LOCAL_RULES_DIR => '/etc/mail/spamassassin', # LOCAL_RULES_DIR => '/usr/local/etc/mail/spamassassin',
#see man Mail::SpamAssassin for other options

38
mail/amavisd-new/patches/patch-amavisd_conf
View File

@ -1,28 +1,28 @@
$OpenBSD: patch-amavisd_conf,v 1.2 2005/08/07 21:25:55 sturm Exp $ $OpenBSD: patch-amavisd_conf,v 1.3 2007/11/27 13:53:19 okan Exp $
--- amavisd.conf.orig Wed Jun 29 12:26:05 2005 --- amavisd.conf.orig Wed Jun 27 12:42:55 2007
+++ amavisd.conf Sun Aug 7 19:15:35 2005 +++ amavisd.conf Sat Nov 24 11:18:48 2007
@@ -14,12 +14,12 @@ use strict; @@ -15,12 +15,12 @@ use strict;
# @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
$max_servers = 2; # number of pre-forked children (2..15 is common) $max_servers = 2; # num of pre-forked children (2..15 is common), -m
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis) -$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis) +$daemon_user = '_vscan'; # (no default; customary: vscan or amavis), -u
+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis) +$daemon_group = '_vscan'; # (no default; customary: vscan or amavis), -g
$mydomain = 'example.com'; # a convenient default for other settings $mydomain = 'example.com'; # a convenient default for other settings
-$MYHOME = '/var/amavis'; # a convenient default for other settings -# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
+$MYHOME = '/var/amavisd'; # a convenient default for other settings +$MYHOME = '/var/amavisd'; # a convenient default for other settings, -H
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to be created manually $TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR $ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
$QUARANTINEDIR = '/var/virusmails'; $QUARANTINEDIR = '/var/virusmails'; # -Q
@@ -42,7 +42,7 @@ $log_recip_templ = undef; # disable b @@ -42,7 +42,7 @@ $syslog_facility = 'mail'; # Syslog facility as a st
$DO_SYSLOG = 1; # log via syslogd (preferred) $syslog_priority = 'debug'; # Syslog base (minimal) priority as a string,
$SYSLOG_LEVEL = 'mail.debug'; # choose from: emerg, alert, crit, err, warning, notice, info, debug
-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) -$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_db = 0; # 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 $enable_global_cache = 1; # enable use of libdb-based cache if $enable_db=1
$nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
$inet_socket_port = 10024; # listen on this local TCP port(s) (see $protocol)

22
mail/amavisd-new/patches/patch-amavisd_conf-sample
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-amavisd_conf-sample,v 1.1 2005/08/07 21:27:04 sturm Exp $ $OpenBSD: patch-amavisd_conf-sample,v 1.2 2007/11/27 13:53:19 okan Exp $
--- amavisd.conf-sample.orig Wed Jun 29 12:25:59 2005 --- amavisd.conf-sample.orig Wed Jun 27 12:42:49 2007
+++ amavisd.conf-sample Sun Aug 7 19:15:54 2005 +++ amavisd.conf-sample Sat Nov 24 10:18:52 2007
@@ -73,8 +73,8 @@ $mydomain = 'example.com'; # (no us @@ -74,8 +74,8 @@ $mydomain = 'example.com'; # (no useful default)
# Set the user and group to which the daemon will change if started as root # 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): # (otherwise just keeps the UID unchanged, and these settings have no effect):
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) -$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis or sweep) -$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis) +$daemon_user = '_vscan'; # (no default; customary: vscan or amavis), -u
+$daemon_group = '_vscan'; # (no default; customary: vscan or amavis or sweep) +$daemon_group = '_vscan'; # (no default; customary: vscan or amavis), -g
# Runtime working directory (cwd), and a place where # Runtime working directory (cwd), and a place where
# temporary directories for unpacking mail are created. # temporary directories for unpacking mail are created.
@@ -99,7 +99,7 @@ $TEMPBASE = $MYHOME; # (must be @@ -99,7 +99,7 @@ $TEMPBASE = $MYHOME; # (must be set if other c
$ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory # set environment variables if you want (no defaults):
#... $ENV{TMPDIR} = $TEMPBASE; # used for SA temporary files, by some decoders, etc.
-$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny) -$enable_db = 1; # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny) +$enable_db = 0; # enable use of BerkeleyDB/libdb (SNMP and nanny)

15
mail/amavisd-new/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2005/08/07 21:25:55 sturm Exp $ @comment $OpenBSD: PLIST,v 1.6 2007/11/27 13:53:19 okan Exp $
@newgroup _vscan:530 @newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin @newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
sbin/amavisd sbin/amavisd
@ -12,30 +12,37 @@ share/doc/amavisd-new/README.banned
share/doc/amavisd-new/README.chroot share/doc/amavisd-new/README.chroot
share/doc/amavisd-new/README.contributed share/doc/amavisd-new/README.contributed
share/doc/amavisd-new/README.courier share/doc/amavisd-new/README.courier
share/doc/amavisd-new/README.courier-old
share/doc/amavisd-new/README.customize share/doc/amavisd-new/README.customize
share/doc/amavisd-new/README.exim_v3 share/doc/amavisd-new/README.exim_v3
share/doc/amavisd-new/README.exim_v3_app share/doc/amavisd-new/README.exim_v3_app
share/doc/amavisd-new/README.exim_v4 share/doc/amavisd-new/README.exim_v4
share/doc/amavisd-new/README.exim_v4_app share/doc/amavisd-new/README.exim_v4_app
share/doc/amavisd-new/README.exim_v4_app2 share/doc/amavisd-new/README.exim_v4_app2
share/doc/amavisd-new/README.ldap
share/doc/amavisd-new/README.lookups share/doc/amavisd-new/README.lookups
share/doc/amavisd-new/README.milter share/doc/amavisd-new/README.milter
share/doc/amavisd-new/README.old.scanners share/doc/amavisd-new/README.old.scanners
share/doc/amavisd-new/README.performance share/doc/amavisd-new/README.performance
share/doc/amavisd-new/README.policy-on-notifications share/doc/amavisd-new/README.policy-on-notifications
share/doc/amavisd-new/README.postfix share/doc/amavisd-new/README.postfix
share/doc/amavisd-new/README.postfix.html
share/doc/amavisd-new/README.protocol share/doc/amavisd-new/README.protocol
share/doc/amavisd-new/README.sendmail share/doc/amavisd-new/README.sendmail
share/doc/amavisd-new/README.sendmail-dual share/doc/amavisd-new/README.sendmail-dual
share/doc/amavisd-new/README.sendmail-dual.old
share/doc/amavisd-new/README.sql share/doc/amavisd-new/README.sql
share/doc/amavisd-new/README.sql-mysql
share/doc/amavisd-new/README.sql-pg
share/doc/amavisd-new/RELEASE_NOTES share/doc/amavisd-new/RELEASE_NOTES
share/examples/amavisd-new/ share/examples/amavisd-new/
share/examples/amavisd-new/amavisd.conf-sample
share/examples/amavisd-new/amavisd.conf-default
share/examples/amavisd-new/amavisd.conf share/examples/amavisd-new/amavisd.conf
@sample ${SYSCONFDIR}/amavisd.conf @sample ${SYSCONFDIR}/amavisd.conf
share/examples/amavisd-new/amavisd.conf-default
share/examples/amavisd-new/amavisd.conf-sample
@mode 0755
@owner _vscan @owner _vscan
@group _vscan @group _vscan
@mode 755
@sample /var/amavisd/ @sample /var/amavisd/
@sample /var/amavisd/tmp/
@extraunexec rm -rf /var/amavisd/* 2>/dev/null || true @extraunexec rm -rf /var/amavisd/* 2>/dev/null || true