diff options
author | adrianp <adrianp> | 2007-05-07 09:29:54 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2007-05-07 09:29:54 +0000 |
commit | 8983cdd680ac04e2b838098570fdbe4eabf45c00 (patch) | |
tree | 1c203ea9bd1dc86c6f0eaf96f9b5933daf12bf0a /mail/dspam | |
parent | 9050fafe2bf48ab72f3184e51b505a5e44fe261a (diff) | |
download | pkgsrc-8983cdd680ac04e2b838098570fdbe4eabf45c00.tar.gz |
Update to 3.8.0
pkglintification
Remove bdb option (this has been removed from src)
Rename some options as they are (currently) DSPAM specific
Change MASTER_SITES
Fix permissions on installed files
Thanks to xtraeme@ for reviewing the changes
* jonz: removed depricated oracle driver
* jonz: fix for dynamic storage drivers api
* jonz: added connect check for pgsql
* jonz: fix for segfault on undefined DeliveryHost or ClientHost
* jonz: fix for segfault in vsyslog()
* jonz: fix for segfault in dlopen() failure
* jonz: added OSB tokenizer
* jonz: fix for segfault on log write err
* jonz: segfault fix for UIDInSignature
See the CHANGELOG for all the details:
http://dspam.nuclearelephant.com/text/CHANGELOG-3.8.0.txt
Diffstat (limited to 'mail/dspam')
-rw-r--r-- | mail/dspam/Makefile | 54 | ||||
-rw-r--r-- | mail/dspam/PLIST | 4 | ||||
-rw-r--r-- | mail/dspam/distinfo | 8 | ||||
-rw-r--r-- | mail/dspam/options.mk | 21 |
4 files changed, 46 insertions, 41 deletions
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index f2e8b7e111a..2a17faa6ec5 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.55 2006/12/10 04:36:30 obache Exp $ +# $NetBSD: Makefile,v 1.56 2007/05/07 09:29:54 adrianp Exp $ -DISTNAME= dspam-3.6.8 -PKGREVISION= 2 +DISTNAME= dspam-3.8.0 CATEGORIES= mail -MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ +MASTER_SITES= http://dspam.nuclearelephant.com/sources/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dspam.nuclearelephant.com/ @@ -13,27 +12,27 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= perl:run pkg-config -REPLACE_PERL= src/tools/dspam_train.in \ - src/tools/dspam_logrotate \ - webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in +REPLACE_PERL= src/tools/dspam_train.in +REPLACE_PERL+= src/tools/dspam_logrotate +REPLACE_PERL+= webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in PKGCONFIG_OVERRIDE+= src/dspam.pc.in SUBST_CLASSES+= cgi SUBST_STAGE.cgi= post-patch -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_FILES.cgi= webui/cgi-bin/templates/nav_performance.html +SUBST_FILES.cgi+= webui/cgi-bin/configure.pl.in +SUBST_FILES.cgi+= webui/cgi-bin/dspam.cgi webui/cgi-bin/admin.cgi +SUBST_FILES.cgi+= webui/cgi-bin/graph.cgi webui/cgi-bin/admingraph.cgi +SUBST_SED.cgi= -e "s|auxw|${DSPAM_PSFLAGS}|g" +SUBST_SED.cgi+= -e "s|yourdomain.com|${DSPAM_DOMAIN}|g" +SUBST_SED.cgi+= -e "s|./admins|${PKG_SYSCONFDIR}/cgi-admins|" +SUBST_SED.cgi+= -e "s|configure.pl|${PKG_SYSCONFDIR}/configure.pl|" +SUBST_SED.cgi+= -e "s|\"\\/\";|\"${DSPAM_WWWHOME}\";|" +SUBST_SED.cgi+= -e "s|\$$FILE = \"./default.prefs\";|\$$FILE = \"${PKG_SYSCONFDIR}/cgi-default.prefs\";|" SUBST_MESSAGE.cgi= Fixing paths and default options. -BUILD_DEFS+= DSPAM_HOME +BUILD_DEFS+= DSPAM_HOME VARBASE APACHE_USER APACHE_GROUP BUILD_DEFS+= DSPAM_SIGNATURE_LIFE BUILD_DEFS+= DSPAM_USER DSPAM_GROUP BUILD_DEFS+= DSPAM_BINMODE @@ -61,9 +60,9 @@ DSPAM_WWWUSER?= ${APACHE_USER} DSPAM_WWWGROUP?= ${APACHE_GROUP} CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q} -CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \ +CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \ --with-dspam-home-owner=${DSPAM_USER:Q} \ - --with-dspam-home-group=${DSPAM_GROUP:Q} \ + --with-dspam-home-group=${DSPAM_GROUP:Q} \ --with-dspam-owner=${DSPAM_USER:Q} \ --with-dspam-group=${DSPAM_GROUP:Q} \ --with-dspam-mode=${DSPAM_BINMODE:Q} \ @@ -106,11 +105,11 @@ FILES_SUBST+= DSPAM_PIDDIR=${DSPAM_PIDDIR:Q} SUBST_CLASSES+= conf 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|@PREFIX@|${PREFIX}|g" \ - -e "s|@VARBASE@|${VARBASE}|g" \ - -e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g" +SUBST_SED.conf= -e "s|@dspam_home@|${DSPAM_HOME}|g" +SUBST_SED.conf+= -e "s|@delivery_agent@|${DSPAM_DELIVERY_AGENT_BIN}|g" +SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g" +SUBST_SED.conf+= -e "s|@VARBASE@|${VARBASE}|g" +SUBST_SED.conf+= -e "s|@DSPAM_PIDDIR@|${DSPAM_PIDDIR}|g" SUBST_MESSAGE.conf= Fixing configuration file. post-install: @@ -149,4 +148,9 @@ post-install: ${PAX} -rwppm '-s|.*/Makefile.*$$||' . ${DATADIR}/sqlite .endif + ${CHMOD} ${SHAREMODE} ${DATADIR}/webui/cgi-bin/*.txt + ${CHMOD} ${SHAREMODE} ${DATADIR}/webui/cgi-bin/templates/*.html + ${CHMOD} ${SHAREMODE} ${DATADIR}/webui/htdocs/*.css + ${CHMOD} ${SHAREMODE} ${DATADIR}/webui/htdocs/*.gif + .include "../../mk/bsd.pkg.mk" diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST index 2a4e68aa42a..83c07a760b9 100644 --- a/mail/dspam/PLIST +++ b/mail/dspam/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2006/12/10 04:36:30 obache Exp $ +@comment $NetBSD: PLIST,v 1.17 2007/05/07 09:29:54 adrianp Exp $ ${HASH}bin/cssstat ${HASH}bin/csscompress ${HASH}bin/cssclean @@ -52,7 +52,6 @@ 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 share/doc/dspam/pgsql_drv.txt share/doc/dspam/pop3filter.txt @@ -61,6 +60,7 @@ share/doc/dspam/qmail.txt share/doc/dspam/relay.txt share/doc/dspam/sendmail.txt share/doc/dspam/sqlite_drv.txt +share/doc/dspam/tests.txt share/dspam/txt/firstrun.txt share/dspam/txt/firstspam.txt share/dspam/txt/quarantinefull.txt diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index 9df9d8bb3a3..1a85f99943c 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.29 2006/06/18 08:29:00 xtraeme Exp $ +$NetBSD: distinfo,v 1.30 2007/05/07 09:29:54 adrianp Exp $ -SHA1 (dspam-3.6.8.tar.gz) = e8c413882eadf1e02837e4a2ffcfc98b801eded1 -RMD160 (dspam-3.6.8.tar.gz) = 93a70db14070cb61bd2ef1b0ca55a18be1dbfd7b -Size (dspam-3.6.8.tar.gz) = 743275 bytes +SHA1 (dspam-3.8.0.tar.gz) = d1de7ee2134522adaf52f49167accecf1589fa96 +RMD160 (dspam-3.8.0.tar.gz) = e7831e2415e30e819dd9cbc0ba3f269e113e2fb9 +Size (dspam-3.8.0.tar.gz) = 726160 bytes SHA1 (patch-aa) = 04e94e3da9de06c15863425d0a827858b5dd4a6c SHA1 (patch-ad) = cfa68c01cb3f5ce0556c7a3b008dc214bdfbbd95 diff --git a/mail/dspam/options.mk b/mail/dspam/options.mk index b313446f22c..884236c4770 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -1,13 +1,16 @@ -# $NetBSD: options.mk,v 1.19 2007/02/22 19:26:41 wiz Exp $ +# $NetBSD: options.mk,v 1.20 2007/05/07 09:29:54 adrianp Exp $ .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= largescale homedir long-usernames graphs \ - domainscale \ - clamav syslog debug verbose-debug +PKG_SUPPORTED_OPTIONS= largescale homedir long-usernames graphs domainscale +PKG_SUPPORTED_OPTIONS+= clamav syslog debug dspam-verbose-debug + +PKG_OPTIONS_LEGACY_OPTS+= verbose-debug:dspam-verbose-debug +PKG_OPTIONS_LEGACY_OPTS+= virtualusers:dspam-virtualusers +PKG_OPTIONS_LEGACY_OPTS+= preferences-extension:dspam-preferences-extension ### ### DSPAM_DELIVERY_AGENT is the tool called to to deliver messages. @@ -39,7 +42,7 @@ PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}' ### 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, sqlite3 or hash +### Possible: mysql, pgsql, sqlite, sqlite3 or hash ### Default: hash ### DSPAM_STORAGE_DRIVER?= hash @@ -67,8 +70,6 @@ CONFIGURE_ARGS+= \ --with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql \ --with-pgsql-libraries=${PGSQL_PREFIX}/lib PGSQL_PLIST_SUBST= PGSQL= -.elif !empty(DSPAM_STORAGE_DRIVER:Mbdb) -PKG_FAIL_REASON+= "Berkeley DB3/4 is deprecated (not recommended). Please migrate to a different storage driver." .elif !empty(DSPAM_STORAGE_DRIVER:Msqlite) . include "../../databases/sqlite/buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv @@ -78,7 +79,7 @@ SQLITE_PLIST_SUBST= SQLITE= CONFIGURE_ARGS+= --with-storage-driver=sqlite3_drv SQLITE_PLIST_SUBST+= SQLITE= .else -PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \`${DSPAM_STORAGE_DRIVER}\'" +PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \\'${DSPAM_STORAGE_DRIVER}\\'" .endif # daemon mode only supports MySQL, PostgreSQL or hash @@ -104,7 +105,7 @@ PLIST_SUBST+= ${HASH_PLIST_SUBST} ### The following are only available for mysql and pgsql backends. ### .if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || !empty(DSPAM_STORAGE_DRIVER:Mpgsql) -PKG_SUPPORTED_OPTIONS+= preferences-extension virtualusers ldap +PKG_SUPPORTED_OPTIONS+= dspam-preferences-extension dspam-virtualusers ldap .endif .include "../../mk/bsd.options.mk" @@ -212,6 +213,6 @@ CONFIGURE_ARGS+= --enable-debug ### LOGDIR/dspam.debug file. Implies '--enable-debug'. ### Never enable this for production builds ! ### -.if !empty(PKG_OPTIONS:Mverbose-debug) +.if !empty(PKG_OPTIONS:Mdspam-verbose-debug) CONFIGURE_ARGS+= --enable-verbose-debug .endif |