diff options
author | pav <pav@FreeBSD.org> | 2004-11-28 09:09:18 +0800 |
---|---|---|
committer | pav <pav@FreeBSD.org> | 2004-11-28 09:09:18 +0800 |
commit | d92799d5bb77241cbff1d998992bab75afdcc0fb (patch) | |
tree | e4343143fd3b90864502534195d3abbde29e1b89 /mail/dspam-devel | |
parent | 931793feca98ac9a3bb64c9e1759e95d5e75a6f3 (diff) | |
download | freebsd-ports-gnome-d92799d5bb77241cbff1d998992bab75afdcc0fb.tar.gz freebsd-ports-gnome-d92799d5bb77241cbff1d998992bab75afdcc0fb.tar.zst freebsd-ports-gnome-d92799d5bb77241cbff1d998992bab75afdcc0fb.zip |
- Update to 3.3.0.20041125.0945 snapshot
PR: ports/74429
Submitted by: Ion-Mihai "IOnut" Tetcu <itetcu@people.tecnik93.com> (maintainer)
Diffstat (limited to 'mail/dspam-devel')
-rw-r--r-- | mail/dspam-devel/Makefile | 528 | ||||
-rw-r--r-- | mail/dspam-devel/distinfo | 4 | ||||
-rw-r--r-- | mail/dspam-devel/files/310_to_320.my.sql | 6 | ||||
-rw-r--r-- | mail/dspam-devel/files/310_to_320.pg.sql | 35 | ||||
-rw-r--r-- | mail/dspam-devel/files/UPDATING | 123 | ||||
-rw-r--r-- | mail/dspam-devel/files/mysql.data | 5 | ||||
-rw-r--r-- | mail/dspam-devel/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | mail/dspam-devel/files/patch-configure | 12 | ||||
-rw-r--r-- | mail/dspam-devel/files/pgsql.data | 5 | ||||
-rw-r--r-- | mail/dspam-devel/pkg-descr | 2 | ||||
-rw-r--r-- | mail/dspam-devel/pkg-message | 86 | ||||
-rw-r--r-- | mail/dspam-devel/pkg-plist | 35 |
12 files changed, 585 insertions, 267 deletions
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile index 04a85a868c03..032b8d8971d5 100644 --- a/mail/dspam-devel/Makefile +++ b/mail/dspam-devel/Makefile @@ -6,44 +6,49 @@ # PORTNAME= dspam-devel -PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE} CATEGORIES= mail -MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ \ - http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/sources/ -DISTFILES= dspam-${PORTVERSION}.tar.gz +MASTER_SITES= http://people.tecnik93.com/~itetcu/FreeBSD/ports/dspam-devel/sources/ +DISTFILES= ${PORTNAME}.${PORTVERSION}.tar.gz MAINTAINER= itetcu@people.tecnik93.com COMMENT= Bayesian spam filter - development version -WRKSRC= ${WRKDIR}/dspam-${PORTVERSION} +WRKSRC= ${WRKDIR}/dspam-cvs-devel${SNAP_DATE} -## debug / log options -OPTIONS= DEBUG "Enable debug in DSPAM_HOME/dspam.debug" on -OPTIONS+= VERBOSE_DEBUG "Enable verbose debug" off -OPTIONS+= USER_LOGGING "Log mail in DSPAM_HOME/data/user/user.log" off -OPTIONS+= SYSTEM_LOGGING "Log some info DSPAM_HOME/system.log" on -OPTIONS+= SAT "Log spam source addresses to syslog" on +SNAP_DATE= .20041125.0945 +PORTVER_MAJ= 3.3.0.a + +## debug / log / admin options +OPTIONS= DEBUG "Enable debugging logging" on +OPTIONS+= VERBOSE_DEBUG "Enable debug in LOGDIR/dspam.debug" off +#OPTIONS+= USER_LOGGING "Log mail in DSPAM_HOME/data/user/user.log" off +#OPTIONS+= SYSTEM_LOGGING "Log some info DSPAM_HOME/system.log" on +#OPTIONS+= SAT "Log spam source addresses to syslog" on +#OPTIONS+= PARSE_TO_HEADERS "Get user from To header on fp spam" off +OPTIONS+= PREF_EXT "Preferences in database not in files" off ## algorithm options -OPTIONS+= TRAD_BAYES "Enable traditional-bayesian" on -OPTIONS+= ALT_BAYES "Enable alternative-bayesian" on +OPTIONS+= GRAHAM_BAYES "Enable Graham (traditional) bayesian" on +OPTIONS+= BURTON_BAYES "Enable Burton (alternative) bayesian" on OPTIONS+= RNB "Use Robinson Naive Bayesian calculation" off OPTIONS+= CHI_SQUARE "Use Fisher-Robinson Inv Chi-Square" off -OPTIONS+= RPV "Use Robinson technique combining p-values" off +OPTIONS+= RPV "Use Robinson technique combining p-values" on OPTIONS+= TEST_COND "More inoculous results rapidly, risk fps" on OPTIONS+= NO_BIAS "No bias toward innocent mail" off OPTIONS+= WHITELIST "Automatic whitelisting of ham" off OPTIONS+= NEURAL_NET "Enable neural networking" off ## run-time configure options -OPTIONS+= HOMEDIR_DOT "Dot files in ~/USER not DSPAM_HOME" off -OPTIONS+= OPT_IN "Run only for users with .dspam" off +#OPTIONS+= HOMEDIR_DOT "Dot files in ~/USER not DSPAM_HOME" off +OPTIONS+= USER_HOMEDIR "Store user data in ~/.dspam" off +#OPTIONS+= OPT_IN "Run only for users with .dspam" off OPTIONS+= TRUSTED_USERS "Disable trusted user security" off ## mesage taging options -OPTIONS+= SPAM_SUBJ "Prepends SPAM to the Subject header" off -OPTIONS+= SIGNATURE_HEADERS "Put signatures IDs in the header" off -OPTIONS+= WEBMAIL "Only with mail stored server-side" off +#OPTIONS+= SPAM_SUBJ "Prepends SPAM to the Subject header" off +#OPTIONS+= SIGNATURE_HEADERS "Put signatures IDs ONLY in headers" off +#OPTIONS+= WEBMAIL "Only with mail stored server-side" off ## back-end -OPTIONS+= MYSQL "Use MySQL as back-end" off +OPTIONS+= MYSQL40 "Use MySQL 4.0.x as back-end" off +OPTIONS+= MYSQL41 "Use MySQL 4.1.x as back-end" off OPTIONS+= MYSQL_COMPRESS "Compress dspam <--> MySQL" off OPTIONS+= POSTGRESQL73 "Use PostgreSQL v.7.3 as back-end" off OPTIONS+= POSTGRESQL74 "Use PostgreSQL v.7.4 as back-end" off @@ -55,112 +60,133 @@ OPTIONS+= VIRT_USERS "Enable virtual users (needs SQL back-end)" off OPTIONS+= LONG_USERNAMES "Usernames longer that OS supports" off OPTIONS+= LARGE_SCALE "File structure for large scale" off OPTIONS+= DOMAIN_SCALE "File structure for multiple domains" off -OPTIONS+= SIGNATURE_ATACH "Put server-side signature in mails" off +#OPTIONS+= SIGNATURE_ATACH "Put server-side signature in mails" off ## MTA and LDA -OPTIONS+= MAILDROP "Use Maildrop as local delivery agent" off -OPTIONS+= PROCMAIL "Use Procmail as local delivery agent" off -OPTIONS+= CYRUS_LDA "Use Cyrus's 1.6 deliver as LDA" off +OPTIONS+= MAILDROP_LDA "Use Maildrop as local delivery agent" off +OPTIONS+= PROCMAIL_LDA "Use Procmail as local delivery agent" off OPTIONS+= CYRUS21_LDA "Use Cyrus's 2.1 deliver as LDA" off OPTIONS+= CYRUS22_LDA "Use Cyrus's 2.2 deliver as LDA" off OPTIONS+= SENDMAIL_LDA "Use Sendmail as local delivery agent" off + OPTIONS+= SENDMAIL "Play nice with sendmail server" off OPTIONS+= POSTFIX_MBC "Dspam as mailbox_command in Postfix" off OPTIONS+= QMAIL "Play nice with Qmail mail server" off -OPTIONS+= BROKEN_ERR_CODES "99=spam, 0=not, other=error (qmailish)" off -OPTIONS+= BROKEN_MTA "Enable if MTA pases ^M to dspam" off +#OPTIONS+= BROKEN_ERR_CODES "99=spam, 0=not, other=error (qmailish)" off +#OPTIONS+= BROKEN_MTA "Enable if MTA pases ^M to dspam" off + OPTIONS+= CGI "Install CGI (pulls in apache)" off USE_GNOME= pkgconfig -USE_INC_LIBTOOL_VER=13 +#USE_INC_LIBTOOL_VER=13 +USE_LIBTOOL_VER=15 USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +PKGMESSAGE= ${WRKSRC}/src/README.FreeBSD + CONFLICTS= dspam-2* dspam-3* +SIGNATURE_LIFE?= 15 +_VAR_DIR= /var +LOG_DIR?= ${_VAR_DIR}/log/dspam +DSPAM_HOME?= ${_VAR_DIR}/db/dspam +DSPAM_HOME_MODE?= 0660 + +.include <bsd.port.pre.mk> + +CONFIGURE_ARGS+= --with-logdir=${LOG_DIR} +PLIST_SUB+= LOG_DIR=${LOG_DIR} + +CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} +PLIST_SUB+= DSPAM_HOME=${DSPAM_HOME} + +.if defined(DSPAM_HOME_OWNER) +CONFIGURE_ARGS+= --with-dspam-home-owner=${DSPAM_HOME_OWNER} +.endif +.if defined(DSPAM_HOME_GROUP) +CONFIGURE_ARGS+= --with-dspam-home-group=${DSPAM_HOME_GROUP} +.endif +.if defined(DSPAM_HOME_MODE) +CONFIGURE_ARGS+= --with-dspam-home-mode=${DSPAM_HOME_MODE} +.endif + +.if defined(DSPAM_OWNER) +CONFIGURE_ARGS+= --with-dspam-owner=${DSPAM_OWNER} +.endif +.if defined(DSPAM_GROUP) +CONFIGURE_ARGS+= --with-dspam-group=${DSPAM_HOME_GROUP} +.endif +.if defined(DSPAM_MODE) +CONFIGURE_ARGS+= --with-dspam-mode=${DSPAM_HOME_MODE} +.endif + SED_SCRIPT= -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%EXAMPLESDIR%%,${EXAMPLESDIR},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - -e 's,%%PREFIX%%,${PREFIX},g' - -WITH_SIGNATURE_LIFE?= 15 - -.include <bsd.port.pre.mk> + -e 's,%%PREFIX%%,${PREFIX},g' \ + -e 's,%%PKGNAME%%,${PKGNAME},g' \ + -e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --disable-debug .endif .if defined(WITH_VERBOSE_DEBUG) CONFIGURE_ARGS+= --enable-verbose-debug -.else -CONFIGURE_ARGS+= --disable-verbose-debug .endif -.if defined(WITH_SYSTEM_LOGGING) -CONFIGURE_ARGS+= --enable-logging -.else -CONFIGURE_ARGS+= --disable-system-logging -.endif +# conf option +#.if defined(WITH_SYSTEM_LOGGING) +#CONFIGURE_ARGS+= --enable-logging +#.else +#CONFIGURE_ARGS+= --disable-system-logging +#.endif -.if defined(WITH_USER_LOGGING) -CONFIGURE_ARGS+= --enable-user-logging -.else -CONFIGURE_ARGS+= --disable-user-logging -.endif +# conf option +#.if defined(WITH_USER_LOGGING) +#CONFIGURE_ARGS+= --enable-user-logging +#.else +#CONFIGURE_ARGS+= --disable-user-logging +#.endif + +# conf +#.if defined(WITH_SAT) +#CONFIGURE_ARGS+= --enable-source-address-tracking +#.endif + +# conf +#.if defined(PARSE_TO_HEADERS) +#CONFIGURE_ARGS+= --enable-parse-to-headers +#.endif -.if defined(WITH_SAT) -CONFIGURE_ARGS+= --enable-source-address-tracking +.if defined(PREF_EXT) +CONFIGURE_ARGS+= --enable-preferences-extension .endif -.if defined(WITH_TRAD_BAYES) -CONFIGURE_ARGS+= --enable-traditional-bayesian -HAVE_ALG=yes -.else +.if !defined(WITH_GRAHAM_BAYES) CONFIGURE_ARGS+= --disable-traditional-bayesian .endif -.if defined(WITH_ALT_BAYES) -CONFIGURE_ARGS+= --enable-alternative-bayesian -HAVE_ALG=yes -.else +.if !defined(WITH_BURTON_BAYES) CONFIGURE_ARGS+= --disable-alternative-bayesian .endif .if defined(WITH_RNB) CONFIGURE_ARGS+= --enable-robinson -HAVE_ALG=yes -.else -CONFIGURE_ARGS+= --disable-robinson .endif .if defined(WITH_CHI_SQUARE) CONFIGURE_ARGS+= --enable-robinson -HAVE_ALG=yes -.else -CONFIGURE_ARGS+= --disable-robinson .endif .if defined(WITH_RPV) CONFIGURE_ARGS+= --enable-robinson-pvalues -HAVE_ALG=yes -.else -CONFIGURE_ARGS+= --disable-robinson-pvalues .endif -# redundant with options for BATCH=yes and no OPTIONS defined builds -.if !defined(HAVE_ALG) && defined(BATCH) -CONFIGURE_ARGS+= --enable-traditional-bayesian -CONFIGURE_ARGS+= --enable-alternative-bayesian -.endif - -.if defined(WITH_TEST_COND) -CONFIGURE_ARGS+= --enable-test-conditional -.else +.if !defined(WITH_TEST_COND) CONFIGURE_ARGS+= --disable-test-conditional .endif @@ -176,36 +202,60 @@ CONFIGURE_ARGS+= --enable-whitelist CONFIGURE_ARGS+= --enable-neural-networking .endif -.if defined(WITH_HOMEDIR_DOT) -CONFIGURE_ARGS+= --enable-homedir-dotfiles -.endif +#.if defined(WITH_HOMEDIR_DOT) +#CONFIGURE_ARGS+= --enable-homedir-dotfiles +#.endif -.if defined(WITH_OPT_IN) -CONFIGURE_ARGS+= --enable-opt-in +.if defined(WITH_USER_HOMEDIR) +CONFIGURE_ARGS+= --enable-homedir +## XXXXXXXX +# to check incompatibility with CGI and warn user +# to install setuid root .endif +# conf +#.if defined(WITH_OPT_IN) +#CONFIGURE_ARGS+= --enable-opt-in +#.endif + .if defined(WITH_TRUSTED_USERS) CONFIGURE_ARGS+= --disable-trusted-user-security .endif -.if defined(WITH_SPAM_SUBJ) -CONFIGURE_ARGS+= --enable-spam-subject -.endif +# conf +#.if defined(WITH_SPAM_SUBJ) +#CONFIGURE_ARGS+= --enable-spam-subject +#.endif -.if defined(WITH_SIGNATURE_HEADERS) -CONFIGURE_ARGS+= --enable-signature-headers -.endif +# .conf option +#.if defined(WITH_SIGNATURE_HEADERS) +#CONFIGURE_ARGS+= --enable-signature-headers +#SED_SCRIPT+= -e 's,%%SIGHDR%%,,g' +#.else +#SED_SCRIPT+= -e '/%%SIGHDR%%/D' +#.endif -.if defined(SIGNATURE_ATACH) -CONFIGURE_ARGS+= --enable-signature-attachments -.endif +# not supported anymore +#.if defined(SIGNATURE_ATACH) +#CONFIGURE_ARGS+= --enable-signature-attachments +#.endif -.if defined(WITH_WEBMAIL) -CONFIGURE_ARGS+= --enable-webmail +#.if defined(WITH_WEBMAIL) +#CONFIGURE_ARGS+= --enable-webmail +#.endif + +DBDRV_TOTAL_COUNT= ooooooo # 7 +DBDRV_COUNT= ${DBDRV_TOTAL_COUNT} + +.if defined(WITH_MYSQL40) +WANT_MYSQL_VER= 40 +#PKGNAMESUFFIX= -mysql40 +.elseif defined(WITH_MYSQL41) +WANT_MYSQL_VER= 41 +#PKGNAMESUFFIX= -mysql41 .endif -.if defined(WITH_MYSQL) -USE_MYSQL= yes +.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) CONFIGURE_ARGS+= --with-storage-driver=mysql_drv \ --with-mysql-includes=${LOCALBASE}/include/mysql \ --with-mysql-libraries=${LOCALBASE}/lib/mysql @@ -216,14 +266,15 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e 's,%%MYSQL%%,,g' SED_SCRIPT+= -e '/%%PGSQL%%/D' SED_SCRIPT+= -e '/%%SQLITE%%/D' +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .if defined(WITH_MYSQL_COMPRESS) CONFIGURE_ARGS+= --enable-client-compression .endif .endif .if defined(WITH_POSTGRESQL73) -LIB_DEPENDS= pq.3:${PORTSDIR}/databases/postgresql73 -#BUILD_DEPENDS= ${LIB_DEPENDS} +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql73 +#BUILD_DEPENDS+= ${LIB_DEPENDS} CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ --with-pgsql-includes=${LOCALBASE}/include \ --with-pgsql-libraries=${LOCALBASE}/lib @@ -234,11 +285,13 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e 's,%%PGSQL%%,,g' SED_SCRIPT+= -e '/%%SQLITE%%/D' +#PKGNAMESUFFIX= -pgsql73 +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif .if defined(WITH_POSTGRESQL74) -LIB_DEPENDS= ecpg.4:${PORTSDIR}/databases/postgresql7 -#BUILD_DEPENDS= ${LIB_DEPENDS} +LIB_DEPENDS+= ecpg.4:${PORTSDIR}/databases/postgresql7 +#BUILD_DEPENDS+= ${LIB_DEPENDS} CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv \ --with-pgsql-includes=${LOCALBASE}/include \ --with-pgsql-libraries=${LOCALBASE}/lib @@ -249,6 +302,8 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e 's,%%PGSQL%%,,g' SED_SCRIPT+= -e '/%%SQLITE%%/D' +#PKGNAMESUFFIX= -pgsql74 +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif .if defined(WITH_ORACLE) @@ -256,6 +311,8 @@ BUILD_DEPENDS= ${LOCALBASE}/oracle7/rdbms/lib/libnlsrtl3.a:\ ${PORTSDIR}/databases/oracle7-client CONFIGURE_ARGS+= --with-storage-driver=ora_drv \ --with-oracle-home= ${LOCALBASE}/oracle7 +#PKGNAMESUFFIX= -oracle +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif .if defined(WITH_BDB) @@ -269,9 +326,12 @@ PLIST_SUB+= SQLITE="@comment " SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e '/%%PGSQL%%/D' SED_SCRIPT+= -e '/%%SQLITE%%/D' +#PKGNAMESUFFIX= -bdb +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif -.if !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE) || defined(WITH_BDB)) +.if ${DBDRV_TOTAL_COUNT}==${DBDRV_COUNT} || defined(WITH_SQLITE) +# DBDRV_COUNT==!(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) || defined(WITH_ORACLE) || defined(WITH_BDB)) WITH_SQLITE= on LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv \ @@ -284,6 +344,8 @@ PLIST_SUB+= SQLITE="" SED_SCRIPT+= -e '/%%MYSQL%%/D' SED_SCRIPT+= -e '/%%PGSQL%%/D' SED_SCRIPT+= -e 's,%%SQLITE%%,,g' +#PKGNAMESUFFIX= -sqlite2 +DBDRV_COUNT:= ${DBDRV_COUNT:S/o//} .endif .if defined(WITH_VIRT_USERS) @@ -300,40 +362,49 @@ CONFIGURE_ARGS+= --enable-large-scale CONFIGURE_ARGS+= --enable-domain-scale .endif -.if defined(WITH_MAILDROP) +# add one 'o' here for each new LDA +LDA_TOTAL_COUNT= oooooo #6 +LDA_COUNT= ${LDA_TOTAL_COUNT} + +.if defined(WITH_MAILDROP_LDA) RUN_DEPENDS+= maildrop:${PORTSDIR}/mail/maildrop -CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/maildrop $u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/maildrop -d $$u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/maildrop' +LDA_COUNT:= ${LDA_COUNT:S/o//} .endif -.if defined(WITH_PROCMAIL) +.if defined(WITH_PROCMAIL_LDA) RUN_DEPENDS+= procmail:${PORTSDIR}/mail/procmail -CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/procmail $u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/procmail -d $$u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/procmail' +LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .if defined(WITH_SENDMAIL_LDA) && exists(/usr/sbin/sendmail) CONFIGURE_ARGS+= --with-delivery-agent=/usr/sbin/sendmail +LDA_COUNT:= ${LDA_COUNT:S/o//} .else -.if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail) +. if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail) CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/sbin/sendmail' -.endif -.endif - -.if defined(WITH_CYRUS_LDA) -RUN_DEPENDS+= ${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus -CONFIGURE_ARGS+=\ ---with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/sbin/sendmail' +LDA_COUNT:= ${LDA_COUNT:S/o//} +. endif .endif .if defined(WITH_CYRUS21_LDA) RUN_DEPENDS+= ${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd2 -CONFIGURE_ARGS+=\ ---with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u' +#CONFIGURE_ARGS+=\ +#--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver' +LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .if defined(WITH_CYRUS22_LDA) RUN_DEPENDS+= ${LOCALBASE}/cyrus/bin/deliver:${PORTSDIR}/mail/cyrus-imapd22 -CONFIGURE_ARGS+=\ ---with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u' +#CONFIGURE_ARGS+=\ +#--with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver -e -r $${sender} -m $${extension} $${user} $$u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/cyrus/bin/deliver' +LDA_COUNT:= ${LDA_COUNT:S/o//} .endif .if defined(WITH_SENDMAIL) @@ -351,33 +422,17 @@ SED_SCRIPT+= -e '/%%POSTFIX_MBC%%/D' CONFIGURE_ARGS+= --with-dspam-mode=4511 .endif -.if defined(WITH_BROKEN_ERR_CODES) -CONFIGURE_ARGS+= --enable-broken-return-codes -.endif - -.if defined(DSPAM_HOME) -CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} -.else -CONFIGURE_ARGS+= --with-dspam-home=${PREFIX}/etc/dspam -DSPAM_HOME= ${PREFIX}/etc/dspam -.endif - -.if defined(DSPAM_OWNER) -CONFIGURE_ARGS+= --with-dspam-home-owner=${DSPAM_OWNER} -.endif +# conf +#.if defined(WITH_BROKEN_ERR_CODES) +#CONFIGURE_ARGS+= --enable-broken-return-codes +#.endif -.if defined(DSPAM_GROUP) -CONFIGURE_ARGS+= --with-dspam-home-group=${DSPAM_GROUP} -.endif - -.if defined(WITH_BROKEN_MTA) -CONFIGURE_ARGS+= --enable-broken-mta -.endif - -.if defined(WITH_SIGNATURE_LIFE) -CONFIGURE_ARGS+= --with-signature-life=${WITH_SIGNATURE_LIFE} -.endif +# conf +#.if defined(WITH_BROKEN_MTA) +#CONFIGURE_ARGS+= --enable-broken-mta +#.endif +# conf option .if defined(QUARANTINE_AGENT) CONFIGURE_ARGS+= --with-quarantine-agent=${QUARANTINE_AGENT} .endif @@ -393,13 +448,10 @@ CONFIGURE_ARGS+=--enable-logging CONFIGURE_ARGS+=--enable-user-logging USE_PERL5_RUN= yes PLIST_SUB+= CGI="" -.if !defined(CGI_PATH) -CGI_PATH= ${PREFIX}/www/vhosts/dspam -.endif +CGI_PATH?= ${PREFIX}/www/vhosts/dspam SED_SCRIPT+= -e 's,%%CGI%%,,g' SED_SCRIPT+= -e 's,%%CGI_PATH%%,${CGI_PATH},g' -SED_SCRIPT+= -e 's,%%DSPAM_HOME%%,${DSPAM_HOME},g' -#SED_FILES= ${LS} ${WRKSRC}/cgi/*.pl +#SED_FILES= ${LS} ${WRKSRC}/cgi/*.pl #SED_FILES+= ${LS} $PWRKSRC}/cgi/*.cgi .else PLIST_SUB+= CGI="@comment " @@ -408,39 +460,96 @@ SED_SCRIPT+= -e '/%%CGI%%/D' MAN1= dspam.1 dspam_clean.1 dspam_corpus.1 dspam_dump.1 dspam_merge.1 \ dspam_stats.1 - -DOCS= CHANGELOG README LICENSE RELEASE.NOTES - -pre-everything:: +MAN3= libdspam.3 +MLINKS= libdspam.3 dspam_init.3 +MLINKS+= libdspam.3 dspam_create.3 +MLINKS+= libdspam.3 dspam_addattribute.3 +MLINKS+= libdspam.3 dspam_attach.3 +MLINKS+= libdspam.3 dspam_process.3 +MLINKS+= libdspam.3 dspam_getsource.3 +MLINKS+= libdspam.3 dspam_destroy.3 +MLINKS+= libdspam.3 dspam_detach.3 + +DOCS= CHANGELOG LICENSE README README.FreeBSD README.courier README.exim \ + README.pop3filter README.postfix README.qmail README.sendmail \ + RELEASE.NOTES + +pre-extract: +BAD_OPT= `${PKG_VERSION} -t ${_OPTIONS_READ} ${PKGNAME}` + +pre-patch: + @${ECHO_CMD} "" + @${ECHO_CMD} "******************************************************************" + @${ECHO_CMD} "Warning: If upgrading please proceed as stated in" + @${ECHO_CMD} "${FILESDIR}/UPDATING" + @${ECHO_CMD} "******************************************************************" + @${ECHO_CMD} "" @${ECHO_CMD} "Define vars below before make-ing if you need:" @${ECHO_CMD} "" - @${ECHO_CMD} "WITH_SIGNATURE_LIFE (default 15)" + @${ECHO_CMD} "SIGNATURE_LIFE (default 15)" @${ECHO_CMD} "DSPAM_OWNER (default: root)" @${ECHO_CMD} "DSPAM_GROUP (default: mail)" - @${ECHO_CMD} "DSPAM_HOME (default: ${PREFIX}/etc/dspam)" - @${ECHO_CMD} "QUARANTINE_AGENT (default: -)" -.if defined(WITH_CGI) - @${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files" - @${ECHO_CMD} "installed in other place that this installation's default" - @${ECHO_CMD} "${PREFIX}/www/vhosts/dspam" -.endif + @${ECHO_CMD} "DSPAM_MODE" + @${ECHO_CMD} "DSPAM_HOME (default: ${_VAR_DIR}/dspam)" + @${ECHO_CMD} "DSPAM_HOME_OWNER" + @${ECHO_CMD} "DSPAM_HOME_GROUP" + @${ECHO_CMD} "DSPAM_HOME_MODE (default: 0660)" + @${ECHO_CMD} "LOG_DIR (default: ${_VAR_DIR}/log/dspam)" + @${ECHO_CMD} "QUARANTINE_AGENT (default: mail.local)" +. if defined(WITH_CGI) + @${ECHO_CMD} "Define CGI_PATH before make-ing if you need the CGI files" + @${ECHO_CMD} "installed in other place that this installation's default" + @${ECHO_CMD} "${PREFIX}/www/vhosts/dspam" +. endif +.for old_opt in MAILDROP PROCMAIL TRAD_BAYES ALT_BAYES WITH_SPAM_SUBJ \ + USER_LOGGING SYSTEM_LOGGING WEBMAIL OPT_IN SAT PARSE_TO_HEADERS \ + BROKEN_MTA BROKEN_ERR_CODES SIGNATURE_HEADERS SIGNATURE_ATACH \ + HOMEDIR_DOT SIGNATURE_LIFE +. if defined(WITH_${old_opt}) || defined(WITHOUT_${old_opt}) || ${BAD_OPT}=='<' +#. if defined(CUCU) @${ECHO_CMD} "" - @${ECHO_CMD} "I hope you selected only 1 database beck-end above" + @${ECHO_CMD} "******************************************************************" + @${ECHO_CMD} "******************************************************************" + @${ECHO_CMD} "Either:" + @${ECHO_CMD} "an old option ${old_opt} or " + @${ECHO_CMD} "OPTIONS config-file ${_OPTIONS_READ} has been detected !!!" + @${ECHO_CMD} "Trying to prevent self-shooting this port's make ends here." + @${ECHO_CMD} "You shold always read ${PORTSDIR}/UPDATING before installing/updating" + @${ECHO_CMD} "any port. Please remove/adjust your pkgtools.conf, environment and" + @${ECHO_CMD} "your make command-line and/or do 'make rmconfig' as appropiate." + @${ECHO_CMD} "But before read ${FILESDIR}/UPDATING" + @${ECHO_CMD} "as a lot of things have changed, notably the majority of" + @${ECHO_CMD} "compile-time options can/must now be set in" + @${ECHO_CMD} "${PREFIX}/etc/dspam.conf" + @${ECHO_CMD} "******************************************************************" + @${ECHO_CMD} "******************************************************************" @${ECHO_CMD} "" - @sleep 5 + @${FALSE} +. endif +.endfor + post-patch: - @${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \ - s|-ldb-4.1|-ldb41|g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|%%PORTNAME%%|${PORTNAME}|; \ + s|%%PKGNAME%%|${PKGNAME}|; s|%%MAINTAINER%%|${MAINTAINER}|; \ + s|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g; \ + s|-ldb-4.1|-ldb41|g;' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ - ${WRKSRC}/Makefile.in + ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|where @a-14 > to_days(created_on);|where @a-${SIGNATURE_LIFE} > to_days(created_on);|' ${WRKSRC}/src/tools.mysql_drv/purge.sql + @${REINPLACE_CMD} -e 's|WHERE CURRENT_DATE - created_on > 14;|WHERE CURRENT_DATE - created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/src/tools.pgsql_drv/purge.sql + @${REINPLACE_CMD} -e 's|where SYSDATE-created_on > 14|where SYSDATE-created_on > ${SIGNATURE_LIFE};|' ${WRKSRC}/src/tools.ora_drv/purge.sql + @${REINPLACE_CMD} -e "s|where date('now')-date(created_on) > 14;|where date('now')-date(created_on) > ${SIGNATURE_LIFE};|" ${WRKSRC}/src/tools.sqlite_drv/purge.sql pre-configure: -.if defined(WITH_MAILDROP) && (defined(WITH_PROCMAIL) || defined(WITH_SENDMAIL_LDA)) + @${ECHO_CMD} +.if !( ${LDA_TOTAL_COUNT:S/o//}==${LDA_COUNT} || ${LDA_TOTAL_COUNT}==${LDA_COUNT} ) @${ECHO_CMD} "You can only use one local delivery agent at once." + @${ECHO_CMD} "See ${LOCALBASE}/etc/dspam.conf for how to chage it at run time." @${FALSE} .endif -.if defined(WITH_PROCMAIL) && (defined(WITH_MAILDROP) || defined(WITH_SENDMAIL_LDA)) - @${ECHO_CMD} "You can only use one local delivery agent at once." +.if ${DBDRV_TOTAL_COUNT:S/o//}!=${DBDRV_COUNT} + @${ECHO_CMD} + @${ECHO_CMD} "You can use one and only one database back-end at once." @${FALSE} .endif .if defined(WITH_NEURAL_NET) && !(defined(WITH_MYSQL) || defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74)) @@ -452,48 +561,101 @@ pre-configure: @${ECHO_CMD} "You need MySQL, POSTGRESQL or ORACLE for virtual users." @${FALSE} .endif +.if defined(WITH_PREF_EXT) && !( defined(WITH_MYSQL) || \ + defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) ) + @${ECHO_CMD} "You need MySQL or Postgres for preferences extension" + @${FALSE} +.endif +.if defined(WITH_USER_HOMEDIR) && defined(WITH_CGI) + @${ECHO_CMD} "USER_HOMEDIR and CGI are incopatible" + @${FALSE} +.endif post-install: -.if defined(WITH_MYSQL) +### to patch dspam.conf + ${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' ${WRKSRC}/src/dspam.conf + @${CP} ${WRKSRC}/src/dspam.conf ${WRKSRC}/src/dspam.conf.sample + cd ${WRKSRC}/src/ && \ + ${INSTALL_DATA} dspam.conf.sample ${PREFIX}/etc +# @${MKDIR} ${LOG_DIR} +# @${MKDIR} ${DSPAM_HOME} + +######## +# stupid hack until I figure out where/how to patch + @${MKDIR} ${PREFIX}/libdata/pkgconfig + @${MV} ${PREFIX}/lib/pkgconfig/dspam.pc ${PREFIX}/libdata/pkgconfig/dspam.pc + +.if defined(WITH_MYSQL40) || defined(WITH_MYSQL41) @${MKDIR} ${EXAMPLESDIR}/mysql - cd ${WRKSRC}/tools.mysql_drv && \ - ${INSTALL_DATA} README *.sql* ${EXAMPLESDIR}/mysql - @${INSTALL_DATA} ${FILESDIR}/mysql.data ${EXAMPLESDIR}/mysql + cd ${WRKSRC}/src/tools.mysql_drv && \ + ${INSTALL_DATA} README mysql_objects-space.sql \ + mysql_objects-speed.sql purge.sql \ + virtual_users.sql mysql_objects-4.1.sql \ + purge-4.1.sql neural.sql ${EXAMPLESDIR}/mysql @${INSTALL_DATA} ${FILESDIR}/2x_to_3x_db.sql ${EXAMPLESDIR}/mysql + @${INSTALL_DATA} ${FILESDIR}/310_to_320.my.sql ${EXAMPLESDIR}/mysql .endif .if defined(WITH_POSTGRESQL73) || defined(WITH_POSTGRESQL74) @${MKDIR} ${EXAMPLESDIR}/pgsql - @cd ${WRKSRC}/tools.pgsql_drv && \ + @cd ${WRKSRC}/src/tools.pgsql_drv && \ ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/pgsql - ${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql +# ${INSTALL_DATA} ${FILESDIR}/pgsql.data ${EXAMPLESDIR}/pgsql .endif .if defined(WITH_SQLITE) @${MKDIR} ${EXAMPLESDIR}/sqlite - cd ${WRKSRC}/tools.sqlite_drv && \ + cd ${WRKSRC}/src/tools.sqlite_drv && \ ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/sqlite .endif +.if defined(WITH_ORACLE) + @${MKDIR} ${EXAMPLESDIR}/oracle + cd ${WRKSRC}/src/tools.ora_drv && \ + ${INSTALL_DATA} README *.sql ${EXAMPLESDIR}/oracle +.endif .if defined(WITH_CGI) -.for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi - @${SED} -i '' -e "s,/usr/bin/perl,${PERL},g" ${WRKSRC}/cgi/${I} -.endfor - cd ${WRKSRC}/cgi && ${MKDIR} ${CGI_PATH} && \ - ${INSTALL_SCRIPT} *.pl ${CGI_PATH}/ && \ +. for I in admin.cgi admingraph.cgi configure.pl dspam.cgi graph.cgi + @${SED} -i '' -e "s,/usr/bin/perl,${PERL},g" ${WRKSRC}/cgi/${I} +. endfor + cd ${WRKSRC}/cgi && ${MV} configure.pl configure.pl.sample + cd ${WRKSRC}/cgi && ${MKDIR} ${CGI_PATH} && \ + ${INSTALL_SCRIPT} configure.pl.sample ${CGI_PATH}/ && \ ${INSTALL_SCRIPT} *.cgi ${CGI_PATH} - cd ${WRKSRC}/cgi && \ - ${INSTALL_DATA} base.css logo.gif rgb.txt ${CGI_PATH}/ - cd ${WRKSRC}/cgi && \ + cd ${WRKSRC}/cgi && \ + ${INSTALL_DATA} base.css dspam-logo-small.gif rgb.txt ${CGI_PATH}/ + cd ${WRKSRC}/cgi && \ ${INSTALL_DATA} default.prefs ${CGI_PATH}/default.prefs.sample - cd ${WRKSRC}/cgi && \ + cd ${WRKSRC}/cgi && \ ${INSTALL_DATA} admins ${CGI_PATH}/admins.sample - @${MKDIR} ${CGI_PATH}/templates && cd ${WRKSRC}/cgi/templates && \ +# cd ${WRKSRC}/cgi && \ +# ${INSTALL_DATA} configure.pl.sample ${CGI_PATH}/configure.pl.sample + @${MKDIR} ${CGI_PATH}/templates && cd ${WRKSRC}/cgi/templates && \ ${INSTALL_DATA} *.html ${CGI_PATH}/templates/ .endif + @${SED} ${SED_SCRIPT} ${.CURDIR}/pkg-message > ${WRKSRC}/README.FreeBSD .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif - @${SED} ${SED_SCRIPT} ${PKGMESSAGE} + cd ${FILESDIR} && ${INSTALL_DATA} UPDATING ${DOCSDIR} +.endif + + @${MKDIR} -m ${DSPAM_HOME_MODE} ${DSPAM_HOME} + @${CHOWN} ${DSPAM_HOME_OWNER}:${DSPAM_HOME_GROUP} ${DSPAM_HOME} +.for _file in firstrun.txt firstspam.txt quarantinefull.txt + if ! ${TEST} -e ${WRKSRC}/txt/${_file}.sample;\ + then\ + cd ${WRKSRC}/txt && \ + ${MV} ${_file} ${_file}.sample;\ + fi + cd ${WRKSRC}/txt && \ + ${INSTALL_DATA} ${_file}.sample ${DSPAM_HOME} +.endfor + + @${MKDIR} -m ${DSPAM_HOME_MODE} ${LOG_DIR} + + @${CAT} ${WRKSRC}/README.FreeBSD + @${ECHO_CMD} "If you haven't defined NOPORTDOCS you can review this" + @${ECHO_CMD} "message in ${DOCSDIR}/README.FreeBSD" + @${ECHO_CMD} .include <bsd.port.post.mk> diff --git a/mail/dspam-devel/distinfo b/mail/dspam-devel/distinfo index fa7eb0bd0423..c12de3a256d8 100644 --- a/mail/dspam-devel/distinfo +++ b/mail/dspam-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (dspam-3.1.0.tar.gz) = 217c622c8eba132756ebc3cac8396897 -SIZE (dspam-3.1.0.tar.gz) = 611220 +MD5 (dspam-devel.3.3.0.a.20041125.0945.tar.gz) = 91bcb96a4b42c14413c7a2b70603f0fb +SIZE (dspam-devel.3.3.0.a.20041125.0945.tar.gz) = 624972 diff --git a/mail/dspam-devel/files/310_to_320.my.sql b/mail/dspam-devel/files/310_to_320.my.sql new file mode 100644 index 000000000000..7eb8148d52c3 --- /dev/null +++ b/mail/dspam-devel/files/310_to_320.my.sql @@ -0,0 +1,6 @@ +/** dspam 3.1.0 to 3.2.0 mysql migration script */ +/** set myisam_sort_buffer_size to a high value to make this faster */ + +ALTER TABLE dspam_signature_data DROP COLUMN snr; +CREATE INDEX id_signature_data_02 ON dspam_signature_data(created_on); +DROP TABLE dspam_snr_data; diff --git a/mail/dspam-devel/files/310_to_320.pg.sql b/mail/dspam-devel/files/310_to_320.pg.sql new file mode 100644 index 000000000000..84093c43fd6c --- /dev/null +++ b/mail/dspam-devel/files/310_to_320.pg.sql @@ -0,0 +1,35 @@ +/** dspam 3.1.0 to 3.2.0 pgsql migration script */ + +CREATE INDEX id_token_data_03 ON dspam_token_data(token); + +CREATE TABLE dspam_signature_data_tmp ( + uid smallint, + signature varchar(128), + data bytea, + length int, + created_on date, + UNIQUE (signature, uid) +); +INSERT INTO dspam_signature_data_tmp SELECT * FROM dspam_signature_data; +DROP TABLE dspam_signature_data; +ALTER TABLE dspam_signature_data_tmp RENAME TO dspam_signature_data; + +CREATE TABLE dspam_neural_decisions_tmp ( + uid smallint, + signature varchar(128), + data bytea, + length smallint, + length int, + created_on date, + UNIQUE (signature, uid) +); +INSERT INTO dspam_neural_decisions_tmp SELECT * FROM dspam_neural_decisions; +DROP TABLE dspam_neural_decisions; +ALTER TABLE dspam_neural_decisions_tmp RENAME TO dspam_neural_decisions; + +CREATE TABLE dspam_preferences ( + uid smallint, + preference varchar(128), + value varchar(128), + UNIQUE (preference, uid) +); diff --git a/mail/dspam-devel/files/UPDATING b/mail/dspam-devel/files/UPDATING new file mode 100644 index 000000000000..92af4fb7c7c5 --- /dev/null +++ b/mail/dspam-devel/files/UPDATING @@ -0,0 +1,123 @@ +This file documents some of the problems you may encounter when +upgrading dspam port. I will try our best to minimize these disruptions, +but sometimes they are unavoidable. + +You should get into the habit of checking this file for changes each +time before attempting any port upgrade. + +This file concetrate on the FreeBSD / port specific changes and one should read +also the UPGRADING enclosed in the dspam distribution. You can see it by doing +in the port directory: +make extract; more `find . -type f -maxdepth 2 -name UPGRADING` + + +############################################################################ +# dspam-devel-3.3.0.a.20041125.0945 +# + +- changed the naming scheme because of to many upstream modification in +tarball naming - right now it lacks any version (for the same reason the +distfile is renamed from snapshot.tar.gz to PKGNAME and sits on my server); +\ it is now made up of: +PORTNAME: dspam-devel +next MINOR_VERSION: 3.3.0 +we're in pre-beta: a +SNAPSHOT_DATE: 20041125.0945 +\ the strange ``a'' is necessary for pkg_version to work correctly when we will +have the 3.3.0 beta's, rc's and release (tested with pkg_version -t) + +- follow the update procedure from the entry bellow + +- there is a new and very useful dspam.conf option: + MaxMessageSize - specify a maximum message size to process +\ I suggest setting it somewhere between 100 and 300 KB, it is unlikely the +spam you are receiving is bigger and this will improve performance as big +messages won't stuck the databese + +- tum mode has been enhanced and it should outperform teft + +############################################################################### +# dspam-devel-3.2.0-20041027.0930 (never comited in the cvs, don't ask me why): +# + +- dspam configuration is now done via dspam.conf + +- please remove any OPTION + +- the following OPTIONS should be set now in dspam.conf +OPTION .conf name def. value +------------------------------------------------------------------------------- +DSPAM_HOME Home /var/dspam +WITH_*_LDA TrustedDeliveryAgent mail.local + UntrustedDeliveryAgent /usr/libexec/mail.local d %u +QUARANTINE_AGENT QuarantineAgent # + +WITH_SPAM_SUBJ Preference "spamAction=tag" # + Preference "spamSubject=SPAM" # +USER_LOGGING UserLog on +SYSTEM_LOGGING SystemLog on +WEBMAIL TrainPristine off +WITH_OPT_IN Opt out +SAT TrackSources spam ham # +PARSE_TO_HEADERS ParseToHeaders on +BROKEN_MTA Broken lineStripping # +BROKEN_ERR_CODES Broken returnCodes # +SIGNATURE_HEADERS Preference "signatureLocation= message" # headers + +- the following OPTIONS should does not exist anymore: +SIGNATURE_ATACH WITH_HOMEDIR_DOT + +- the following OPTIONS have their name changed to follow vedor names +TRAD_BAYES GRAHAM_BAYES +ALT_BAYES BURTON_BAYES +WITH_SIGNATURE_LIFE SIGNATURE_LIFE + +- new OPTIONS +OPTION port default +---------------------------------------------- +LOG_DIR /var/log/dspam +WITH_USER_HOMEDIR +DSPAM_HOME_OWNER +DSPAM_HOME_GROUP +DSPAM_HOME_MODE +DSPAM_MODE +DSPAM_OWNER +DSPAM_GROUP + +To upgrade you should: + +0. Read docs enclosed with teh dpsam distribution, beginnig with UPGRADING and +README + +1. Adjust your OPTIONs +( make rmconfig config in dspam port dir, command line, pkg_tools.conf ) + +2. make VARs....... +in dspam port dir with appropiate OPTIONS adn VARs (see changes above) + +3. stop you MTA or deactivate dspam from it + +5. make VARs........ install + +4.a) If using MySQL 4.0.xx or PostgreSQL: +- back-up the database +- use the appropiate migration script from files dir of dspam port dir +(if using MySQL 4.1.x or 3.xx you're on your own for now) + +5. Back-up and them move the files from the old DSPAM_HOME +(defaulted: /usr/loca/etc/dspam) to the new DSPAM_HOME (default /vad/db/dspam) +or where ever you defined DSPA_HOME in 2 above. + +6. Adjust you new dspam.conf according with your setup OPTIONS and VARs defined +on make / mak install step. + +7. Remove the old setup files (you have them in the back-up, right ?) + +7. Enable dspam in the MTA setup, but only locally or something and start testing. + +If something ain't working is one of: +- permissions problems (hint: with what UID +is dspam called from your MTA vs. DSPAM_HOME and DSPAM_LOG_DIR) +- something wrong in dspam.conf (hint: you didn't remove old config files +and they are still used ?) + diff --git a/mail/dspam-devel/files/mysql.data b/mail/dspam-devel/files/mysql.data deleted file mode 100644 index 1a48d14863f8..000000000000 --- a/mail/dspam-devel/files/mysql.data +++ /dev/null @@ -1,5 +0,0 @@ -/tmp/mysql.sock - -user -password -database diff --git a/mail/dspam-devel/files/patch-Makefile.in b/mail/dspam-devel/files/patch-Makefile.in deleted file mode 100644 index bffbd6d73240..000000000000 --- a/mail/dspam-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Thu Jun 24 18:32:38 2004 -+++ Makefile.in Thu Jun 24 18:37:09 2004 -@@ -242,7 +242,7 @@ - man_MANS = dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 \ - dspam_merge.1 - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - pkgconfig_DATA = dspam.pc - EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \ - dspam-button.gif dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 \ diff --git a/mail/dspam-devel/files/patch-configure b/mail/dspam-devel/files/patch-configure deleted file mode 100644 index cb3208b2c46a..000000000000 --- a/mail/dspam-devel/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.orig Wed Nov 26 14:35:34 2003 -+++ configure Thu Dec 11 14:00:18 2003 -@@ -7548,7 +7548,8 @@ - - - # This can be used to rebuild libtool when needed --LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+LIBTOOL_DEPS="%%LIBTOOLFLAGS%% $ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' diff --git a/mail/dspam-devel/files/pgsql.data b/mail/dspam-devel/files/pgsql.data deleted file mode 100644 index bb564dca581b..000000000000 --- a/mail/dspam-devel/files/pgsql.data +++ /dev/null @@ -1,5 +0,0 @@ -/tmp - -username -password -dspam_database diff --git a/mail/dspam-devel/pkg-descr b/mail/dspam-devel/pkg-descr index 31a1b8569879..2dce6e735aa5 100644 --- a/mail/dspam-devel/pkg-descr +++ b/mail/dspam-devel/pkg-descr @@ -4,4 +4,4 @@ server-side agent for UNIX email servers and a developer's library for mail clients, other anti-spam tools, and similar projects requiring drop-in spam filtering. -WWW: http://www.nuclearelephant.com/projects/dspam/ +WWW: http://dspam.nuclearelephant.com diff --git a/mail/dspam-devel/pkg-message b/mail/dspam-devel/pkg-message index 54ba1c8b8e49..36797f4a9d93 100644 --- a/mail/dspam-devel/pkg-message +++ b/mail/dspam-devel/pkg-message @@ -2,61 +2,52 @@ ------------------------------------------------------------------------------- See the file %%DOCSDIR%%/README for advice about - how to configure DSPAM with your MTA and setting up the CGI with Apache. - Examples are provided for sendmail, postfix, exim and courier MTAs. + how to configure DSPAM and + %%DOCSDIR%%/README.your_mta_name + for MTA or pop3 integration; examples for: + courier, exim, pop3filter, postfix, qmail and sendmail. + Keep in mind that while this port obeys our hier(7) this thing is not + reflected in distributed files because I lack the time for patching them. -%%POSTFIX_MBC%% -%%POSTFIX_MBC%% Quick Postfix setup guide: -%%POSTFIX_MBC%% Add root, postfix and cgiuser to %%PREFIX%%/etc/dspam/trusted.users -%%POSTFIX_MBC%% In main.cf set -%%POSTFIX_MBC%% mailbox_command = %%PREFIX%%/bin/dspam --user $USER --mode=teft --deliver=innocent,spam --feature=chained,noise -d %u -%%POSTFIX_MBC%% And don't forget to set -%%POSTFIX_MBC%% %%PREFIX%%/etc/dspam/untrusted.mailer_args -%%POSTFIX_MBC%% (for mail.local it could be /usr/libexec/mail.local -s %u) -%%POSTFIX_MBC%% - Note that man entries have been added for all dspam binaries. %%MYSQL%% %%MYSQL%% See %%EXAMPLESDIR%%/mysql/README -%%MYSQL%% for instructions on how to configure MySQL -%%MYSQL%% for use with DSPAM. +%%MYSQL%% for instructions on how to configure DSPAM - MySQL interaction. %%MYSQL%% -%%MYSQL%% %%EXAMPLESDIR%%/mysql/mysql.data -%%MYSQL%% contains an example configuration for use with MySQL. -%%MYSQL%% Edit and install as -%%MYSQL%% %%PREFIX%%/etc/dspam/mysql.data -%%MYSQL%% To modify an 2.x database use and use it with dspam 3.x use: +%%MYSQL%% BACKUP FIRST !!! +%%MYSQL%% +%%MYSQL%% To modify a 2.x database use and use it with dspam 3.x use: %%MYSQL%% %%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql +%%MYSQL%% To modify a 3.1.0 *mysql4.0* use : +%%MYSQL%% %%EXAMPLESDIR%%/mysql/310_to_320.my.sql %%MYSQL%% %%PGSQL%% %%PGSQL%% See %%EXAMPLESDIR%%/pgsql/README %%PGSQL%% for instructions on how to configure PostrgreSQL %%PGSQL%% for use with DSPAM. -%%PGSQL%% [ To add a nice tutorial on this ] -%%PGSQL%% [ To add a nice turorial on converting a MySQL DB ] -%%PGSQL%% %%EXAMPLESDIR%%/pgsql.data -%%PGSQL%% contains an example configuration for use with PostgreSQL. -%%PGSQL%% Edit and install as -%%PGSQL%% %%PREFIX%%/etc/dspam/pgsql.data %%PGSQL%% %%SQLITE%% %%SQLITE%% See %%EXAMPLESDIR%%/sqlite/README %%SQLITE%% for suggestion on SQLite back-end. It should work out-of-the-box. %%SQLITE%% %%SQLITE%% You'll always want to run dspam_clean -p0 and -%%SQLITE%% sqlite /path/to/user.sdb < vacuum after a corpusfeed. -%%SQLITE%% where /path/to/user.sdb would by on a default install: -%%SQLITE%% %%LOCALBASE%%/etc/dspam/data/user/user.sdb +%%SQLITE%% sqlite %%DSPAM_HOME%%/data/user/user.sdb < vacuum +%%SQLITE%% after a corpusfeed. %%SQLITE%% There are most likely 70%+ junk tokens that need to be removed. %%SQLITE%% This will have a HUGE impact on the disk space your db uses. %%SQLITE%% %%CGI%% -%%CGI%% The GCI files had been installed in +%%CGI%% The CGI files had been installed in %%CGI%% %%CGI_PATH%% %%CGI%% Copy %%CGI%% %%CGI_PATH%%/default.prefs.sample %%CGI%% to %%CGI%% %%CGI_PATH%%/default.prefs -%%CGI%% and edit it to your needs. +%%CGI%% and edit it to your needs. +%%CGI%% Copy +%%CGI%% %%CGI_PATH%%/configure.pl.sample +%%CGI%% to +%%CGI%% %%CGI_PATH%%/configure.pl +%%CGI%% and edit it to your needs. %%CGI%% If you symlink this file in %%DSPAM_HOME%%/ %%CGI%% an administrator can edit these options in the DSPAM Admin Suite. %%CGI%% Define administrators by copying @@ -66,23 +57,38 @@ %%CGI%% and edit the file to your needs. %%CGI%% See %%DOCSDIR%%/README %%CGI%% especially the CGI and Trusted Users sections for more info. +%%CGI%% If you have problems (after upgrading) check permissions. See %%DOCSDIR%%/RELEASE.NOTES - for new things in this 3.1.0 and - %%DOCSDIR%%/CHANGES - for the full list from 3.0.0 stable. + for new things in this %%PKGNAME%% and + %%DOCSDIR%%/CHANGELOG + for the full list of changes. Preference extensions are NOT yet integrated in this port, feel free to test and send patches. ***************************** WARNING: *************************************** - Command-line options (and MySQL database structure) has changed. - If you are upgrading from 2.x be sure to change the way you are calling - dspam binary (for delivery, submitting fp, etc.), otherwise mail - will go to the bit-bucket with NO WARNING. + Almost everything regarding how dspam must be configured has changed. + If you are upgrading from 2.x or 3.x be sure to read + %%DOCSDIR%%/UPDATING ****************************************************************************** - ------------ Version 3.1.0 is a DEVELOPMENT release. ------------ - All problems should be reported to the maintainer of the port - and dspam development mailing list + ---- %%PKGNAME%% is considered to be a DEVELOPMENT release. --- + Reporting problems, asking questions: + - small typos, etc. to the maintainer + - FreeBSD specific port-related problems/questions: ports@, maintainer cc'ed + - FreeBSD specific patches, doc enhancements: send-pr maintainer cc'ed + - dspam specific questions: dspam mailling list (maintainer cc'ed if you like) + - dspam specific patches: dspam/dspam-dev mailling list (maintainer cc'ed if you like) + Please be sure to include in your email/pr relevant information such as: + uname -a, dspam --version, /var/db/ports/dspam-devel/options, MTA setup. + If needed rebuild WITH_DEBUG and to turn on debugging see DebugOpt in dsapm.conf + + Please send unified diff's (diff -u). + + If you don't want to see in your maillog : + "query error: verbose debug INFO ONLY: see sql.errors for more details" + please recompile withOUT verbose debug; those who will report this "error" will + be sent to spen their night in a room with a cardassian, a klingonian and a romulan. + -- Thanks for making both our lives easier. ------------------------------------------------------------------------------ diff --git a/mail/dspam-devel/pkg-plist b/mail/dspam-devel/pkg-plist index e4b6d25179ad..6ef342d0fff3 100644 --- a/mail/dspam-devel/pkg-plist +++ b/mail/dspam-devel/pkg-plist @@ -8,7 +8,9 @@ bin/dspam_dump bin/dspam_genaliases bin/dspam_merge bin/dspam_stats +etc/dspam.conf.sample include/dspam/buffer.h +include/dspam/config.h include/dspam/decode.h include/dspam/error.h include/dspam/lht.h @@ -16,26 +18,37 @@ include/dspam/libdspam.h include/dspam/libdspam_objects.h include/dspam/nodetree.h include/dspam/storage_driver.h +include/dspam/tbt.h lib/libdspam.a lib/libdspam.so -lib/libdspam.so.5 +lib/libdspam.so.6 libdata/pkgconfig/dspam.pc %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES +%%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD +%%PORTDOCS%%%%DOCSDIR%%/README.courier +%%PORTDOCS%%%%DOCSDIR%%/README.exim +%%PORTDOCS%%%%DOCSDIR%%/README.pop3filter +%%PORTDOCS%%%%DOCSDIR%%/README.postfix +%%PORTDOCS%%%%DOCSDIR%%/README.qmail +%%PORTDOCS%%%%DOCSDIR%%/README.sendmail +%%PORTDOCS%%%%DOCSDIR%%/UPDATING %%PORTDOCS%%@dirrm %%DOCSDIR%% %%MYSQL%%%%EXAMPLESDIR%%/mysql/2x_to_3x_db.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql/310_to_320.my.sql %%MYSQL%%%%EXAMPLESDIR%%/mysql/README -%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql.data -%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.space.optimized -%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects.sql.speed.optimized +%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-4.1.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-space.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql/mysql_objects-speed.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql/neural.sql +%%MYSQL%%%%EXAMPLESDIR%%/mysql/purge-4.1.sql %%MYSQL%%%%EXAMPLESDIR%%/mysql/purge.sql %%MYSQL%%%%EXAMPLESDIR%%/mysql/virtual_users.sql %%MYSQL%%@dirrm %%EXAMPLESDIR%%/mysql %%MYSQL%%@dirrm %%EXAMPLESDIR%% %%PGSQL%%%%EXAMPLESDIR%%/pgsql/README -%%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql.data %%PGSQL%%%%EXAMPLESDIR%%/pgsql/pgsql_objects.sql %%PGSQL%%%%EXAMPLESDIR%%/pgsql/purge.sql %%PGSQL%%%%EXAMPLESDIR%%/pgsql/virtual_users.sql @@ -49,11 +62,11 @@ libdata/pkgconfig/dspam.pc %%CGI%%www/vhosts/dspam/admin.cgi %%CGI%%www/vhosts/dspam/admingraph.cgi %%CGI%%www/vhosts/dspam/base.css -%%CGI%%www/vhosts/dspam/configure.pl +%%CGI%%www/vhosts/dspam/configure.pl.sample %%CGI%%www/vhosts/dspam/default.prefs.sample %%CGI%%www/vhosts/dspam/dspam.cgi %%CGI%%www/vhosts/dspam/graph.cgi -%%CGI%%www/vhosts/dspam/logo.gif +%%CGI%%www/vhosts/dspam/dspam-logo-small.gif %%CGI%%www/vhosts/dspam/rgb.txt %%CGI%%www/vhosts/dspam/templates/nav_admin_error.html %%CGI%%www/vhosts/dspam/templates/nav_admin_preferences.html @@ -72,5 +85,11 @@ libdata/pkgconfig/dspam.pc %%CGI%%@dirrm www/vhosts %%CGI%%@unexec rmdir %D/www 2>/dev/null || true @dirrm include/dspam -@dirrm etc/dspam +@unexec rmdir %D/lib/pkgconfig 2>/dev/null || true @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true +@cwd %%DSPAM_HOME%% +firstrun.txt.sample +firstspam.txt.sample +quarantinefull.txt.sample +@cwd / +@dirrm %%DSPAM_HOME%% |