pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/dspam Update to dspam 3.60
details: https://anonhg.NetBSD.org/pkgsrc/rev/8937d65ebd64
branches: trunk
changeset: 501291:8937d65ebd64
user: adrianp <adrianp%pkgsrc.org@localhost>
date: Thu Oct 20 08:33:13 2005 +0000
description:
Update to dspam 3.60
ok'ed xtraeme@
>From the RELEASE file:
Automatic Whitelisting Improvements
Dynamically Loadable Storage Driver Support
PostgreSQL Performance Enhancements
LDAP Verification
Unified Spam Alias / UID in Signature Support
Domain Based Delivery Hosts
Integrated Clam A/V Support
Markovian Discrimination
Self-Contained Hash Driver
Fallback Domain-Based User Support
Improved, Unified Logging
Activity logging has also been improved
Plused Detail Support
Message Fragments Support
Domain Blocklisting Support
User preferences made case-insensitive
LMTP error codes now include messages from relay host
RBLInoculate option allows RBL'd emails to be quarantined or learned as spam
MySQL and PgSQL object creation scripts updated to improve performance
Added 'date' to quarantine display and sorted most recent at top
Significant code cleanup and audit
Domain-based groups changed from @domain.tld to *@domain.tld
X-DSPAM-Result expanded to support Virus, Blacklisted, and Blocklisted results
DSPAM WebUI now supports history paging
Rewritten documentation for ease of installation
diffstat:
mail/dspam/Makefile | 61 ++++++++++++++++++---------------
mail/dspam/PLIST | 52 +++++++++++++++-------------
mail/dspam/distinfo | 13 +++---
mail/dspam/files/dspam.sh | 9 +---
mail/dspam/options.mk | 79 +++++++++++++++++++++++++++++++-------------
mail/dspam/patches/patch-aa | 10 ++--
mail/dspam/patches/patch-ab | 13 -------
mail/dspam/patches/patch-ac | 15 ++++++++
mail/dspam/patches/patch-ad | 61 ++++++++++++++++++++++++++++++++++
9 files changed, 208 insertions(+), 105 deletions(-)
diffs (truncated from 560 to 300 lines):
diff -r f35edc197b50 -r 8937d65ebd64 mail/dspam/Makefile
--- a/mail/dspam/Makefile Thu Oct 20 04:56:38 2005 +0000
+++ b/mail/dspam/Makefile Thu Oct 20 08:33:13 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/10/20 08:33:13 adrianp Exp $
-DISTNAME= dspam-3.4.9
+DISTNAME= dspam-3.6.0
CATEGORIES= mail
MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/
@@ -14,27 +14,23 @@
USE_TOOLS+= perl:run pkg-config
REPLACE_PERL= tools/dspam_genaliases.in \
tools/dspam_corpus.in \
- cgi/*.cgi cgi/configure.pl.in
+ webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in
-PKGCONFIG_OVERRIDE+= dspam.pc.in
+PKGCONFIG_OVERRIDE+= src/dspam.pc.in
-SUBST_CLASSES+= cgi cgi2
+SUBST_CLASSES+= cgi
SUBST_STAGE.cgi= post-patch
-SUBST_FILES.cgi= cgi/dspam.cgi cgi/admin.cgi \
- cgi/templates/nav_performance.html \
- cgi/configure.pl.in
-SUBST_SED.cgi= -e "s|/usr/local/bin/dspam|${PREFIX}/bin/dspam|g" \
- -e "s|/var/dspam|${DSPAM_HOME}|g" \
- -e "s|/usr/local|${PREFIX}|g" \
- -e "s|-deaf|${DSPAM_PSFLAGS}|g" \
- -e "s|yourdomain.com|${DSPAM_DOMAIN}|g"
+SUBST_FILES.cgi= webui/cgi-bin/templates/nav_performance.html \
+ webui/cgi-bin/configure.pl.in \
+ webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi \
+ webui/cgi-bin/graph.cgi webui/cgi-bin/admingraph.cgi
+SUBST_SED.cgi= -e "s|auxw|${DSPAM_PSFLAGS}|g" \
+ -e "s|yourdomain.com|${DSPAM_DOMAIN}|g" \
+ -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|" \
+ -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|" \
+ -e "s|\"\/\";|\"${DSPAM_WWWHOME}\";|" \
+ -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|"
SUBST_MESSAGE.cgi= "Fixing paths and default options."
-SUBST_STAGE.cgi2= post-patch
-SUBST_FILES.cgi2= cgi/dspam.cgi cgi/admin.cgi cgi/admingraph.cgi \
- cgi/graph.cgi
-SUBST_SED.cgi2= -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|" \
- -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|" \
- -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|"
BUILD_DEFS+= DSPAM_HOME
BUILD_DEFS+= DSPAM_SIGNATURE_LIFE
@@ -42,6 +38,7 @@
BUILD_DEFS+= DSPAM_BINMODE
BUILD_DEFS+= DSPAM_LOGDIR
BUILD_DEFS+= DSPAM_DOMAIN
+BUILD_DEFS+= DSPAM_WWWHOME
BUILD_DEFS+= DSPAM_PIDDIR
.include "../../mk/bsd.prefs.mk"
@@ -54,6 +51,7 @@
DSPAM_GROUP?= dspam
DSPAM_LOGDIR?= ${DSPAM_HOME}/log
DSPAM_DOMAIN?= yourdomain.com
+DSPAM_WWWHOME?= /dspam
DSPAM_PIDDIR?= ${VARBASE}/run/dspam
CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE}
@@ -79,7 +77,7 @@
PKG_SYSCONFSUBDIR= dspam
CONF_FILES_PERMS= ${EGDIR}/dspam.conf ${PKG_SYSCONFDIR}/dspam.conf \
- ${BINOWN} ${DSPAM_GROUP} 0640
+ ${DSPAM_USER} ${DSPAM_GROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/cgi-admins ${PKG_SYSCONFDIR}/cgi-admins \
${APACHE_USER} ${APACHE_GROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/cgi-default.prefs \
@@ -94,7 +92,7 @@
${DSPAM_BINMODE}
OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${APACHE_GROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
-OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0700
+OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
FILES_SUBST+= DSPAM_USER=${DSPAM_USER}
FILES_SUBST+= DSPAM_GROUP=${DSPAM_GROUP}
@@ -104,28 +102,35 @@
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= src/dspam.conf.in
SUBST_SED.conf= -e "s,@dspam_home@,${DSPAM_HOME},g" \
- -e "s,@delivery_agent@,${DSPAM_DELIVERY_AGENT_BIN},g"
+ -e "s,@delivery_agent@,${DSPAM_DELIVERY_AGENT_BIN},g" \
+ -e "s|@PREFIX@|${PREFIX}|g" \
+ -e "s|@VARBASE@|${VARBASE}|g" \
+ -e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g"
SUBST_MESSAGE.conf= "Fixing configuration file."
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/UPGRADING ${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${DOCDIR}
${INSTALL_DATA_DIR} ${DATADIR}
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/src/dspam.conf.in ${EGDIR}/dspam.conf
- ${INSTALL_DATA} ${WRKSRC}/cgi/admins ${EGDIR}/cgi-admins
- ${INSTALL_DATA} ${WRKSRC}/cgi/default.prefs ${EGDIR}/cgi-default.prefs
- ${INSTALL_DATA} ${WRKSRC}/cgi/configure.pl ${EGDIR}/configure.pl
+ ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/admins ${EGDIR}/cgi-admins
+ ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/default.prefs \
+ ${EGDIR}/cgi-default.prefs
+ ${INSTALL_DATA} ${WRKSRC}/webui/cgi-bin/configure.pl \
+ ${EGDIR}/configure.pl
+ @${RM} ${WRKSRC}/webui/cgi-bin/dspam.cgi.orig
-.for d in txt cgi
+.for d in txt webui/cgi-bin webui/htdocs
${INSTALL_DATA_DIR} ${DATADIR}/${d}
cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
'-s|./admins.*$$||' '-s|./default.prefs.*$$||' \
'-s|./configure.pl.*$$||' . ${DATADIR}/${d}
.endfor
-.undef d
+
.for drv in mysql pgsql
. if !empty(DSPAM_STORAGE_DRIVER:M${drv})
${INSTALL_DATA_DIR} ${DATADIR}/${drv}
@@ -133,7 +138,7 @@
${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/${drv}
. endif
.endfor
-.undef drv
+
.if !empty(DSPAM_STORAGE_DRIVER:Msqlite*)
${INSTALL_DATA_DIR} ${DATADIR}/sqlite
cd ${WRKSRC}/src/tools.sqlite_drv && \
diff -r f35edc197b50 -r 8937d65ebd64 mail/dspam/PLIST
--- a/mail/dspam/PLIST Thu Oct 20 04:56:38 2005 +0000
+++ b/mail/dspam/PLIST Thu Oct 20 08:33:13 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2005/05/25 15:36:06 cube Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/10/20 08:33:13 adrianp Exp $
bin/dspam
bin/dspam_2sql
bin/dspam_admin
@@ -22,6 +22,7 @@
include/dspam/libdspam_objects.h
include/dspam/nodetree.h
include/dspam/storage_driver.h
+include/dspam/tokenizer.h
lib/libdspam.la
lib/pkgconfig/dspam.pc
man/man1/dspam.1
@@ -41,9 +42,10 @@
man/man3/libdspam.3
share/doc/dspam/README
share/doc/dspam/RELEASE.NOTES
-share/doc/dspam/appliance.txt
+share/doc/dspam/UPGRADING
share/doc/dspam/courier.txt
share/doc/dspam/exim.txt
+share/doc/dspam/markov.txt
share/doc/dspam/mysql_drv.txt
share/doc/dspam/ora_drv.txt
share/doc/dspam/osx.txt
@@ -51,28 +53,28 @@
share/doc/dspam/pop3filter.txt
share/doc/dspam/postfix.txt
share/doc/dspam/qmail.txt
+share/doc/dspam/relay.txt
share/doc/dspam/sendmail.txt
share/doc/dspam/sqlite_drv.txt
-share/doc/dspam/win32.txt
-share/dspam/cgi/admin.cgi
-share/dspam/cgi/admingraph.cgi
-share/dspam/cgi/base.css
-share/dspam/cgi/dspam-logo-small.gif
-share/dspam/cgi/dspam.cgi
-share/dspam/cgi/graph.cgi
-share/dspam/cgi/rgb.txt
-share/dspam/cgi/templates/nav_admin_error.html
-share/dspam/cgi/templates/nav_admin_preferences.html
-share/dspam/cgi/templates/nav_admin_status.html
-share/dspam/cgi/templates/nav_admin_user.html
-share/dspam/cgi/templates/nav_alerts.html
-share/dspam/cgi/templates/nav_analysis.html
-share/dspam/cgi/templates/nav_error.html
-share/dspam/cgi/templates/nav_history.html
-share/dspam/cgi/templates/nav_performance.html
-share/dspam/cgi/templates/nav_preferences.html
-share/dspam/cgi/templates/nav_quarantine.html
-share/dspam/cgi/templates/nav_viewmessage.html
+share/dspam/webui/cgi-bin/admin.cgi
+share/dspam/webui/cgi-bin/admingraph.cgi
+share/dspam/webui/cgi-bin/dspam.cgi
+share/dspam/webui/cgi-bin/graph.cgi
+share/dspam/webui/cgi-bin/rgb.txt
+share/dspam/webui/cgi-bin/templates/nav_admin_error.html
+share/dspam/webui/cgi-bin/templates/nav_admin_preferences.html
+share/dspam/webui/cgi-bin/templates/nav_admin_status.html
+share/dspam/webui/cgi-bin/templates/nav_admin_user.html
+share/dspam/webui/cgi-bin/templates/nav_alerts.html
+share/dspam/webui/cgi-bin/templates/nav_analysis.html
+share/dspam/webui/cgi-bin/templates/nav_error.html
+share/dspam/webui/cgi-bin/templates/nav_history.html
+share/dspam/webui/cgi-bin/templates/nav_performance.html
+share/dspam/webui/cgi-bin/templates/nav_preferences.html
+share/dspam/webui/cgi-bin/templates/nav_quarantine.html
+share/dspam/webui/cgi-bin/templates/nav_viewmessage.html
+share/dspam/webui/htdocs/base.css
+share/dspam/webui/htdocs/dspam-logo-small.gif
${MYSQL}share/dspam/mysql/mysql_objects-4.1.sql
${MYSQL}share/dspam/mysql/mysql_objects-space.sql
${MYSQL}share/dspam/mysql/mysql_objects-speed.sql
@@ -98,8 +100,10 @@
${PGSQL}@dirrm share/dspam/pgsql
${MYSQL}@dirrm share/dspam/mysql
${SQLITE}@dirrm share/dspam/sqlite
-@dirrm share/dspam/cgi/templates
-@dirrm share/dspam/cgi
+@dirrm share/dspam/webui/cgi-bin/templates
+@dirrm share/dspam/webui/cgi-bin
+@dirrm share/dspam/webui/htdocs
+@dirrm share/dspam/webui
@dirrm share/dspam
@dirrm share/doc/dspam
@dirrm include/dspam
diff -r f35edc197b50 -r 8937d65ebd64 mail/dspam/distinfo
--- a/mail/dspam/distinfo Thu Oct 20 04:56:38 2005 +0000
+++ b/mail/dspam/distinfo Thu Oct 20 08:33:13 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.22 2005/08/24 01:44:07 jwise Exp $
+$NetBSD: distinfo,v 1.23 2005/10/20 08:33:13 adrianp Exp $
-SHA1 (dspam-3.4.9.tar.gz) = e697774e0f2eb4a9a363cf80257072219641f8e3
-RMD160 (dspam-3.4.9.tar.gz) = f4088017e3e5984101bba7d5e5e313d35076d469
-Size (dspam-3.4.9.tar.gz) = 701069 bytes
-SHA1 (patch-aa) = 15c6fc58dd0d91799f0c97554f4188cbe68dbd96
-SHA1 (patch-ab) = 96c77d23174f51cd8df46a91ff9d8c38cd98d8a7
+SHA1 (dspam-3.6.0.tar.gz) = 19c0064902544bde90d0302b5d657782a4f2cc8f
+RMD160 (dspam-3.6.0.tar.gz) = eb4b7ff0f260a12508b47d5141a9bf1a0cf49326
+Size (dspam-3.6.0.tar.gz) = 732042 bytes
+SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
+SHA1 (patch-ac) = 3367158c25a6f50467359e3a09936ad7b9bb0be0
+SHA1 (patch-ad) = ec80ac306fa6fcd62b4f531b11de773a7a28833f
diff -r f35edc197b50 -r 8937d65ebd64 mail/dspam/files/dspam.sh
--- a/mail/dspam/files/dspam.sh Thu Oct 20 04:56:38 2005 +0000
+++ b/mail/dspam/files/dspam.sh Thu Oct 20 08:33:13 2005 +0000
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: dspam.sh,v 1.3 2005/10/12 20:22:55 xtraeme Exp $
+# $NetBSD: dspam.sh,v 1.4 2005/10/20 08:33:13 adrianp Exp $
#
# PROVIDE: dspam
@@ -24,8 +24,9 @@
{
if [ ! -d @DSPAM_PIDDIR@ ]; then
@MKDIR@ @DSPAM_PIDDIR@
- @CHMOD@ 0700 @DSPAM_PIDDIR@
+ @CHMOD@ 0770 @DSPAM_PIDDIR@
@CHOWN@ @DSPAM_USER@ @DSPAM_PIDDIR@
+ @CHGRP@ @DSPAM_GROUP@ @DSPAM_PIDDIR@
fi
}
@@ -65,7 +66,3 @@
;;
esac
fi
-
-if checkyesno "${rcvar}" && [ "$1" != "stop" -o "$1" != "status" ]; then
- echo $(check_process $command) > $pidfile
-fi
diff -r f35edc197b50 -r 8937d65ebd64 mail/dspam/options.mk
--- a/mail/dspam/options.mk Thu Oct 20 04:56:38 2005 +0000
+++ b/mail/dspam/options.mk Thu Oct 20 08:33:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2005/05/25 15:36:06 cube Exp $
+# $NetBSD: options.mk,v 1.11 2005/10/20 08:33:13 adrianp Exp $
.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -7,7 +7,7 @@
PKG_OPTIONS_VAR= PKG_OPTIONS.dspam
PKG_SUPPORTED_OPTIONS= largescale homedir long-usernames graphs \
domainscale virtualusers preferences-extension \
- neural
+ neural clamav ldap debug verbose-debug
.include "../../mk/bsd.options.mk"
@@ -41,15 +41,19 @@
### This is the backend database used to store the DSPAM signatures as
### well as other state information. The recommended storage driver is
### "mysql", even for small installations.
-### Possible: mysql, pgsql, bdb, sqlite or sqlite3
Home |
Main Index |
Thread Index |
Old Index