[pkgsrc/trunk]: pkgsrc Update mail/dspam to 3.2.0 (latest stable version).

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Update mail/dspam to 3.2.0 (latest stable version).
From: xtraeme <xtraeme%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 00:43:05 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9faf0de7367
branches:  trunk
changeset: 482207:a9faf0de7367
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Oct 22 05:43:28 2004 +0000

description:
Update mail/dspam to 3.2.0 (latest stable version).

Version 3.2 adds many significant enhancements, these include the
introduction of a dspam.conf master configuration, an aesthetically
redesigned web interface, support for SQLite, support for Windows, and
and many other enhancements.

More information:

http://www.nuclearelephant.com/projects/dspam/text/RELEASE-3.2.0.txt

pkgsrc changes:

* Default storage driver has been changed to SQLite, to sync with dspam's
 defaults.
* Deprecated options has been removed totally, now you'll have to specify
 them via PKG_OPTIONS.dspam=foo bar baz.

diffstat:

 doc/CHANGES                 |    3 +-
 doc/TODO                    |    3 +-
 mail/dspam/Makefile         |   53 +++++++++------
 mail/dspam/PLIST            |   33 ++++++++-
 mail/dspam/distinfo         |    8 +-
 mail/dspam/options.mk       |  148 +++++++++++++++++--------------------------
 mail/dspam/patches/patch-aa |   37 +++-------
 7 files changed, 138 insertions(+), 147 deletions(-)

diffs (truncated from 517 to 300 lines):

diff -r b8b2de851252 -r a9faf0de7367 doc/CHANGES
--- a/doc/CHANGES       Fri Oct 22 03:59:24 2004 +0000
+++ b/doc/CHANGES       Fri Oct 22 05:43:28 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.7517 2004/10/22 01:10:03 xtraeme Exp $
+$NetBSD: CHANGES,v 1.7518 2004/10/22 05:43:28 xtraeme Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -4809,3 +4809,4 @@
        Updated sylpheed-gtk2 to 0.9.12.20040918 [xtraeme 2004-10-21]
        Updated mysql4-client to 4.0.21 [xtraeme 2004-10-22]
        Updated mysql4-server to 4.0.21 [xtraeme 2004-10-22]
+       Updated dspam to 3.2.0 [xtraeme 2004-10-22]
diff -r b8b2de851252 -r a9faf0de7367 doc/TODO
--- a/doc/TODO  Fri Oct 22 03:59:24 2004 +0000
+++ b/doc/TODO  Fri Oct 22 05:43:28 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2248 2004/10/22 01:10:04 xtraeme Exp $
+$NetBSD: TODO,v 1.2249 2004/10/22 05:43:29 xtraeme Exp $
 
 Suggested new packages
 ======================
@@ -229,7 +229,6 @@
        o docsis-0.9.1
        o doxygen-1.3.9.1
        o drscheme-208
-       o dspam-3.2
        o dvipng-1.2 [http://sourceforge.net/projects/dvipng/]
        o dylan-compiler-2.3.11
        o dylan-interpreter-2.3.11
diff -r b8b2de851252 -r a9faf0de7367 mail/dspam/Makefile
--- a/mail/dspam/Makefile       Fri Oct 22 03:59:24 2004 +0000
+++ b/mail/dspam/Makefile       Fri Oct 22 05:43:28 2004 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/10/22 05:43:29 xtraeme Exp $
 
-DISTNAME=      dspam-3.0.0
-PKGREVISION=   5
+DISTNAME=      dspam-3.2.0
 CATEGORIES=    mail
 MASTER_SITES=  http://www.nuclearelephant.com/projects/dspam/sources/
 
@@ -15,25 +14,24 @@
 USE_PERL5=             yes
 REPLACE_PERL=          tools/dspam_genaliases.in                       \
                        tools/dspam_corpus.in                           \
-                       cgi/admin.cgi cgi/admingraph.cgi                \
-                       cgi/dspam.cgi cgi/graph.cgi
+                       cgi/*.cgi configure.pl.in
 
 PKGCONFIG_OVERRIDE+=   dspam.pc.in
 
-SUBST_CLASSES=         cgi
+SUBST_CLASSES+=                cgi
 SUBST_STAGE.cgi=       post-patch
 SUBST_FILES.cgi=       cgi/dspam.cgi cgi/admin.cgi
 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|LARGE_SCLAE|LARGE_SCALE|g"                \
                        -e "s|-deaf|${DSPAM_PSFLAGS}|g"
-SUBST_MESSAGE.cgi=     "Fixing paths and typos."
+SUBST_MESSAGE.cgi=     "Fixing paths and default options."
 
 BUILD_DEFS+=           DSPAM_HOME
 BUILD_DEFS+=           DSPAM_SIGNATURE_LIFE
 BUILD_DEFS+=           DSPAM_USER DSPAM_GROUP
 BUILD_DEFS+=           DSPAM_BINMODE
+BUILD_DEFS+=           DSPAM_LOGDIR
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -43,17 +41,17 @@
 DSPAM_BINMODE?=                4511
 DSPAM_USER?=           dspam
 DSPAM_GROUP?=          dspam
+DSPAM_LOGDIR?=         ${DSPAM_HOME}/log
 
 GNU_CONFIGURE=         yes
-CONFIGURE_ARGS+=       --enable-chi-square
-CONFIGURE_ARGS+=       --enable-robinson-pvalues
 CONFIGURE_ARGS+=       --with-signature-life=${DSPAM_SIGNATURE_LIFE}
 CONFIGURE_ARGS+=       --with-dspam-home=${DSPAM_HOME}                 \
                        --with-dspam-home-owner=${DSPAM_USER}           \
                        --with-dspam-home-group=${DSPAM_GROUP}          \
                        --with-dspam-owner=${DSPAM_USER}                \
                        --with-dspam-group=${DSPAM_GROUP}               \
-                       --with-dspam-mode=${DSPAM_BINMODE}
+                       --with-dspam-mode=${DSPAM_BINMODE}              \
+                       --with-logdir=${DSPAM_LOGDIR}
 
 .include "options.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
@@ -61,34 +59,45 @@
 
 DOCDIR=                ${PREFIX}/share/doc/dspam
 DATADIR=       ${PREFIX}/share/dspam
+EGDIR=         ${PREFIX}/share/examples/dspam
 
 USE_PKGINSTALL=                yes
+CONF_FILES=            ${EGDIR}/dspam.conf ${PKG_SYSCONFDIR}/dspam.conf
+
 PKG_GROUPS=            ${DSPAM_GROUP}
 PKG_USERS=             ${DSPAM_USER}:${DSPAM_GROUP}
 SPECIAL_PERMS=         ${PREFIX}/bin/dspam ${DSPAM_USER} ${DSPAM_GROUP} \
                        ${DSPAM_BINMODE}
 OWN_DIRS_PERMS=                ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_GROUP} 0770
 
+SUBST_CLASSES+=                conf
+SUBST_STAGE.conf=      pre-install
+SUBST_FILES.conf=      dspam.conf.in
+SUBST_SED.conf=                -e "s,@dspam_home@,${DSPAM_HOME},g" \
+                       -e "s,@delivery_agent@,${DSPAM_DELIVERY_AGENT_BIN},g"
+SUBST_MESSAGE.conf=    "Fixing configuration file."
+
 post-install:
        ${INSTALL_DATA_DIR} ${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/RELEASE.NOTES ${DOCDIR}
        ${INSTALL_DATA_DIR} ${DATADIR}
+       ${INSTALL_DATA_DIR} ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/dspam.conf.in ${EGDIR}/dspam.conf
 .for d in txt cgi
        ${INSTALL_DATA_DIR} ${DATADIR}/${d}
        cd ${WRKSRC}/${d} && ${PAX} -rwppm '-s|.*/Makefile.*$$||'       \
                . ${DATADIR}/${d}
 .endfor
+       ${RM} ${DATADIR}/cgi/configure.pl.in
 .undef d
-.if !empty(DSPAM_STORAGE_DRIVER:Mmysql)
-       ${INSTALL_DATA_DIR} ${DATADIR}/mysql
-       cd ${WRKSRC}/tools.mysql_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
-               . ${DATADIR}/mysql
-.endif
-.if !empty(DSPAM_STORAGE_DRIVER:Mpgsql)
-       ${INSTALL_DATA_DIR} ${DATADIR}/pgsql
-       cd ${WRKSRC}/tools.pgsql_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
-               . ${DATADIR}/pgsql
-.endif
+.for drv in mysql pgsql sqlite
+.  if !empty(DSPAM_STORAGE_DRIVER:M${drv})
+       ${INSTALL_DATA_DIR} ${DATADIR}/${drv}
+       cd ${WRKSRC}/tools.${drv}_drv && ${PAX} -rwppm '-s|.*/Makefile.*$$||' \
+               . ${DATADIR}/${drv}
+.  endif
+.endfor
+.undef drv
 
 .include "../../mk/bsd.pkg.mk"
diff -r b8b2de851252 -r a9faf0de7367 mail/dspam/PLIST
--- a/mail/dspam/PLIST  Fri Oct 22 03:59:24 2004 +0000
+++ b/mail/dspam/PLIST  Fri Oct 22 05:43:28 2004 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/10/22 05:43:29 xtraeme Exp $
 bin/dspam
 bin/dspam_2sql
+bin/dspam_admin
 bin/dspam_clean
 bin/dspam_corpus
 bin/dspam_crc
@@ -24,16 +25,32 @@
 man/man1/dspam_dump.1
 man/man1/dspam_merge.1
 man/man1/dspam_stats.1
+man/man3/dspam_addattribute.3
+man/man3/dspam_attach.3
+man/man3/dspam_create.3
+man/man3/dspam_destroy.3
+man/man3/dspam_detach.3
+man/man3/dspam_getsource.3
+man/man3/dspam_init.3
+man/man3/dspam_process.3
+man/man3/libdspam.3
 share/doc/dspam/README
+share/doc/dspam/README.courier
+share/doc/dspam/README.exim
+share/doc/dspam/README.pop3filter
+share/doc/dspam/README.postfix
+share/doc/dspam/README.qmail
+share/doc/dspam/README.sendmail
 share/doc/dspam/RELEASE.NOTES
 share/dspam/cgi/admin.cgi
 share/dspam/cgi/admingraph.cgi
 share/dspam/cgi/admins
 share/dspam/cgi/base.css
+share/dspam/cgi/configure.pl
 share/dspam/cgi/default.prefs
+share/dspam/cgi/dspam-logo-small.gif
 share/dspam/cgi/dspam.cgi
 share/dspam/cgi/graph.cgi
-share/dspam/cgi/logo.gif
 share/dspam/cgi/rgb.txt
 share/dspam/cgi/templates/nav_admin_error.html
 share/dspam/cgi/templates/nav_admin_preferences.html
@@ -48,20 +65,28 @@
 share/dspam/cgi/templates/nav_quarantine.html
 share/dspam/cgi/templates/nav_viewmessage.html
 ${MYSQL}share/dspam/mysql/README
-${MYSQL}share/dspam/mysql/mysql_objects.sql.space.optimized
-${MYSQL}share/dspam/mysql/mysql_objects.sql.speed.optimized
+${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
 ${MYSQL}share/dspam/mysql/purge.sql
+${MYSQL}share/dspam/mysql/purge-4.1.sql
 ${MYSQL}share/dspam/mysql/virtual_users.sql
+${MYSQL}share/dspam/mysql/neural.sql
 ${PGSQL}share/dspam/pgsql/README
 ${PGSQL}share/dspam/pgsql/pgsql_objects.sql
 ${PGSQL}share/dspam/pgsql/purge.sql
 ${PGSQL}share/dspam/pgsql/virtual_users.sql
+${SQLITE}share/dspam/sqlite/README
+${SQLITE}share/dspam/sqlite/purge.sql
 share/dspam/txt/firstrun.txt
 share/dspam/txt/firstspam.txt
 share/dspam/txt/quarantinefull.txt
+share/examples/dspam/dspam.conf
+@dirrm share/examples/dspam
 @dirrm share/dspam/txt
 ${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
diff -r b8b2de851252 -r a9faf0de7367 mail/dspam/distinfo
--- a/mail/dspam/distinfo       Fri Oct 22 03:59:24 2004 +0000
+++ b/mail/dspam/distinfo       Fri Oct 22 05:43:28 2004 +0000
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/08/09 20:14:21 jlam Exp $
+$NetBSD: distinfo,v 1.3 2004/10/22 05:43:29 xtraeme Exp $
 
-SHA1 (dspam-3.0.0.tar.gz) = d400a5ba9b5ad558917deba2eaf1ea2259068ac4
-Size (dspam-3.0.0.tar.gz) = 575382 bytes
-SHA1 (patch-aa) = 1b74fa84b4e815be8e0fd59a7189fda2e4e64696
+SHA1 (dspam-3.2.0.tar.gz) = 45dd9addddf42bf8e891c3f35fd9009f4fae9a5f
+Size (dspam-3.2.0.tar.gz) = 617716 bytes
+SHA1 (patch-aa) = 0f5ca6fc4c03ea0b73ccd1214f047fec6ffe4cb3
diff -r b8b2de851252 -r a9faf0de7367 mail/dspam/options.mk
--- a/mail/dspam/options.mk     Fri Oct 22 03:59:24 2004 +0000
+++ b/mail/dspam/options.mk     Fri Oct 22 05:43:28 2004 +0000
@@ -1,41 +1,13 @@
-# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/10/22 05:43:29 xtraeme Exp $
 
-.if defined(DSPAM_HOMEDIR_DOTFILES) && \
-    !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  dotfiles
-.endif
-.if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  webmail
-.endif
-.if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
-    !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  sig-attachment
-.endif
-.if defined(DSPAM_SIGNATURE_HEADERS) && \
-    !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  sig-headers
-.endif
-.if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  largescale
-.endif
-.if defined(DSPAM_VIRTUAL_USERS) && !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  virtualusers
-.endif
-.if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  graphs
-.endif
-.if defined(DSPAM_CLIENT_COMPRESSION) && \
-    !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+=  compress
-.endif
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dspam
-PKG_SUPPORTED_OPTIONS= compress dotfiles graphs largescale             \
-                       long-usernames sig-attachment sig-headers       \
-                       spam-subject virtualusers webmail
+PKG_SUPPORTED_OPTIONS= largescale homedir long-usernames graphs \
+                       domainscale
+
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -50,13 +22,16 @@
 DSPAM_DELIVERY_AGENT?=         procmail
 BUILD_DEFS+=           DSPAM_DELIVERY_AGENT
 .if !empty(DSPAM_DELIVERY_AGENT:Mprocmail)
+DSPAM_DELIVERY_AGENT_BIN?=     ${LOCALBASE}/bin/procmail
 BUILD_DEPENDS+=                procmail-[0-9]*:../../mail/procmail
-CONFIGURE_ARGS+=       --with-delivery-agent="${LOCALBASE}/bin/procmail"
+CONFIGURE_ARGS+=       --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q}
 .elif !empty(DSPAM_DELIVERY_AGENT:Mmaildrop)
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc/guide * Add section on editing the pkgsrc guide
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xorg-libs The CONFLICTS lines for xextensions, lib...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc/guide * Add section on editing the pkgsrc guide
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xorg-libs The CONFLICTS lines for xextensions, lib...
Indexes:
Home | Main Index | Thread Index | Old Index