summaryrefslogtreecommitdiffstats
path: root/mail/dspam/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/dspam/files')
-rw-r--r--mail/dspam/files/UPDATING31
-rw-r--r--mail/dspam/files/dspam.in17
-rw-r--r--mail/dspam/files/patch-scripts__train.pl17
-rw-r--r--mail/dspam/files/patch-src__dspam.c11
-rw-r--r--mail/dspam/files/patch-src__dspam.conf.in32
5 files changed, 66 insertions, 42 deletions
diff --git a/mail/dspam/files/UPDATING b/mail/dspam/files/UPDATING
index c5c167d..04ed4d3 100644
--- a/mail/dspam/files/UPDATING
+++ b/mail/dspam/files/UPDATING
@@ -17,6 +17,37 @@ in the port directory:
make extract; more `find . -type f -maxdepth 2 -name UPGRADING`
###########################################################################
+# dspam-3.10.2
+#
+
+Upstream Changes:
+- Support for Postgresql 9.1 added
+- Support for Postgresql <8.1 dropped (EOL)
+- Support for MySQL 5.5 added
+- Support for MySQL <5.0 dropped
+- Updated license from GPLv2 to AGPLv3
+- Bug in RSET handling during LHLO phase
+- Location of configuration files in dspam home (/var/dspam) can be changed
+ through dspam.conf
+- Various fixes to the webui templates
+- Various small bugs and memleaks
+- Missing documentation added to tarball
+- Many bugfixes
+
+Port Changes:
+- Merge mail/dspam-devel and mail/dspam (PR #193693)
+- Update to OptionsNG
+- Fix pidfile location discrepancy introduced in 3.10.2
+- Port cleanup by various submitters, thanks! [1][2][3][4][5]
+
+[1] Patch from <yds@CoolRat.org> (PR #180695, #191610)
+[2] Patch from Radim Kolar <hsn@sendmail.cz> (PR #167289)
+[3] Patch from Olli Hauer <ohauer@FreeBSD.org> (PR #148485)
+[4] Patch from <mtomasek4@gmail.com> (PR #191610)
+[5] Patch from Rene Ladan <rene@FreeBSD.org> (PR #191797)
+
+
+###########################################################################
# dspam-3.9.0
#
diff --git a/mail/dspam/files/dspam.in b/mail/dspam/files/dspam.in
index 84ce08b..bab6ec7 100644
--- a/mail/dspam/files/dspam.in
+++ b/mail/dspam/files/dspam.in
@@ -1,6 +1,5 @@
#!/bin/sh
# $FreeBSD$
-# formerly $ FreeBSD: ports/mail/dspam/files/dspam,v 1.1 2005/05/05 21:03:37 pav Exp $
#
# PROVIDE: dspam
@@ -26,18 +25,15 @@ load_rc_config $name
#defaults
: ${dspam_enable="NO"}
: ${dspam_debug="NO"}
-pidfile=${dspam_pidfile:-/var/run/dspam.pid}
+: ${dspam_pidfile:-/var/run/dspam.pid}
command=%%PREFIX%%/bin/${name}
-start_precmd=dspam_checkdebug
-required_files=%%PREFIX%%/etc/${name}.conf
+start_precmd=dspam_checkdebug
extra_commands=reload
-reload()
-{
- kill -HUP `cat $pidfile`
-}
+required_dirs=%%DSPAM_HOME%%
+required_files=%%PREFIX%%/etc/${name}.conf
dspam_checkdebug()
{
@@ -49,6 +45,9 @@ dspam_checkdebug()
fi
}
-required_dirs=%%DSPAM_HOME%%
+reload()
+{
+ kill -HUP `cat $pidfile`
+}
run_rc_command "$1"
diff --git a/mail/dspam/files/patch-scripts__train.pl b/mail/dspam/files/patch-scripts__train.pl
deleted file mode 100644
index bb582e4..0000000
--- a/mail/dspam/files/patch-scripts__train.pl
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./scripts/train.pl.orig 2010-01-11 23:21:58.000000000 +0200
-+++ ./scripts/train.pl 2010-01-17 18:52:16.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!%%PERL%%
-
- # train.pl
- # This tool trains a corpus of messages (a directory containing a nonspam and
-@@ -14,7 +14,7 @@
- use vars qw { $USER $PATH $REPORTING_WINDOW $CORPUS $TRAINING_MODE };
-
- $REPORTING_WINDOW = 250; # How often to summarize
--$PATH = "/usr/local/dspam/bin"; # Path to dspam binaries
-+$PATH = "%%DSPAM_PATH%%"; # Path to dspam binaries
- $TRAINING_MODE = "teft"; # Training mode
-
- ### DO NOT CONFIGURE BELOW THIS LINE ###
diff --git a/mail/dspam/files/patch-src__dspam.c b/mail/dspam/files/patch-src__dspam.c
new file mode 100644
index 0000000..9234ef2
--- /dev/null
+++ b/mail/dspam/files/patch-src__dspam.c
@@ -0,0 +1,11 @@
+--- src/dspam.c.orig 2012-04-11 11:48:33.000000000 -0700
++++ src/dspam.c 2014-09-23 19:43:09.688194417 -0700
+@@ -4194,7 +4194,7 @@
+
+ pidfile = _ds_read_attribute(agent_config, "ServerPID");
+ if ( pidfile == NULL )
+- pidfile = "/var/run/dspam/dspam.pid";
++ pidfile = "/var/run/dspam.pid";
+
+ if (pidfile) {
+ FILE *file;
diff --git a/mail/dspam/files/patch-src__dspam.conf.in b/mail/dspam/files/patch-src__dspam.conf.in
index 39d7569..b3c48fb 100644
--- a/mail/dspam/files/patch-src__dspam.conf.in
+++ b/mail/dspam/files/patch-src__dspam.conf.in
@@ -1,14 +1,14 @@
---- ./src/dspam.conf.in.orig 2010-01-11 23:21:58.000000000 +0200
-+++ ./src/dspam.conf.in 2010-01-17 18:49:37.000000000 +0200
+--- src/dspam.conf.in.orig 2014-09-18 00:33:02.874722063 -0700
++++ src/dspam.conf.in 2014-09-18 00:41:49.434685786 -0700
@@ -56,6 +56,7 @@
# necessary if you plan on allowing untrusted processing.
#
#UntrustedDeliveryAgent "/usr/bin/procmail -d %u"
-+#QuarantineAgent "@delivery_agent@"
++#UntrustedDeliveryAgent "@delivery_agent@"
#
- # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
-@@ -330,7 +331,7 @@
+ # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP
+@@ -350,7 +351,7 @@
# Storage driver settings: Specific to a particular storage driver. Uncomment
# the configuration specific to your installation, if applicable.
#
@@ -17,7 +17,7 @@
#MySQLPort
#MySQLUser dspam
#MySQLPass changeme
-@@ -341,7 +342,7 @@
+@@ -361,7 +362,7 @@
# If you are using replication for clustering, you can also specify a separate
# server to perform all writes to.
#
@@ -26,21 +26,21 @@
#MySQLWritePort
#MySQLWriteUser dspam
#MySQLWritePass changeme
-@@ -778,6 +779,7 @@
- #ServerHost 127.0.0.1
- #ServerPort 24
- #ServerQueueSize 32
-+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
- #ServerPID /var/run/dspam.pid
+@@ -406,7 +407,7 @@
+ # in /var/run/postgresql/.s.PGSQL.5432 specify just the path where the socket
+ # resits (without .s.PGSQL.5432).
- #
-@@ -814,14 +816,15 @@
+-#PgSQLServer /var/run/postgresql/
++#PgSQLServer /tmp/
+ #PgSQLPort
+ #PgSQLUser dspam
+ #PgSQLPass changeme
+@@ -845,14 +846,14 @@
# you are running the client and server on the same machine, as it eliminates
# much of the bandwidth overhead.
#
-#ServerDomainSocketPath "/tmp/dspam.sock"
-+# keep this is sync with /usr/local/etc/rc.d/dspam[.sh] rc.d script
-+#ServerDomainSocketPath "/var/run/dspam.sock"
++#ServerDomainSocketPath "/var/run/dspam.sock"
#
# Client Mode: If you are running DSPAM in client/server mode, uncomment and
OpenPOWER on IntegriCloud