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

Update to 2.6.1. From maintainer Giovanni Bechis <g.bechis@snb.it>.

Browse Source 
ok (portwise) simon@ sthen@
This commit is contained in:
kili 2008-09-23 21:39:21 +00:00
parent 90ae6594d9
commit 0cd4664148
7 changed files with 67 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mail/amavisd-new/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2008/01/04 02:53:52 okan Exp $
# $OpenBSD: Makefile,v 1.7 2008/09/23 21:39:21 kili Exp $
COMMENT= interface between mailer MTA and content checkers
DISTNAME= amavisd-new-2.5.3
DISTNAME= amavisd-new-2.6.1
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@ -14,7 +14,11 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
MASTER_SITES= ${HOMEPAGE} \
http://mirrors.catpipe.net/amavisd-new/ \
http://mirror.mainloop.se/amavisd/ \
http://mirror.cedratnet.com/amavisd-new/ \
http://mirror.omroep.nl/amavisd-new/
RUN_DEPENDS= ::archivers/arc \
::archivers/bzip2 \
@ -33,8 +37,10 @@ RUN_DEPENDS= ::archivers/arc \
::converters/p5-Convert-TNEF \
::converters/rpm2cpio \
:p5-Convert-UUlib->=1.05:converters/p5-Convert-UUlib \
::databases/p5-BerkeleyDB \
::devel/p5-Net-Server \
::mail/p5-Mail-SpamAssassin \
:p5-Mail-DKIM->=0.31:mail/p5-Mail-DKIM \
::mail/p5-MIME-tools \
::sysutils/p5-Unix-Syslog
@ -45,6 +51,12 @@ PKG_ARCH= *
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-agent \
${PREFIX}/bin/amavisd-agent
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny \
${PREFIX}/bin/amavisd-nanny
${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

10
mail/amavisd-new/distinfo
View File

@ -1,5 +1,5 @@
MD5 (amavisd-new-2.5.3.tar.gz) = XPGnpIGFXGcSN4wEdQWCVQ==
RMD160 (amavisd-new-2.5.3.tar.gz) = Sbl/83grQviqunvrc0QDmNg2ONk=
SHA1 (amavisd-new-2.5.3.tar.gz) = LhRgrVBa1CUah27FBtAho5LHwMA=
SHA256 (amavisd-new-2.5.3.tar.gz) = 9yRlThXqs/q84ihzpfKg/PLbk3TKhJec8Gaik2DuUz0=
SIZE (amavisd-new-2.5.3.tar.gz) = 789275
MD5 (amavisd-new-2.6.1.tar.gz) = JHTUwDT5aljluK+Rr1FGiQ==
RMD160 (amavisd-new-2.6.1.tar.gz) = yeJIVAv6+cxquWd3a9mOFktjbbg=
SHA1 (amavisd-new-2.6.1.tar.gz) = UePj2cKqoz9qQahAksgq25TiqAY=
SHA256 (amavisd-new-2.6.1.tar.gz) = TJh4bktpRFn2usQkE800t9AWV2O5CLMjTVQHEm+zsT0=
SIZE (amavisd-new-2.6.1.tar.gz) = 911740

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

@ -1,20 +1,19 @@
$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
@@ -153,7 +153,7 @@ sub fetch_modules($$@) {
BEGIN {
$OpenBSD: patch-amavisd,v 1.5 2008/09/23 21:39:21 kili Exp $
--- amavisd.orig Sun Jun 29 02:37:58 2008
+++ amavisd Wed Sep 3 20:40:21 2008
@@ -213,7 +213,7 @@ BEGIN {
File::Glob->import(':globally'); # use the same module as Perl 5.8 uses
}
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
Compress::Zlib MIME::Base64 MIME::QuotedPrint MIME::Words
@@ -17909,7 +17909,7 @@ sub initializeSpamAssassin {
local_tests_only => $sa_local_tests_only,
home_dir_for_helpers => $helpers_home,
@@ -20210,6 +20210,7 @@ sub initializeSpamAssassin {
stop_at_threshold => 0,
-# LOCAL_STATE_DIR => '/var/lib',
need_tags => 'TIMING,LANGUAGES,RELAYCOUNTRY,ASN,ASNCIDR',
# LOCAL_STATE_DIR => '/var/lib',
+ LOCAL_STATE_DIR => '/var/db/spamassassin',
# PREFIX => '/usr/local',
# DEF_RULES_DIR => '/usr/local/share/spamassassin',

21
mail/amavisd-new/patches/patch-amavisd-release Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-amavisd-release,v 1.1 2008/09/23 21:39:21 kili Exp $
--- 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) = @_;

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

@ -1,10 +1,10 @@
$OpenBSD: patch-amavisd_conf,v 1.3 2007/11/27 13:53:19 okan Exp $
--- amavisd.conf.orig Wed Jun 27 12:42:55 2007
+++ amavisd.conf Sat Nov 24 11:18:48 2007
$OpenBSD: patch-amavisd_conf,v 1.4 2008/09/23 21:39:21 kili Exp $
--- amavisd.conf.orig Wed Apr 23 20:49:58 2008
+++ amavisd.conf Thu May 8 20:19:02 2008
@@ -15,12 +15,12 @@ use strict;
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
$max_servers = 2; # num of pre-forked children (2..15 is common), -m
$max_servers = 2; # num of pre-forked children (2..30 is common), -m
-$daemon_user = 'vscan'; # (no default; customary: vscan or amavis), -u
-$daemon_group = 'vscan'; # (no default; customary: vscan or amavis), -g
+$daemon_user = '_vscan'; # (no default; customary: vscan or amavis), -u
@ -13,11 +13,11 @@ $OpenBSD: patch-amavisd_conf,v 1.3 2007/11/27 13:53:19 okan Exp $
$mydomain = 'example.com'; # 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, -H
+$MYHOME = '/var/amavisd'; # a convenient default for other settings, -H
$TEMPBASE = "$MYHOME/tmp"; # working directory, needs to exist, -T
$ENV{TMPDIR} = $TEMPBASE; # environment variable TMPDIR, used by SA, etc.
$QUARANTINEDIR = '/var/virusmails'; # -Q
@@ -42,7 +42,7 @@ $syslog_facility = 'mail'; # Syslog facility as a st
@@ -44,7 +44,7 @@ $syslog_facility = 'mail'; # Syslog facility as a st
$syslog_priority = 'debug'; # Syslog base (minimal) priority as a string,
# choose from: emerg, alert, crit, err, warning, notice, info, debug
@ -25,4 +25,4 @@ $OpenBSD: patch-amavisd_conf,v 1.3 2007/11/27 13:53:19 okan Exp $
+$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
$nanny_details_level = 2; # nanny verbosity: 1: traditional, 2: detailed
$enable_dkim_verification = 1; # enable DKIM signatures verification

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

@ -1,6 +1,6 @@
$OpenBSD: patch-amavisd_conf-sample,v 1.2 2007/11/27 13:53:19 okan Exp $
--- amavisd.conf-sample.orig Wed Jun 27 12:42:49 2007
+++ amavisd.conf-sample Sat Nov 24 10:18:52 2007
$OpenBSD: patch-amavisd_conf-sample,v 1.3 2008/09/23 21:39:21 kili Exp $
--- amavisd.conf-sample.orig Wed Apr 23 20:49:52 2008
+++ amavisd.conf-sample Thu May 8 20:19:02 2008
@@ -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
@ -20,4 +20,4 @@ $OpenBSD: patch-amavisd_conf-sample,v 1.2 2007/11/27 13:53:19 okan Exp $
+$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
# MTA SETTINGS, UNCOMMENT AS APPROPRIATE,
$enable_dkim_verification = 1; # enable DKIM signatures verification

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

@ -1,6 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2007/11/27 13:53:19 okan Exp $
@comment $OpenBSD: PLIST,v 1.7 2008/09/23 21:39:21 kili Exp $
@newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
bin/amavisd-agent
bin/amavisd-nanny
bin/amavisd-release
sbin/amavisd
share/doc/amavisd-new/
share/doc/amavisd-new/AAAREADME.first
@ -45,4 +48,6 @@ share/examples/amavisd-new/amavisd.conf-sample
@group _vscan
@sample /var/amavisd/
@sample /var/amavisd/tmp/
@sample /var/amavisd/db/
@sample /var/amavisd/var/
@extraunexec rm -rf /var/amavisd/* 2>/dev/null || true