Giovanni Bechis wrote:
Update to 2.6.4 and port splitted into 2 packages:
-main: the main server
-utils: some utilities needed to monitor and collect statistics
Ok ? Comments ?
New diff with correct pkgpath (fixed by william@).
Ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 28 Apr 2009 09:01:56 -0000 1.10
+++ Makefile 27 Jul 2009 16:03:46 -0000
@@ -1,8 +1,12 @@
# $OpenBSD: Makefile,v 1.10 2009/04/28 09:01:56 giovanni Exp $
-COMMENT= interface between mailer MTA and content checkers
+COMMENT-main= interface between mailer MTA and content checkers
+COMMENT-utils= amavisd-new utilities
-DISTNAME= amavisd-new-2.6.3
+V= 2.6.4
+DISTNAME= amavisd-new-${V}
+PKGNAME-main= ${DISTNAME}
+PKGNAME-utils= amavisd-new-utils-${V}
CATEGORIES= mail security
HOMEPAGE= http://www.ijs.si/software/amavisd/
@@ -20,13 +24,16 @@ MASTER_SITES= ${HOMEPAGE} \
http://mirror.cedratnet.com/amavisd-new/ \
http://mirror.omroep.nl/amavisd-new/
-RUN_DEPENDS= ::archivers/arc \
+MULTI_PACKAGES= -main -utils
+
+RUN_DEPENDS-main= ::archivers/arc \
::archivers/bzip2 \
::archivers/cabextract \
::archivers/freeze \
::archivers/lha \
::archivers/lzop \
:p5-Archive-Zip->=1.14:archivers/p5-Archive-Zip \
+ ::archivers/p7zip \
::archivers/ripole \
::archivers/unarj \
::archivers/unrar \
@@ -43,6 +50,9 @@ RUN_DEPENDS= ::archivers/arc \
::security/clamav \
::sysutils/p5-Unix-Syslog
+RUN_DEPENDS-utils= :amavisd-new->=2.6.4:mail/amavisd-new \
+ ::net/net-snmp,-perl
+
NO_BUILD= Yes
NO_REGRESS= Yes
@@ -56,11 +66,16 @@ do-install:
${PREFIX}/bin/amavisd-nanny
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release \
${PREFIX}/bin/amavisd-release
+ ${INSTALL_SCRIPT} ${WRKSRC}/amavisd-snmp-subagent \
+ ${PREFIX}/bin/amavisd-snmp-subagent
+ ${INSTALL_SCRIPT} ${WRKSRC}/p0f-analyzer.pl \
+ ${PREFIX}/bin/p0f-analyzer.pl
${INSTALL_DATA} ${WRKSRC}/JpegTester.pm \
${PREFIX}/libdata/perl5/site_perl/JpegTester.pm
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/AAAREADME.first \
${PREFIX}/share/doc/amavisd-new
+ ${INSTALL_DATA} ${WRKSRC}/AMAVIS-MIB.txt ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/LDAP.schema ${PREFIX}/share/doc/amavisd-new
${INSTALL_DATA} ${WRKSRC}/LDAP.ldif ${PREFIX}/share/doc/amavisd-new
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 28 Apr 2009 09:01:56 -0000 1.9
+++ distinfo 27 Jul 2009 16:03:46 -0000
@@ -1,5 +1,5 @@
-MD5 (amavisd-new-2.6.3.tar.gz) = ArC9OLQCWIQcYEeWA9xoQg==
-RMD160 (amavisd-new-2.6.3.tar.gz) = kR41bbwqkAc0xch73SMYRqvk+eg=
-SHA1 (amavisd-new-2.6.3.tar.gz) = EqEgtPxhSgsyacsOwO4YXLPnwT8=
-SHA256 (amavisd-new-2.6.3.tar.gz) =
R+d0V5/aseHBDvIpXUnLURsT4FQxp5Vcc/B+mAJdeI4=
-SIZE (amavisd-new-2.6.3.tar.gz) = 918888
+MD5 (amavisd-new-2.6.4.tar.gz) = A9MWV/FM1kwcs4eGIUI0tA==
+RMD160 (amavisd-new-2.6.4.tar.gz) = AQ3Zv0mjx1U5lsSVU/0PqEynvas=
+SHA1 (amavisd-new-2.6.4.tar.gz) = mTt8qDnOA4/RP2U1GVDw7wPZn/k=
+SHA256 (amavisd-new-2.6.4.tar.gz) =
QP4bZV3rk0x6ZVprW0MN8mjsmsgHVLEgeVvEXUrnae8=
+SIZE (amavisd-new-2.6.4.tar.gz) = 947596
Index: patches/patch-amavisd
===================================================================
RCS file: /cvs/ports/mail/amavisd-new/patches/patch-amavisd,v
retrieving revision 1.7
diff -u -p -r1.7 patch-amavisd
--- patches/patch-amavisd 28 Apr 2009 09:01:56 -0000 1.7
+++ patches/patch-amavisd 27 Jul 2009 16:03:46 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-amavisd,v 1.7 2009/04/28 09:01:56 giovanni Exp $
---- amavisd.orig Wed Apr 22 02:24:12 2009
-+++ amavisd Tue Apr 28 09:11:49 2009
-@@ -21775,6 +21775,7 @@ sub initializeSpamAssassin {
+--- amavisd.orig Thu Jun 25 14:39:01 2009
++++ amavisd Mon Jul 20 17:49:14 2009
+@@ -22083,6 +22083,7 @@ sub initializeSpamAssassin {
rules_filename => $sa_configpath,
site_rules_filename => $sa_siteconfigpath,
# LOCAL_STATE_DIR => '/var/lib',
Index: patches/patch-amavisd-agent
===================================================================
RCS file: patches/patch-amavisd-agent
diff -N patches/patch-amavisd-agent
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-amavisd-agent 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- amavisd-agent.orig Mon Jul 20 17:50:55 2009
++++ amavisd-agent Mon Jul 20 17:51:09 2009
+@@ -50,7 +50,7 @@ use BerkeleyDB;
+
+ my($dbfile) = 'snmp.db';
+ my($db_home) = # DB databases directory
+- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavis/db';
++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavisd/db';
+
+ my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
Index: patches/patch-amavisd-nanny
===================================================================
RCS file: patches/patch-amavisd-nanny
diff -N patches/patch-amavisd-nanny
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-amavisd-nanny 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- amavisd-nanny.orig Mon Jul 20 17:50:13 2009
++++ amavisd-nanny Mon Jul 20 17:50:31 2009
+@@ -58,7 +58,7 @@ my($activettl) = 10*60; # stuck active children are se
+
+ my($dbfile) = 'nanny.db';
+ my($db_home) = # DB databases directory
+- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavis/db';
++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavisd/db';
+ my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+
Index: patches/patch-amavisd-snmp-subagent
===================================================================
RCS file: patches/patch-amavisd-snmp-subagent
diff -N patches/patch-amavisd-snmp-subagent
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-amavisd-snmp-subagent 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- amavisd-snmp-subagent.orig Mon Jul 20 17:51:16 2009
++++ amavisd-snmp-subagent Mon Jul 20 17:51:40 2009
+@@ -64,7 +64,7 @@ $syslog_ident = $myproduct_name;
+ $syslog_facility = LOG_MAIL;
+
+ my($db_home) = # DB databases directory
+- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavis/db';
++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} :
'/var/amavisd/db';
+
+ my($mta_queue_dir);
+
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 23 Apr 2004 15:24:54 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-amavisd-new is a high-performance interface between mailer (MTA) and
-content checkers: virus scanners, and/or SpamAssassin. It is written in
-Perl for maintainability, without paying a significant price for speed.
-It talks to MTA via (E)SMTP or LMTP, or by using helper programs. Best
-with Postfix, fine with dual-sendmail setup and Exim v4, works with
-sendmail/milter, or with any MTA as a SMTP relay. 'Howto' for qmail
-available as well.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,7 @@
+amavisd-new is a high-performance interface between mailer (MTA) and
+content checkers: virus scanners, and/or SpamAssassin. It is written in
+Perl for maintainability, without paying a significant price for speed.
+It talks to MTA via (E)SMTP or LMTP, or by using helper programs. Best
+with Postfix, fine with dual-sendmail setup and Exim v4, works with
+sendmail/milter, or with any MTA as a SMTP relay. 'Howto' for qmail
+available as well.
Index: pkg/DESCR-utils
===================================================================
RCS file: pkg/DESCR-utils
diff -N pkg/DESCR-utils
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-utils 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1 @@
+A collection of utilities needed to monitor an amavisd-new daemon.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 28 Apr 2009 09:01:56 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.9 2009/04/28 09:01:56 giovanni Exp $
-...@newgroup _vscan:530
-...@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
-bin/amavisd-agent
-bin/amavisd-nanny
-bin/amavisd-release
-libdata/perl5/site_perl/JpegTester.pm
-sbin/amavisd
-share/doc/amavisd-new/
-share/doc/amavisd-new/AAAREADME.first
-share/doc/amavisd-new/INSTALL
-share/doc/amavisd-new/LDAP.ldif
-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
-share/doc/amavisd-new/README.courier-old
-share/doc/amavisd-new/README.customize
-share/doc/amavisd-new/README.exim_v3
-share/doc/amavisd-new/README.exim_v3_app
-share/doc/amavisd-new/README.exim_v4
-share/doc/amavisd-new/README.exim_v4_app
-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.milter
-share/doc/amavisd-new/README.old.scanners
-share/doc/amavisd-new/README.performance
-share/doc/amavisd-new/README.policy-on-notifications
-share/doc/amavisd-new/README.postfix
-share/doc/amavisd-new/README.postfix.html
-share/doc/amavisd-new/README.protocol
-share/doc/amavisd-new/README.sendmail
-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-mysql
-share/doc/amavisd-new/README.sql-pg
-share/doc/amavisd-new/RELEASE_NOTES
-share/examples/amavisd-new/
-share/examples/amavisd-new/amavisd.conf
-...@sample ${SYSCONFDIR}/amavisd.conf
-share/examples/amavisd-new/amavisd.conf-default
-share/examples/amavisd-new/amavisd.conf-sample
-...@mode 0755
-...@owner _vscan
-...@group _vscan
-...@sample /var/amavisd/
-...@sample /var/amavisd/tmp/
-...@sample /var/amavisd/db/
-...@sample /var/amavisd/var/
-...@sample /var/virusmails/
-...@extraunexec rm -fr /var/amavisd/*
-...@extraunexec rm -fr /var/virusmails/*
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,55 @@
+...@comment $OpenBSD$
+...@pkgpath mail/amavisd-new
+...@newgroup _vscan:530
+...@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
+libdata/perl5/site_perl/JpegTester.pm
+sbin/amavisd
+share/doc/amavisd-new/
+share/doc/amavisd-new/AAAREADME.first
+share/doc/amavisd-new/INSTALL
+share/doc/amavisd-new/LDAP.ldif
+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
+share/doc/amavisd-new/README.courier-old
+share/doc/amavisd-new/README.customize
+share/doc/amavisd-new/README.exim_v3
+share/doc/amavisd-new/README.exim_v3_app
+share/doc/amavisd-new/README.exim_v4
+share/doc/amavisd-new/README.exim_v4_app
+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.milter
+share/doc/amavisd-new/README.old.scanners
+share/doc/amavisd-new/README.performance
+share/doc/amavisd-new/README.policy-on-notifications
+share/doc/amavisd-new/README.postfix
+share/doc/amavisd-new/README.postfix.html
+share/doc/amavisd-new/README.protocol
+share/doc/amavisd-new/README.sendmail
+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-mysql
+share/doc/amavisd-new/README.sql-pg
+share/doc/amavisd-new/RELEASE_NOTES
+share/examples/amavisd-new/
+share/examples/amavisd-new/amavisd.conf
+...@sample ${SYSCONFDIR}/amavisd.conf
+share/examples/amavisd-new/amavisd.conf-default
+share/examples/amavisd-new/amavisd.conf-sample
+...@mode 0755
+...@owner _vscan
+...@group _vscan
+...@sample /var/amavisd/
+...@sample /var/amavisd/tmp/
+...@sample /var/amavisd/db/
+...@sample /var/amavisd/var/
+...@sample /var/virusmails/
+...@extraunexec rm -fr /var/amavisd/*
+...@extraunexec rm -fr /var/virusmails/*
Index: pkg/PLIST-utils
===================================================================
RCS file: pkg/PLIST-utils
diff -N pkg/PLIST-utils
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-utils 27 Jul 2009 16:03:46 -0000
@@ -0,0 +1,7 @@
+...@comment $OpenBSD$
+bin/amavisd-agent
+bin/amavisd-nanny
+bin/amavisd-release
+bin/amavisd-snmp-subagent
+bin/p0f-analyzer.pl
+share/doc/amavisd-new/AMAVIS-MIB.txt
