[csw-devel] SF.net SVN: gar:[14876] csw/mgar/pkg/spamassassin/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Fri Jun 24 10:35:13 CEST 2011
Revision: 14876
http://gar.svn.sourceforge.net/gar/?rev=14876&view=rev
Author: bonivart
Date: 2011-06-24 08:35:12 +0000 (Fri, 24 Jun 2011)
Log Message:
-----------
spamassassin/trunk: update to 3.3.2
Modified Paths:
--------------
csw/mgar/pkg/spamassassin/trunk/Makefile
csw/mgar/pkg/spamassassin/trunk/checksums
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW
Removed Paths:
-------------
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW
csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW
Modified: csw/mgar/pkg/spamassassin/trunk/Makefile
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/Makefile 2011-06-24 02:58:21 UTC (rev 14875)
+++ csw/mgar/pkg/spamassassin/trunk/Makefile 2011-06-24 08:35:12 UTC (rev 14876)
@@ -1,6 +1,6 @@
NAME = spamassassin
SPKG_NAME = Mail-SpamAssassin
-VERSION = 3.3.1
+VERSION = 3.3.2
CATEGORIES = net
DESCRIPTION = Mail filter with a wide range of tests
@@ -10,8 +10,8 @@
DNS blocklists, and collaborative filtering databases.
endef
+MASTER_SITES = http://apache.dataphone.se/spamassassin/source/
#MASTER_SITES = http://people.apache.org/~jm/devel/
-MASTER_SITES = http://apache.dataphone.se/spamassassin/source/
DISTFILES = $(SPKG_NAME)-$(VERSION).tar.gz
#DISTFILES = $(SPKG_NAME)-$(VERSION)-rc3.tar.gz
DISTFILES += COPYING
@@ -37,45 +37,65 @@
RUNTIME_DEP_PKGS += CSWrazor
RUNTIME_DEP_PKGS += CSWzlib
-UFILES_REGEX = $(SPKG_NAME)-(\d+(?:\.\d+)*).tar.gz
-
SAMPLECONF = /etc/opt/csw/spamassassin/.+\.pre\.CSW
SAMPLECONF += /etc/opt/csw/spamassassin/local\.cf\.CSW
SAMPLECONF += /etc/opt/csw/spamassassin/spamd\.CSW
-USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup
-#INITSMF = /opt/csw/etc/init.d/cswspamd
-INITSMF = /etc/opt/csw/init.d/cswspamd
-POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade
+USERGROUP = /etc/opt/csw/pkg/CSWspamassassin/cswusergroup
+INITSMF = /etc/opt/csw/init.d/cswspamd
+POSTMSG = /opt/csw/share/doc/spamassassin/README.upgrade
-MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre
+MIGRATE_FILES = init.pre local.cf v310.pre v312.pre v320.pre
MIGRATE_SOURCE_DIR = /opt/csw/etc/spamassassin
-MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin
+MIGRATE_DEST_DIR = /etc/opt/csw/spamassassin
CONFIGURE_SCRIPTS = custom
-BUILD_SCRIPTS = custom
-TEST_SCRIPTS = custom
-#TEST_SCRIPTS =
-INSTALL_SCRIPTS = custom
+BUILD_SCRIPTS = custom
+TEST_SCRIPTS = custom
+#TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketssl
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetdns
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-mime-base64
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-netaddr-ip
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-ldap
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-dbi
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-ssl
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWrazor
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmdbi
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmnetaddrip
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmlibwww
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmimebase64
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmuri
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailspf
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmhtmlparser
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmldap
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiosocketinet6
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-io-socket-inet6
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmailtools
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWzlib
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWgnupg
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-libwww-perl
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib
CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWosslrt
-CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmiozlib
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmipcountry
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpmmaildkim
+CHECKPKG_OVERRIDES_CSWspamassassin += surplus-dependency|CSWpm-html-parser
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/bin/spamassassin
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/spamassassin.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/sql/README
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamd
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/spamassassin
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/local|root/opt/csw/share/doc/spamassassin/README
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-compile
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/bin/sa-learn
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Util/DependencyInfo.pm
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Conf.pm
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/spamassassin-run.pod
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin.pm
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/perl/csw/Mail/SpamAssassin/Locales.pm
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-learn.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamd.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/sa-compile.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/spamassassin-run.3perl
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man1/spamassassin-run.1
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/man/man3/Mail::SpamAssassin::Conf.3perl
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/README
+CHECKPKG_OVERRIDES_CSWspamassassin += file-with-bad-content|/usr/share|root/opt/csw/share/doc/spamassassin/USAGE
include gar/category.mk
Modified: csw/mgar/pkg/spamassassin/trunk/checksums
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/checksums 2011-06-24 02:58:21 UTC (rev 14875)
+++ csw/mgar/pkg/spamassassin/trunk/checksums 2011-06-24 08:35:12 UTC (rev 14876)
@@ -1,2 +1 @@
-3b83ef96387f14655fc854ddc3c6bd57 COPYING
-5a93f81fda315411560ff5da099382d2 Mail-SpamAssassin-3.3.1.tar.gz
+d1d62cc5c6eac57e88c4006d9633b81e Mail-SpamAssassin-3.3.2.tar.gz
Modified: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW 2011-06-24 02:58:21 UTC (rev 14875)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.README.CSW 2011-06-24 08:35:12 UTC (rev 14876)
@@ -1,5 +1,8 @@
Notes for the CSW spamassassin distribution
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Update 2011-06-24
+This update includes SpamAssassin 3.3.2.
+
update 2008.10.21
This update includes SpamAssassin 3.2.5 and the package has been moved into
the GAR build system.
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW 2011-06-24 02:58:21 UTC (rev 14875)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.spamd.xml.CSW 2011-06-24 08:35:12 UTC (rev 14876)
@@ -1,112 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<!--
- Copyright 2004 Sun Microsystems, Inc. All rights reserved.
- Use is subject to license terms.
-
- ident "@(#)spamd.xml 1.0 06/02/10 SMI"
-
- NOTE: This service manifest is for CSWspamassassin and is
- not editable; its contents will be overwritten by pkg-get
- upgrade. Make customizations in a different file.
--->
-
-<service_bundle type='manifest' name='CSWspamassassin:spamd'>
-
-<service
- name='application/spamd'
- type='service'
- version='1'>
-
- <single_instance />
-
- <dependency
- name='fs-local'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/filesystem/local' />
- </dependency>
-
- <dependency
- name='network-service'
- grouping='require_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/network/service' />
- </dependency>
-
- <dependency
- name='system-log'
- grouping='optional_all'
- restart_on='none'
- type='service'>
- <service_fmri value='svc:/system/system-log' />
- </dependency>
-
- <instance name='cswspamd' enabled='false'>
-
- <dependency
- name='config-file'
- grouping='require_all'
- restart_on='refresh'
- type='path'>
- <service_fmri
- value='file://localhost/opt/csw/etc/spamassassin/local.cf' />
- </dependency>
-
- <dependent
- name='spamd_multi-user'
- grouping='optional_all'
- restart_on='none'>
- <service_fmri
- value='svc:/milestone/multi-user' />
- </dependent>
-
- <exec_method
- type='method'
- name='start'
- exec='/opt/csw/lib/svc/method/svc-spamd start'
- timeout_seconds='120' />
-
- <exec_method
- type='method'
- name='stop'
- exec='/opt/csw/lib/svc/method/svc-spamd stop %{restarter/contract}'
- timeout_seconds='60' />
-
- <exec_method
- type='method'
- name='restart'
- exec='/opt/csw/lib/svc/method/svc-spamd restart'
- timeout_seconds='60' />
-
- <property_group name='startd' type='framework'>
- <propval name='ignore_error' type='astring'
- value='core,signal' />
- </property_group>
-
- <property_group name='general' type='framework'>
- <propval name='action_authorization' type='astring'
- value='solaris.smf.manage.spamd' />
- </property_group>
-
- <template>
- <common_name>
- <loctext xml:lang='C'>
- spamd SpamAssassin daemon
- </loctext>
- </common_name>
- <documentation>
- <manpage title='spamd' section='1'
- manpath='/opt/csw/share/man' />
- </documentation>
- </template>
-
- </instance>
-
- <stability value='Unstable' />
-
-</service>
-
-</service_bundle>
Deleted: csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW
===================================================================
--- csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW 2011-06-24 02:58:21 UTC (rev 14875)
+++ csw/mgar/pkg/spamassassin/trunk/files/CSWspamassassin.svc-spamd.CSW 2011-06-24 08:35:12 UTC (rev 14876)
@@ -1,46 +0,0 @@
-#!/sbin/sh
-#
-# From: skod at ises-llc.com (Scott Griffith, ISES-LLC)
-# To: <craig at stanfordalumni.org>, <spamassassin-talk at lists.sourceforge.net>
-# Subject: Re: [Spamassassin-talk] SysV-style startup script
-# Date: Sat, 24 Nov 2001 12:09:16 -0700
-# Modified for CSW by Alex Moore
-# Changed for SMF
-#
-# In case there are any Solaris folks out there who aren't comfortable
-# with their own rc scripts, here's what I've been using for Solaris 7
-# from day 1 with no problems. Filename:
-#
-
-. /lib/svc/share/smf_include.sh
-
-PATH=$PATH:/usr/bin:/opt/csw/bin
-
-case "$1" in
-'start')
- if [ -x /usr/bin/spamd -o -x /opt/csw/bin/spamd ]
- then
- spamd -d -i 127.0.0.1 -m 10 --min-children=2 --max-conn-per-child=50 -s local2 --syslog-socket=inet -u spamd -x -r /opt/csw/var/spamd/spamd.pid
- fi
- ;;
-
-'stop')
- /usr/bin/pkill -9 -x -u 0 '(spamd)'
- ;;
-
-restart)
- stop
- while pgrep spamd > /dev/null
- do
- sleep 1
- done
- start
- ;;
-
-*)
- echo "Usage: $0 { start | stop | restart }"
- exit 1
- ;;
-esac
-exit 0
-
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