Revision: 18363
http://gar.svn.sourceforge.net/gar/?rev=18363&view=rev
Author: idogan23
Date: 2012-06-12 12:09:38 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------
amavisd-new: bump version to 2.7.1, major cleanup
Modified Paths:
--------------
csw/mgar/pkg/amavisd-new/trunk/Makefile
csw/mgar/pkg/amavisd-new/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch
csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch
Removed Paths:
-------------
csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall
csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall
csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec
csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff
csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff
csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff
csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff
csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff
Modified: csw/mgar/pkg/amavisd-new/trunk/Makefile
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/Makefile 2012-06-12 11:28:18 UTC (rev
18362)
+++ csw/mgar/pkg/amavisd-new/trunk/Makefile 2012-06-12 12:09:38 UTC (rev
18363)
@@ -1,5 +1,5 @@
NAME = amavisd-new
-VERSION = 2.6.4
+VERSION = 2.7.1
CATEGORIES = server
GARTYPE = v2
@@ -16,8 +16,6 @@
MASTER_SITES = http://www.ijs.si/software/amavisd/#download
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += CSWamavisdnew.cswusergroup
-DISTFILES += CSWamavisdnew.postinstall
-DISTFILES += CSWamavisdnew.preinstall
# We define upstream file regex so we can be notifed of new upstream software
release
UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
@@ -36,6 +34,17 @@
RUNTIME_DEP_PKGS += CSWpmconvertuulib
RUNTIME_DEP_PKGS += CSWpmmaildkim
RUNTIME_DEP_PKGS += CSWpmunixsyslog
+RUNTIME_DEP_PKGS += CSWpmnetsnmp
+RUNTIME_DEP_PKGS += CSWunrar
+RUNTIME_DEP_PKGS += CSWtnef
+RUNTIME_DEP_PKGS += CSWcabex
+RUNTIME_DEP_PKGS += CSWunarj
+RUNTIME_DEP_PKGS += CSWp7zip
+RUNTIME_DEP_PKGS += CSWzip
+RUNTIME_DEP_PKGS += CSWlzop
+RUNTIME_DEP_PKGS += CSWxz
+RUNTIME_DEP_PKGS += CSWgzip
+RUNTIME_DEP_PKGS += CSWbzip2
CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmaildkim
CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmnetserver
@@ -50,20 +59,57 @@
CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWspamassassin
CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmmimetools
CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmunixsyslog
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWp7zip
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWunarj
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWgzip
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWxz
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWcabex
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWlzop
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWtnef
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWbzip2
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWzip
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWunrar
+CHECKPKG_OVERRIDES_CSWamavisdnew += surplus-dependency|CSWpmnetsnmp
-PATCHFILES += amavisd-agent.diff
-PATCHFILES += amavisd-nanny.diff
-PATCHFILES += amavisd-release.diff
-PATCHFILES += amavisd.conf.diff
-PATCHFILES += amavisd.diff
+PATCHFILES += 0001-amavisd-agent.patch
+PATCHFILES += 0001-amavisd-nanny.patch
+PATCHFILES += 0001-amavisd-release.patch
+PATCHFILES += 0001-amavisd.conf.patch
+PATCHFILES += 0001-amavisd.patch
PATCHFILES += p0f-analyzer.pl.diff
+PATCHFILES += 0001-amavisd-signer.patch
+PATCHFILES += 0001-amavisd-snmp-subagent.patch
+PATCHFILES += 0001-amavisd-submit.patch
-SPKG_CLASSES = none cswinitsmf
-PROTOTYPE_FILTER = awk ' \
- $$$$3 ~ /\/init.d\/cswamavisdnew$$$$/ { $$$$2 = "cswinitsmf" } \
- $$$$3 ~ /\/csw\/amavisd-new.conf$$$$/ { $$$$2 = "cswcpsampleconf" } \
- { print }'
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/sbin/amavisd-new
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/RELEASE_NOTES
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.milter
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/share/doc/amavisd-new/README_FILES/README.chroot
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.chroot
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/share|root/opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
file-with-bad-content|/usr/local|root/opt/csw/bin/amavisd-snmp-subagent
+CHECKPKG_OVERRIDES_CSWamavisdnew +=
catalogname-does-not-match-pkgname|pkgname=CSWamavisdnew|catalogname=amavisd_new|expected-catalogname=amavisdnew
+
+INITSMF = /etc/opt/csw/init.d/cswamavisdnew
+USERGROUP = /etc/opt/csw/pkg/CSWamavisdnew/cswusergroup
+SAMPLECONF = /etc/opt/csw/amavisn/amavisd-new.conf
+
+PROTOTYPE_MODIFIERS = amavis_ugfiles
+AMAVIS_UGFILES = /var/opt/csw/amavisn
/var/opt/csw/amavisn/tmp /var/opt/csw/amavisn/var /var/opt/csw/amavisn/db
/var/var/opt/csw/amavisn/virusmails
+PROTOTYPE_FILES_amavis_ugfiles = $(AMAVIS_UGFILES)
+PROTOTYPE_USER_amavis_ugfiles = amavisn
+PROTOTYPE_GROUP_amavis_ugfiles = amavisn
+PROTOTYPE_CLASS_amavis_ugfiles = ugfiles
+
+PROTOTYPE_MODIFIERS += amavis_chmod
+PROTOTYPE_FILES_chmod = $(AMAVIS_UGFILES)
+PROTOTYPE_PERMS_chmod = 0750
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
TEST_SCRIPTS =
@@ -73,8 +119,8 @@
PVARDIR = $(DESTDIR)/var/opt/csw/$(NAME)
AMAVISBIN = amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl
-AMAVISBIN += amavisd-nanny
-AMAVISBIN += amavisd-release
+AMAVISBIN += amavisd-nanny amavisd-signer amavisd-snmp-subagent
+AMAVISBIN += amavisd-release amavisd-submit
AMAVISBIN += p0f-analyzer.pl
AMAVISSBIN = amavisd-new
@@ -84,18 +130,17 @@
AMAVISDOC += RELEASE_NOTES
AMAVISDOC += AAAREADME.first
AMAVISDOC += amavisd.conf-default
-AMAVISDOC += amavisd.conf-sample
+AMAVISDOC += test-messages
install-custom:
echo " ==> Installing $(NAME)"
- ginstall -d $(DESTDIR)$(prefix)/etc
+ ginstall -d $(DESTDIR)/etc/opt/csw/amavisn
ginstall -d $(DESTDIR)$(prefix)/bin
ginstall -d $(DESTDIR)$(prefix)/sbin
ginstall -d $(DESTDIR)$(prefix)/share/doc/amavisd-new
cd $(WORKSRC); \
mv amavisd amavisd-new; \
- mv amavisd.conf amavisd-new.conf.CSW; \
- cp amavisd-new.conf.CSW $(DESTDIR)$(prefix)/etc; \
+ cp amavisd-new.conf $(DESTDIR)/etc/opt/csw/amavisn; \
cp $(AMAVISBIN) $(DESTDIR)$(prefix)/bin; \
cp $(AMAVISSBIN) $(DESTDIR)$(prefix)/sbin; \
cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new
Modified: csw/mgar/pkg/amavisd-new/trunk/checksums
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/checksums 2012-06-12 11:28:18 UTC (rev
18362)
+++ csw/mgar/pkg/amavisd-new/trunk/checksums 2012-06-12 12:09:38 UTC (rev
18363)
@@ -1,10 +1 @@
-b1af7a961c5f3111efeb72d83b21a0fd CSWamavisdnew.cswusergroup
-b12bd6b3223756e47e95347fc177bd7b CSWamavisdnew.postinstall
-171767585ab6662c0cbedae26e9baa2c CSWamavisdnew.preinstall
-b9cafe6715bc2703ac9411f24f248cd3 amavisd-agent.diff
-3e81998c8b933129870e3cab68d40261 amavisd-nanny.diff
-03d31657f14cd64c1cb38786214234b4 amavisd-new-2.6.4.tar.gz
-f218d10e5280940268a3ffaa125a00ae amavisd-release.diff
-9c3d4118cf3837e559a6026d6b89b377 amavisd.conf.diff
-071af9fb79ee5e9d045905043fea2b96 amavisd.diff
-befafc9594d5e1c1c8710b7d4d129d0b p0f-analyzer.pl.diff
+87cd516d1c6349a4389947fb949ff1a2 amavisd-new-2.7.1.tar.gz
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-agent.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,31 @@
+From e59bca005dc82ea0c5ff07b2736ccda4eaadbc78 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:26:06 +0200
+Subject: [PATCH] amavisd-agent
+
+---
+ amavisd-agent | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amavisd-agent b/amavisd-agent
+index 0e5565c..1dc1d3b 100755
+--- a/amavisd-agent
++++ b/amavisd-agent
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-agent, a demo program to display
+@@ -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/opt/csw/amavisn/db';
+
+ my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-nanny.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,31 @@
+From e044f36f4e7c77202278f1dc24a5f42ceffbfeb5 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:28:48 +0200
+Subject: [PATCH] amavisd-nanny
+
+---
+ amavisd-nanny | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amavisd-nanny b/amavisd-nanny
+index ddb95de..392841f 100755
+--- a/amavisd-nanny
++++ b/amavisd-nanny
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-nanny, a program to show the status
+@@ -58,7 +58,7 @@ my($activettl) = 10*60; # stuck active children are sent a
SIGTERM
+
+ 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/opt/csw/amavisn/db';
+ my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-release.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,31 @@
+From 931091cba08b5d93f299a9f6d67e088932779eb3 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:30:41 +0200
+Subject: [PATCH] amavisd-release
+
+---
+ amavisd-release | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amavisd-release b/amavisd-release
+index 8bb7f7c..87d2ace 100755
+--- a/amavisd-release
++++ b/amavisd-release
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-release, an EXAMPLE quarantine release utility program.
+@@ -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/opt/csw/amavisn/amavisd.sock';
+
+ sub sanitize_str {
+ my($str, $keep_eol) = @_;
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-signer.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,33 @@
+From ab042d4819b769df0a412ff9a8c2025bac6e0a82 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 10:50:53 +0200
+Subject: [PATCH] amavisd-signer
+
+---
+ amavisd-signer | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/amavisd-signer b/amavisd-signer
+index 1867f0a..111f199 100755
+--- a/amavisd-signer
++++ b/amavisd-signer
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-signer, a DKIM signing service daemon for amavisd.
+@@ -83,8 +83,8 @@ $VERSION = 1.000; # 20100730
+ # Please adjust the following settings as necessary:
+ #
+
+-$daemon_user = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user = 'amavisn';
++$daemon_group = 'amavisn';
+ # $daemon_chroot_dir = '/var/amavis'; # chroot directory or undef
+
+ # $daemonize = 1;
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-snmp-subagent.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,22 @@
+From ee4aacc46e0a89f996c5097a3023b31e05b4b47e Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:01:27 +0200
+Subject: [PATCH] amavisd-snmp-subagent
+
+---
+ amavisd-snmp-subagent | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amavisd-snmp-subagent b/amavisd-snmp-subagent
+index a7bd858..39a294e 100755
+--- a/amavisd-snmp-subagent
++++ b/amavisd-snmp-subagent
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This program implements a SNMP AgentX (RFC 2741) subagent for amavisd-new.
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd-submit.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,33 @@
+From d28f12c2f49eb5612ddcdff185c3b460e373a25d Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:08:44 +0200
+Subject: [PATCH] amavisd-submit
+
+---
+ amavisd-submit | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/amavisd-submit b/amavisd-submit
+index 3d86c68..029464c 100755
+--- a/amavisd-submit
++++ b/amavisd-submit
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-submit, a simple demonstrational program, taking an email
+@@ -66,8 +66,8 @@ use vars qw($VERSION); $VERSION = 2.000;
+ use vars qw($log_level $socketname $tempbase);
+
+ $log_level = 0;
+- $tempbase = '/var/amavis'; # where to create a temp directory with a msg
+- $socketname = '/var/amavis/amavisd.sock';
++ $tempbase = '/var/opt/csw/amavisn'; # where to create a temp directory
with a msg
++ $socketname = '/var/opt/csw/amavisn/amavisd.sock';
+ # $socketname = '127.0.0.1:9998';
+
+ sub sanitize_str {
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.conf.patch
2012-06-12 12:09:38 UTC (rev 18363)
@@ -0,0 +1,45 @@
+From c47e866662f728bec223702d78c556a425f2b3b4 Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:37:24 +0200
+Subject: [PATCH] amavisd.conf
+
+---
+ amavisd.conf | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/amavisd.conf b/amavisd.conf
+index 7edddde..02ed967 100644
+--- a/amavisd.conf
++++ b/amavisd.conf
+@@ -14,15 +14,15 @@ use strict;
+ # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
+
+ $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 = 'amavisn'; # (no default; customary: vscan or amavis), -u
++$daemon_group = 'amavisn'; # (no default; customary: vscan or amavis), -g
+
+ $mydomain = 'example.com'; # a convenient default for other settings
+
+-# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
++$MYHOME = '/var/opt/csw/amavisn'; # 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
++$QUARANTINEDIR = '/var/opt/csw/amavisn/virusmails'; # -Q
+ # $quarantine_subdir_levels = 1; # add level of subdirs to disperse
quarantine
+ # $release_format = 'resend'; # 'attach', 'plain', 'resend'
+ # $report_format = 'arf'; # 'attach', 'plain', 'resend', 'arf'
+@@ -126,7 +126,7 @@ $mailfrom_to_quarantine = ''; # null return path; uses
original sender if undef
+ # $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 =
'/opt/csw/bin:/opt/csw/sbin:/usr/sfw/bin:/usr/sfw/sbin:/sbin:/usr/bin:/bin'
+ # $dspam = 'dspam';
+
+ $MAXLEVELS = 14;
+--
+1.7.10.3
+
Added: csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch
(rev 0)
+++ csw/mgar/pkg/amavisd-new/trunk/files/0001-amavisd.patch 2012-06-12
12:09:38 UTC (rev 18363)
@@ -0,0 +1,31 @@
+From 845c0a27fce492baf75a10ce6b3b547e3df793aa Mon Sep 17 00:00:00 2001
+From: Ihsan Dogan <ih...@opencsw.org>
+Date: Mon, 11 Jun 2012 11:41:07 +0200
+Subject: [PATCH] amavisd
+
+---
+ amavisd | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/amavisd b/amavisd
+index 1939023..095ee8b 100755
+--- a/amavisd
++++ b/amavisd
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -T
++#!/opt/csw/bin/perl -T
+
+
#------------------------------------------------------------------------------
+ # This is amavisd-new.
+@@ -15657,7 +15657,7 @@ $Amavis::Conf::map_full_type_to_short_type_re =
+ Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re);
+
+ # default location of the config file if none specified
+-push(@config_files, '/etc/amavisd.conf') if !@config_files;
++push(@config_files, '/etc/opt/csw/amavisn/amavisd-new.conf') if
!@config_files;
+ # Read and evaluate config files, which may override default settings
+ Amavis::Conf::include_config_files(@config_files);
+ Amavis::Conf::supply_after_defaults();
+--
+1.7.10.3
+
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall
2012-06-12 11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.postinstall
2012-06-12 12:09:38 UTC (rev 18363)
@@ -1,41 +0,0 @@
-# Build log file name
-installlog=${BASEDIR}/opt/csw/var/amavisn/install-`date '+%Y%m%d%H%M%S'`
-
-# copy new config file, if it's not existing
-if [ ! -f $BASEDIR/opt/csw/etc/amavisd-new.conf ] ; then
- cp -p $BASEDIR/opt/csw/etc/amavisd-new.conf.CSW
$BASEDIR/opt/csw/etc/amavisd-new.conf
-fi
-
-
-# Upgrade and verify bdb database files for amavis.
-DB_HOME=${BASEDIR}/opt/csw/var/amavisn/db
-
-if [ -f ${BASEDIR}$DB_HOME/*.db ] ; then
- cd ${BASEDIR}$DB_HOME
-
- # Verify each file before upgrading
- echo "Running db_verify (before upgrade) on $DB_HOME" >>$installlog
- for each_db in `ls *.db`
- do
- ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db
>>$installlog 2>&1
- done
-
- # Update the database environment to the new value
- echo "Running db_recover on $DB_HOME" >>$installlog
- ${BASEDIR}/opt/csw/bdb47/bin/db_recover -h $DB_HOME >>$installlog 2>&1
-
- # Upgrade each file. This does nothing if no upgrade is needed.
- echo "Running db_upgrade on $DB_HOME" >>$installlog
- for each_db in `ls *.db`
- do
- ${BASEDIR}/opt/csw/bdb47/bin/db_upgrade -h $DB_HOME $each_db
>>$installlog 2>&1
- done
-
- # Verify each file
- echo "Running db_verify (after upgrade) on $DB_HOME" >>$installlog
- for each_db in `ls *.db`
- do
- ${BASEDIR}/opt/csw/bdb47/bin/db_verify -h $DB_HOME -o $each_db
>>$installlog 2>&1
- done
-fi
-
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall
2012-06-12 11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWamavisdnew.preinstall
2012-06-12 12:09:38 UTC (rev 18363)
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# check, if the amavisn group does exist
-grep '^amavisn:' $PKG_ROOT_DIR/etc/group >/dev/null
-if [ $? -ne 0 ] ; then
- getent passwd amavisn >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDGROUP=1
- fi
-fi
-
-# check, if the amavisn user does exist
-grep '^amavisn:' $PKG_ROOT_DIR/etc/passwd >/dev/null
-if [ $? -ne 0 ] ; then
- getent passwd amavisn >/dev/null
- if [ $? -ne 0 ] ; then
- NEEDUSER=1
- fi
-fi
-
-# create hte amavisn group, if NEEDGROUP=1
-if [ "$NEEDGROUP" = 1 ] ; then
- echo Adding required amavisn group
- /usr/sbin/groupadd amavisn
-fi
-
-# create the amavisn user, if NEEDUSER=1
-if [ "$NEEDUSER" = 1 ] ; then
- echo Adding required amavisn user
-
- # create necessary directories
- mkdir -p /opt/csw/var/amavisn/tmp /opt/csw/var/amavisn/var
/opt/csw/var/amavisn/db
-
- # create the amavis user
- /usr/sbin/useradd -d /opt/csw/var/amavisn -g amavisn -c 'amavisn pseud
user' -s /bin/false amavisn
-
- # change ownership & permissions
- chown -R amavisn:amavisn /opt/csw/var/amavisn
- chmod -R 750 /opt/csw/var/amavisn
-
- # create a quarantine area for virus mails, set perm & owner
- mkdir /opt/csw/var/amavisn-quarantine
- chown amavisn:amavisn /opt/csw/var/amavisn-quarantine
- chmod 750 /opt/csw/var/amavisn-quarantine
-fi
-
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec 2012-06-12
11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/CSWpackage.gspec 2012-06-12
12:09:38 UTC (rev 18363)
@@ -1,4 +0,0 @@
-%var bitname amavisd_new
-%var pkgname CSWamavisdnew
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright url file://%{WORKSRC}/LICENSE
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff 2012-06-12
11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-agent.diff 2012-06-12
12:09:38 UTC (rev 18363)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-agent
amavisd-new-2.6.0/amavisd-agent
---- amavisd-new-2.6.0.orig/amavisd-agent 2008-04-10 20:47:12.000000000
+0200
-+++ amavisd-new-2.6.0/amavisd-agent 2008-11-09 22:41:09.872612800 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -T
-+#!opt/csw/bin/perl -T
-
-
#------------------------------------------------------------------------------
- # This is amavisd-agent, a demo program to display
-@@ -50,7 +50,7 @@
-
- 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'} :
'/opt/csw/var/amavisn/db';
-
- my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
- my($repeatcount); # -c, repeat count (when defined)
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff 2012-06-12
11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-nanny.diff 2012-06-12
12:09:38 UTC (rev 18363)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-nanny
amavisd-new-2.6.0/amavisd-nanny
---- amavisd-new-2.6.0.orig/amavisd-nanny 2008-03-28 23:55:02.000000000
+0100
-+++ amavisd-new-2.6.0/amavisd-nanny 2008-11-09 22:42:52.323269000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -T
-+#!/opt/csw/bin/perl -T
-
-
#------------------------------------------------------------------------------
- # This is amavisd-nanny, a program to show the status
-@@ -58,7 +58,7 @@
-
- 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'} :
'/opt/csw/var/amavisn/db';
- my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
- my($repeatcount); # -c, repeat count (when defined)
-
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff 2012-06-12
11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd-release.diff 2012-06-12
12:09:38 UTC (rev 18363)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd-release
amavisd-new-2.6.0/amavisd-release
---- amavisd-new-2.6.0.orig/amavisd-release 2008-03-17 15:43:33.000000000
+0100
-+++ amavisd-new-2.6.0/amavisd-release 2008-11-09 22:43:55.624383000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -T
-+#!/opt/csw/bin/perl -T
-
-
#------------------------------------------------------------------------------
- # This is amavisd-release, an EXAMPLE quarantine release utility program.
-@@ -79,7 +79,7 @@
-
- $log_level = 1;
- # $socketname = '127.0.0.1:9998';
-- $socketname = '/var/amavis/amavisd.sock';
-+ $socketname = '/opt/csw/var/amavisn/amavisd.sock';
-
- sub sanitize_str {
- my($str, $keep_eol) = @_;
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff 2012-06-12
11:28:18 UTC (rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd.conf.diff 2012-06-12
12:09:38 UTC (rev 18363)
@@ -1,28 +0,0 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.2.orig/amavisd.conf
amavisd-new-2.6.2/amavisd.conf
---- amavisd-new-2.6.2.orig/amavisd.conf 2008-12-15 01:50:03.000000000
+0100
-+++ amavisd-new-2.6.2/amavisd.conf 2009-04-17 22:51:46.060535660 +0200
-@@ -15,12 +15,12 @@
- # $bypass_decode_parts = 1; # controls running of decoders&dearchivers
-
- $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 = 'amavisn'; # (no default; customary: vscan or amavis), -u
-+$daemon_group = 'amavisn'; # (no default; customary: vscan or amavis), -g
-
- $mydomain = 'example.com'; # a convenient default for other settings
-
--# $MYHOME = '/var/amavis'; # a convenient default for other settings, -H
-+$MYHOME = '/opt/csw/var/amavisn'; # 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
-@@ -130,7 +130,7 @@
- # $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 =
'/opt/csw/bin:/opt/csw/sbin:/usr/sfw/bin:/usr/sfw/sbin:/sbin:/usr/bin:/bin';
- # $dspam = 'dspam';
-
- $MAXLEVELS = 14;
Deleted: csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff
===================================================================
--- csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff 2012-06-12 11:28:18 UTC
(rev 18362)
+++ csw/mgar/pkg/amavisd-new/trunk/files/amavisd.diff 2012-06-12 12:09:38 UTC
(rev 18363)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.1.orig/amavisd
amavisd-new-2.6.1/amavisd
---- amavisd-new-2.6.1.orig/amavisd 2008-06-29 02:37:58.000000000 +0200
-+++ amavisd-new-2.6.1/amavisd 2008-11-13 12:53:24.516468200 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -T
-+#!/opt/csw/bin/perl -T
-
-
#------------------------------------------------------------------------------
- # This is amavisd-new.
-@@ -12554,7 +12554,7 @@
- Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re);
-
- # default location of the config file if none specified
--push(@config_files, '/etc/amavisd.conf') if !@config_files;
-+push(@config_files, '/opt/csw/etc/amavisd-new.conf') if !@config_files;
- # Read and evaluate config files, which may override default settings
- Amavis::Conf::include_config_files(@config_files);
- Amavis::Conf::supply_after_defaults();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
