[csw-devel] SF.net SVN: gar:[2282] csw/trunk/server/amavisd-new
idogan23 at users.sourceforge.net
idogan23 at users.sourceforge.net
Thu Nov 13 13:15:08 CET 2008
Revision: 2282
http://gar.svn.sourceforge.net/gar/?rev=2282&view=rev
Author: idogan23
Date: 2008-11-13 12:15:08 +0000 (Thu, 13 Nov 2008)
Log Message:
-----------
updated to 2.6.1 and fixed many things
Modified Paths:
--------------
csw/trunk/server/amavisd-new/Makefile
csw/trunk/server/amavisd-new/checksums
csw/trunk/server/amavisd-new/files/CSWamavisdnew.depend
csw/trunk/server/amavisd-new/files/CSWamavisdnew.gspec
csw/trunk/server/amavisd-new/files/amavisd.diff
Added Paths:
-----------
csw/trunk/server/amavisd-new/files/CSWamavisdnew.prototype
Modified: csw/trunk/server/amavisd-new/Makefile
===================================================================
--- csw/trunk/server/amavisd-new/Makefile 2008-11-12 19:48:01 UTC (rev 2281)
+++ csw/trunk/server/amavisd-new/Makefile 2008-11-13 12:15:08 UTC (rev 2282)
@@ -1,5 +1,5 @@
GARNAME = amavisd-new
-GARVERSION = 2.6.0
+GARVERSION = 2.6.1
CATEGORIES = server
DESCRIPTION = Interface between MTA and content checkers
@@ -9,7 +9,7 @@
MASTER_SITES = http://www.ijs.si/software/amavisd/#download
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-DISTFILES += $(call admfiles,CSWamavisdnew, depend postinstall preinstall)
+DISTFILES += $(call admfiles,CSWamavisdnew, depend postinstall preinstall prototype)
PATCHFILES += amavisd-agent.diff
PATCHFILES += amavisd-nanny.diff
@@ -18,6 +18,8 @@
PATCHFILES += amavisd.diff
PATCHFILES += p0f-analyzer.pl.diff
+SPKG_CLASSES = none cswinitsmf
+
CONFIGURE_SCRIPTS =
BUILD_SCRIPTS =
TEST_SCRIPTS =
@@ -27,16 +29,17 @@
AMAVISSBIN=amavisd-new
AMAVISDOC=LDAP.schema README_FILES RELEASE_NOTES AAAREADME.first \
amavisd.conf-default amavisd.conf-sample
-AMAVISETC=amavisd-new.conf.CSW
install-custom:
echo " ==> Installing $(GARNAME)"
+ ginstall -d $(DESTDIR)$(prefix)/etc
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 $(AMAVISBIN) $(DESTDIR)$(prefix)/bin; \
cp $(AMAVISSBIN) $(DESTDIR)$(prefix)/sbin; \
cp -r $(AMAVISDOC) $(DESTDIR)$(prefix)/share/doc/amavisd-new
Modified: csw/trunk/server/amavisd-new/checksums
===================================================================
--- csw/trunk/server/amavisd-new/checksums 2008-11-12 19:48:01 UTC (rev 2281)
+++ csw/trunk/server/amavisd-new/checksums 2008-11-13 12:15:08 UTC (rev 2282)
@@ -1,11 +1,12 @@
-71761c55054095279bda559177682164 download/amavisd-new-2.6.0.tar.gz
-e7621438f0fda006fa7e27a303321dc6 download/CSWamavisdnew.gspec
-8691b60b244d18b35e1f83396e60b015 download/CSWamavisdnew.depend
+2474d4c034f96a58e5b8af91af514689 download/amavisd-new-2.6.1.tar.gz
+979fd28f16513f660912311c3566786d download/CSWamavisdnew.gspec
+1a54bc6b9d92afadc704c394cb93fa00 download/CSWamavisdnew.depend
65f66fb3036b7949057733aa99cff724 download/CSWamavisdnew.postinstall
171767585ab6662c0cbedae26e9baa2c download/CSWamavisdnew.preinstall
+6061cecc2d1bdc09e05ac39ea7d2c20f download/CSWamavisdnew.prototype
06abbedc006af9fc3de5d2a0906ae106 download/amavisd-agent.diff
009c78f04e602536ce0ba4573ab805e1 download/amavisd-nanny.diff
f218d10e5280940268a3ffaa125a00ae download/amavisd-release.diff
721d0037d0dfcdbe254a76becad8ad25 download/amavisd.conf.diff
-42d66a1f3a16fcd8abfe52e617400a05 download/amavisd.diff
+071af9fb79ee5e9d045905043fea2b96 download/amavisd.diff
befafc9594d5e1c1c8710b7d4d129d0b download/p0f-analyzer.pl.diff
Modified: csw/trunk/server/amavisd-new/files/CSWamavisdnew.depend
===================================================================
--- csw/trunk/server/amavisd-new/files/CSWamavisdnew.depend 2008-11-12 19:48:01 UTC (rev 2281)
+++ csw/trunk/server/amavisd-new/files/CSWamavisdnew.depend 2008-11-13 12:15:08 UTC (rev 2282)
@@ -12,3 +12,4 @@
P CSWpmberkeleydb
P CSWpmconverttnef
P CSWpmconvertuulib
+P CSWpmmaildkim
Modified: csw/trunk/server/amavisd-new/files/CSWamavisdnew.gspec
===================================================================
--- csw/trunk/server/amavisd-new/files/CSWamavisdnew.gspec 2008-11-12 19:48:01 UTC (rev 2281)
+++ csw/trunk/server/amavisd-new/files/CSWamavisdnew.gspec 2008-11-13 12:15:08 UTC (rev 2282)
@@ -1,6 +1,5 @@
%var bitname amavisd_new
%var pkgname CSWamavisdnew
+%var arch all
%include url file://%{PKGLIB}/csw_dyndepend.gspec
%copyright url file://%{WORKSRC}/LICENSE
-%var spkg_classes none cswinitsmf
-%var arch all
Added: csw/trunk/server/amavisd-new/files/CSWamavisdnew.prototype
===================================================================
--- csw/trunk/server/amavisd-new/files/CSWamavisdnew.prototype (rev 0)
+++ csw/trunk/server/amavisd-new/files/CSWamavisdnew.prototype 2008-11-13 12:15:08 UTC (rev 2282)
@@ -0,0 +1,75 @@
+d none /opt/csw/bin 0755 root bin
+f none /opt/csw/bin/amavisd-agent 0755 root bin
+f none /opt/csw/bin/amavisd-nanny 0755 root bin
+f none /opt/csw/bin/amavisd-release 0755 root bin
+f none /opt/csw/bin/p0f-analyzer.pl 0755 root bin
+d none /opt/csw/etc 0755 root bin
+f none /opt/csw/etc/amavisd-new.conf.CSW 0644 root bin
+d none /opt/csw/sbin 0755 root bin
+f none /opt/csw/sbin/amavisd-new 0755 root bin
+d none /opt/csw/share/doc/amavisd-new 0755 root bin
+f none /opt/csw/share/doc/amavisd-new/AAAREADME.first 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/LDAP.schema 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.banned 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.chroot 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.contributed 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.courier-old 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.customize 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v3_app 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.exim_v4_app2 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.ldap 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.lookups 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.milter 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.old.scanners 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.performance 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.policy-on-notifications 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.postfix.html 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.protocol 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sendmail-dual.old 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-mysql 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/README.sql-pg 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/TODO-SNMP-AGENT 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/amavisd-new-docs.html 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/blank.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/1.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/10.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/11.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/12.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/13.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/14.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/15.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/2.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/3.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/4.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/5.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/6.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/7.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/8.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/callouts/9.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/caution.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/draft.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/home.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/important.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/next.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/note.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/prev.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/tip.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-blank.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-minus.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/toc-plus.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/up.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/images/warning.png 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/rfc4871.txt 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/README_FILES/screen.css 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/RELEASE_NOTES 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/amavisd.conf-default 0644 root bin
+f none /opt/csw/share/doc/amavisd-new/amavisd.conf-sample 0644 root bin
+f cswinitsmf /etc/opt/csw/init.d/cswamavisdnew 0755 root bin
Modified: csw/trunk/server/amavisd-new/files/amavisd.diff
===================================================================
--- csw/trunk/server/amavisd-new/files/amavisd.diff 2008-11-12 19:48:01 UTC (rev 2281)
+++ csw/trunk/server/amavisd-new/files/amavisd.diff 2008-11-13 12:15:08 UTC (rev 2282)
@@ -1,18 +1,18 @@
-diff --speed-large-files --minimal -Nru amavisd-new-2.6.0.orig/amavisd amavisd-new-2.6.0/amavisd
---- amavisd-new-2.6.0.orig/amavisd 2008-04-23 20:50:05.000000000 +0200
-+++ amavisd-new-2.6.0/amavisd 2008-11-09 22:37:49.558245200 +0100
+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.
-@@ -595,7 +595,7 @@
- #
- BEGIN {
- # serves only as a quick default for other configuration settings
-- $MYHOME = '/var/amavis';
-+ $MYHOME = '/opt/csw/var/amavisn';
- $mydomain = '!change-mydomain-variable!.example.com';#intentionally bad deflt
+@@ -12554,7 +12554,7 @@
+ Amavis::Lookup::RE->new(@$Amavis::Conf::map_full_type_to_short_type_re);
- # Create debugging output - true: log to stderr; false: log to syslog/file
+ # 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.
More information about the devel
mailing list