diff options
| -rw-r--r-- | security/amavisd-new/Makefile | 16 | ||||
| -rw-r--r-- | security/amavisd-new/PLIST | 5 | ||||
| -rw-r--r-- | security/amavisd-new/distinfo | 8 | ||||
| -rw-r--r-- | security/amavisd-new/patches/patch-aa | 49 |
4 files changed, 38 insertions, 40 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 45728057eb5..178ee6d6725 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/08/22 19:32:52 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/11/28 23:31:49 wiz Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -8,7 +8,7 @@ MASTER_SITES= http://www.ijs.si/software/amavisd/ \ http://ftp.cfu.net/pub/amavisd-new/ \ ftp://ftp.cfu.net/pub/amavisd-new/ -VERSION= 20040701 +VERSION= 2.2.0 PATCHLEVEL= # empty MAINTAINER= jdunn@aquezada.com @@ -22,10 +22,12 @@ DEPENDS+= p5-Compress-Zlib-[0-9]*:../../devel/p5-Compress-Zlib DEPENDS+= p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF DEPENDS+= p5-Convert-UUlib-[0-9]*:../../converters/p5-Convert-UUlib DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5 -DEPENDS+= p5-MIME-tools>=5.313:../../mail/p5-MIME-tools -DEPENDS+= p5-Net-[0-9]*:../../net/p5-Net +DEPENDS+= p5-MIME-tools>=5.415:../../mail/p5-MIME-tools +DEPENDS+= p5-MailTools>=1.58:../../mail/p5-MailTools +DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy +DEPENDS+= p5-Net>=1.16:../../net/p5-Net DEPENDS+= p5-Net-Server-[0-9]*:../../net/p5-Net-Server -DEPENDS+= p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes +DEPENDS+= p5-Time-HiRes>=1.49:../../time/p5-Time-HiRes DEPENDS+= p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog WRKSRC= ${WRKDIR}/amavisd-new-${VERSION} @@ -37,7 +39,7 @@ CONFLICTS+= amavis-perl-[0-9]* USE_PERL5= yes PERL5_REQD= 5.8.2 -REPLACE_PERL+= amavisd +REPLACE_PERL+= amavisd amavisd-nanny USE_PKGINSTALL= yes AMAVIS_USER?= vscan @@ -111,6 +113,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${PREFIX}/sbin .endif ${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${PREFIX}/sbin/amavisd + ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny ${PREFIX}/sbin/amavisd-nanny ${INSTALL_DATA_DIR} ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/AAAREADME.first ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DOCDIR} @@ -118,6 +121,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/MANIFEST ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README_FILES/amavisd-new-docs.html ${DOCDIR} for file in README_FILES/README.*; do \ ${INSTALL_DATA} ${WRKSRC}/$$file ${DOCDIR}; \ done diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST index 7d241a67ceb..e158bd7283b 100644 --- a/security/amavisd-new/PLIST +++ b/security/amavisd-new/PLIST @@ -1,12 +1,14 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/11/28 23:31:49 wiz Exp $ ${MILTER}sbin/amavis ${MILTER}sbin/amavis-milter sbin/amavisd +sbin/amavisd-nanny share/doc/amavisd-new/AAAREADME.first 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,6 +28,7 @@ share/doc/amavisd-new/README.protocol share/doc/amavisd-new/README.sendmail share/doc/amavisd-new/README.sendmail-dual share/doc/amavisd-new/RELEASE_NOTES +share/doc/amavisd-new/amavisd-new-docs.html share/examples/amavisd-new/amavisd.conf-default share/examples/amavisd-new/amavisd.conf-minimal share/examples/amavisd-new/amavisd.conf-sample diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index caf556d3322..bd6dbf613c9 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $ +$NetBSD: distinfo,v 1.2 2004/11/28 23:31:49 wiz Exp $ -SHA1 (amavisd-new-20040701.tar.gz) = 77c037cb13e629f5f2c038d56a62c1cdae904075 -Size (amavisd-new-20040701.tar.gz) = 451622 bytes -SHA1 (patch-aa) = 4364b6501c0730b623c48afee6f24b6256c6b84f +SHA1 (amavisd-new-2.2.0.tar.gz) = b40385707ed635346278e0e8f63fbc1371381477 +Size (amavisd-new-2.2.0.tar.gz) = 586935 bytes +SHA1 (patch-aa) = 30a62b2e8954bcb5b106a9715f1e64837065fbe0 diff --git a/security/amavisd-new/patches/patch-aa b/security/amavisd-new/patches/patch-aa index 85868e5f613..3e91d1180c2 100644 --- a/security/amavisd-new/patches/patch-aa +++ b/security/amavisd-new/patches/patch-aa @@ -1,42 +1,33 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2004/11/28 23:31:49 wiz Exp $ ---- amavisd.conf.orig Thu Jul 1 16:04:36 2004 +--- amavisd.conf.orig 2004-11-02 22:22:48.000000000 +0100 +++ amavisd.conf -@@ -9,7 +9,7 @@ use strict; - # MUST BE SET (no useful default): - - $mydomain = 'example.com'; --$MYHOME = '/var/amavis'; -+$MYHOME = '@AMAVIS_DIR@'; - $TEMPBASE = "$MYHOME/tmp"; - - -@@ -19,8 +19,8 @@ $TEMPBASE = "$MYHOME/tmp"; +@@ -12,15 +12,15 @@ use strict; # @bypass_spam_checks_maps = (1); # uncomment to DISABLE anti-spam code - $max_servers = 2; # number of pre-forked children --$daemon_user = 'vscan'; # (no default; customary: vscan or amavis) --$daemon_group = 'vscan'; # (no default; customary: vscan or amavis) -+$daemon_user = '@AMAVIS_USER@'; # (no default; customary: vscan or amavis) -+$daemon_group = '@AMAVIS_GROUP@'; # (no default; customary: vscan or amavis) - @local_domains_maps = ( [".$mydomain"] ); + $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 = '@AMAVIS_USER@'; # (no default; customary: vscan or amavis) ++$daemon_group = '@AMAVIS_GROUP@'; # (no default; customary: vscan or amavis) - $log_level = 0; -@@ -28,7 +28,7 @@ $log_recip_templ = undef; # disable b - $DO_SYSLOG = 1; - $SYSLOG_LEVEL = 'mail.info'; - $ENV{TMPDIR} = $TEMPBASE; + $mydomain = 'example.com'; # a convenient default for other settings + +-$MYHOME = '/var/amavis'; # a convenient default for other settings ++$MYHOME = '@AMAVIS_DIR@'; # 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'; +$QUARANTINEDIR = '@AMAVIS_QUARANTINE@'; - # $daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot) - $inet_socket_port = 10024; # accept SMTP on this local TCP port(s) (Postfix) -@@ -55,7 +55,7 @@ $mailfrom_notify_spamadmin = "spam.polic - @addr_extension_banned_maps = ('banned'); - @addr_extension_bad_header_maps = ('badh'); + # $daemon_chroot_dir = $MYHOME; # chroot directory or undef + +@@ -72,7 +72,7 @@ $mailfrom_to_quarantine = ''; # null ret + # $recipient_delimiter = '+'; # undef disables address extensions altogether + # when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+ -$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin'; +$path = '@PREFIX@/sbin:@PREFIX@/bin:@LOCALBASE@/sbin:@LOCALBASE@/bin:/usr/sbin:/sbin:/usr/bin:/bin'; - $file = 'file'; # file(1) utility; use 3.41 or later to avoid vulnerability + $file = 'file'; # file(1) utility; use recent versions $gzip = 'gzip'; $bzip2 = 'bzip2'; |