summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authoradrianp <adrianp>2005-11-12 16:53:19 +0000
committeradrianp <adrianp>2005-11-12 16:53:19 +0000
commit456dbda01da776a9a6ce58905da82d9adf40ab9e (patch)
treeeb7372c86017f5f5855a3b9defe826a7cfb3db3c /mail
parent7a7e8105a1b3256a2440c89c29e86ae882dcc9e1 (diff)
downloadpkgsrc-456dbda01da776a9a6ce58905da82d9adf40ab9e.tar.gz
Update to dspam 3.6.1 ok'ed xtraeme@
Package changes: - Add DSPAM_WWWUSER and DSPAM_WWWGROUP as BUILD_DEFS (not everyone uses apache) - Change group ownership on dspam.conf to ${DSPAM_WWWGROUP} Pointed out in tech-pkg@ by matt (at) bodgit-n-scarper.com - Remove patch-ac as that's been applied upstream - PLIST fixes for css* tools installed with hash driver From DSPAM RELEASE_NOTES: BUGFIX: ParseToHeaders can segfault on malformatted To header BUGFIX: TrackSources does not correctly parse messages when used with QMail BUGFIX: Missing check for existing strcasestr BUGFIX: X-DSPAM-Reclassified heading appears blank BUGFIX: Plused-Detail support does not work with domains BUGFIX: Hash databases are not 8-byte aligned (do not work with 64-bit systems) BUGFIX: Certain daemon-mode operations append a trailing period BUGFIX: DataSource 'document' option causes improper processing BUGFIX: Segfaults occur on malformed Content-Type header BUGFIX: History appears blank in dspam.cgi
Diffstat (limited to 'mail')
-rw-r--r--mail/dspam/Makefile18
-rw-r--r--mail/dspam/PLIST6
-rw-r--r--mail/dspam/distinfo9
-rw-r--r--mail/dspam/files/dspam.sh4
-rw-r--r--mail/dspam/options.mk5
-rw-r--r--mail/dspam/patches/patch-ac15
6 files changed, 24 insertions, 33 deletions
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 2a7cf09eca1..7fd73ed09c7 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.39 2005/10/20 08:33:13 adrianp Exp $
+# $NetBSD: Makefile,v 1.40 2005/11/12 16:53:19 adrianp Exp $
-DISTNAME= dspam-3.6.0
+DISTNAME= dspam-3.6.1
CATEGORIES= mail
MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/
@@ -40,6 +40,7 @@ BUILD_DEFS+= DSPAM_LOGDIR
BUILD_DEFS+= DSPAM_DOMAIN
BUILD_DEFS+= DSPAM_WWWHOME
BUILD_DEFS+= DSPAM_PIDDIR
+BUILD_DEFS+= DSPAM_WWWUSER DSPAM_WWWGROUP
.include "../../mk/bsd.prefs.mk"
@@ -53,6 +54,8 @@ DSPAM_LOGDIR?= ${DSPAM_HOME}/log
DSPAM_DOMAIN?= yourdomain.com
DSPAM_WWWHOME?= /dspam
DSPAM_PIDDIR?= ${VARBASE}/run/dspam
+DSPAM_WWWUSER?= ${APACHE_USER}
+DSPAM_WWWGROUP?= ${APACHE_GROUP}
CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE}
CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \
@@ -77,20 +80,20 @@ RCD_SCRIPTS= dspam
PKG_SYSCONFSUBDIR= dspam
CONF_FILES_PERMS= ${EGDIR}/dspam.conf ${PKG_SYSCONFDIR}/dspam.conf \
- ${DSPAM_USER} ${DSPAM_GROUP} 0640
+ ${DSPAM_USER} ${DSPAM_WWWGROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/cgi-admins ${PKG_SYSCONFDIR}/cgi-admins \
- ${APACHE_USER} ${APACHE_GROUP} 0640
+ ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/cgi-default.prefs \
${PKG_SYSCONFDIR}/cgi-default.prefs \
- ${APACHE_USER} ${APACHE_GROUP} 0640
+ ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
CONF_FILES_PERMS+= ${EGDIR}/configure.pl ${PKG_SYSCONFDIR}/configure.pl \
- ${APACHE_USER} ${APACHE_GROUP} 0640
+ ${DSPAM_WWWUSER} ${DSPAM_WWWGROUP} 0640
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} ${APACHE_GROUP} 0775
+OWN_DIRS_PERMS= ${DSPAM_HOME} ${DSPAM_USER} ${DSPAM_WWWGROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_LOGDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0775
OWN_DIRS_PERMS+= ${DSPAM_PIDDIR} ${DSPAM_USER} ${DSPAM_GROUP} 0770
@@ -122,7 +125,6 @@ post-install:
${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 webui/cgi-bin webui/htdocs
${INSTALL_DATA_DIR} ${DATADIR}/${d}
diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST
index 10ac065d333..d199300e88b 100644
--- a/mail/dspam/PLIST
+++ b/mail/dspam/PLIST
@@ -1,4 +1,8 @@
-@comment $NetBSD: PLIST,v 1.10 2005/10/20 08:33:13 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/11/12 16:53:19 adrianp Exp $
+${HASH}bin/cssstat
+${HASH}bin/csscompress
+${HASH}bin/cssclean
+${HASH}bin/cssconvert
bin/dspam
bin/dspam_2sql
bin/dspam_admin
diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo
index 388bde8f5a0..1dbf7da1438 100644
--- a/mail/dspam/distinfo
+++ b/mail/dspam/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.23 2005/10/20 08:33:13 adrianp Exp $
+$NetBSD: distinfo,v 1.24 2005/11/12 16:53:19 adrianp Exp $
-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 (dspam-3.6.1.tar.gz) = 864cd85d44350c6b4d203cde40d025cf5015af82
+RMD160 (dspam-3.6.1.tar.gz) = d93f73ad87ea0061e3b2c3d4dc84578872bce74d
+Size (dspam-3.6.1.tar.gz) = 739389 bytes
SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c
-SHA1 (patch-ac) = 3367158c25a6f50467359e3a09936ad7b9bb0be0
SHA1 (patch-ad) = ec80ac306fa6fcd62b4f531b11de773a7a28833f
diff --git a/mail/dspam/files/dspam.sh b/mail/dspam/files/dspam.sh
index 539dbce9f19..1e59b280ab0 100644
--- a/mail/dspam/files/dspam.sh
+++ b/mail/dspam/files/dspam.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: dspam.sh,v 1.4 2005/10/20 08:33:13 adrianp Exp $
+# $NetBSD: dspam.sh,v 1.5 2005/11/12 16:53:19 adrianp Exp $
#
# PROVIDE: dspam
@@ -16,8 +16,6 @@ rcvar="${name}"
command="@PREFIX@/bin/${name}"
pidfile="@DSPAM_PIDDIR@/${name}.pid"
command_args="--daemon > /dev/null 2>&1 &"
-dspam_user="@DSPAM_USER@"
-dspam_group="@DSPAM_GROUP@"
start_precmd="dspam_precmd"
dspam_precmd()
diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk
index a04c233a7e5..97b287d59d2 100644
--- a/mail/dspam/options.mk
+++ b/mail/dspam/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2005/10/29 12:36:50 recht Exp $
+# $NetBSD: options.mk,v 1.13 2005/11/12 16:53:19 adrianp Exp $
.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -53,6 +53,7 @@ PKG_OPTIONS:= ${PKG_OPTIONS:Nldap}
.endif
.if !empty(DSPAM_STORAGE_DRIVER:Mhash)
CONFIGURE_ARGS+= --with-storage-driver=hash_drv
+HASH_PLIST_SUBST+= HASH=
.elif !empty(DSPAM_STORAGE_DRIVER:Mmysql)
. include "../../mk/mysql.buildlink3.mk"
CONFIGURE_ARGS+= --enable-mysql4-initialization
@@ -92,10 +93,12 @@ CONFIGURE_ARGS+= --enable-daemon
MYSQL_PLIST_SUBST?= MYSQL="@comment "
PGSQL_PLIST_SUBST?= PGSQL="@comment "
SQLITE_PLIST_SUBST?= SQLITE="@comment "
+HASH_PLIST_SUBST?= HASH="@comment "
PLIST_SUBST+= ${MYSQL_PLIST_SUBST}
PLIST_SUBST+= ${PGSQL_PLIST_SUBST}
PLIST_SUBST+= ${SQLITE_PLIST_SUBST}
+PLIST_SUBST+= ${HASH_PLIST_SUBST}
###
### The following are only available for mysql and pgsql backends.
diff --git a/mail/dspam/patches/patch-ac b/mail/dspam/patches/patch-ac
deleted file mode 100644
index 7b4384c2c55..00000000000
--- a/mail/dspam/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/10/20 08:33:13 adrianp Exp $
-
---- webui/cgi-bin/dspam.cgi.orig 2005-10-17 15:31:46.000000000 +0100
-+++ webui/cgi-bin/dspam.cgi
-@@ -195,8 +195,8 @@ sub DisplayHistory {
- }
- close (LINES);
-
-- $end = $all_lines - (($history_site-1) * $CONFIG{'HISTORY_PER_SITE'});
-- $begin = $end - $CONFIG{'HISTORY_PER_SITE'} + 1 ;
-+ $end = $all_lines - (($history_site-1) * $CONFIG{'HISTORY_PER_PAGE'});
-+ $begin = $end - $CONFIG{'HISTORY_PER_PAGE'} + 1 ;
-
- if ($begin < 0) {
- $begin = 1;