Date: Sun, 20 Jun 2004 20:40:44 +0200 (SAST) From: Matthew West <mwest@uct.ac.za> To: FreeBSD-gnats-submit@FreeBSD.org Cc: rob@debank.tv Subject: ports/68154: upgrade ports/mail/dspam from 2.10.6 to 3.0.0 Message-ID: <200406201840.i5KIei7l042890@casper.cs.uct.ac.za> Resent-Message-ID: <200406201850.i5KIoB6M060890@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68154 >Category: ports >Synopsis: upgrade ports/mail/dspam from 2.10.6 to 3.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jun 20 18:50:11 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Matthew West >Release: >Organization: University of Cape Town >Environment: >Description: this patch upgrades ports/mail/dspam from 2.10.6 to 3.0.0 files changed: Makefile, distinfo, pkg-plist files added: files/patch-Makefile.in files removed: files/patch-dspam.c >How-To-Repeat: >Fix: --- dspam.diff begins here --- diff -ruN dspam.orig/Makefile dspam/Makefile --- dspam.orig/Makefile Fri May 14 19:13:04 2004 +++ dspam/Makefile Sun Jun 20 19:32:16 2004 @@ -6,7 +6,7 @@ # PORTNAME= dspam -PORTVERSION= 2.10.6 +PORTVERSION= 3.0.0 CATEGORIES= mail MASTER_SITES= http://www.nuclearelephant.com/projects/dspam/sources/ @@ -15,17 +15,14 @@ OPTIONS= MYSQL "Use MySQL and not db4 as database" off \ MYSQL_COMPRESS "Compress dspam <--> MySQL" off \ - MAILDROP "Use Maildrop as local delivery agent" off \ - PROCMAIL "Use Procmail as local delivery agent" off \ - SENDMAIL_LDA "Use Sendmail as local delivery agent" off \ + MAILDROP "Use Maildrop as delivery agent" off \ + PROCMAIL "Use Procmail as delivery agent" off \ + SENDMAIL_LDA "Use Sendmail as delivery agent" off \ SENDMAIL "Play nice with sendmail server" off \ QMAIL "Play nice with Qmail mail server" off \ - ENABLE_SPAM_DELIVERY "Deliver messages marked as spam" off \ SIGNATURE_HEADERS "Put signatures in the header" off \ - WHITELIST "Automatic whitelisting of ham" off \ OPT_IN "Enable opt in" off \ TRUSTED_USERS "Disable trusted user security" off \ - TUM "Enables TuM (Train until Mature)" off \ ALT_BAYESIAN "Enable alternative-bayesian" on \ NO_BIAS "Disable bias" off \ VIRT_USERS "Enable virtual users (needs MYSQL)" off \ @@ -45,6 +42,8 @@ WITH_SIGNATURE_LIFE?= 28 +MAN1= dspam.1 dspam_stats.1 dspam_corpus.1 dspam_clean.1 dspam_dump.1 dspam_merge.1 + .include <bsd.port.pre.mk> .if defined(WITH_MYSQL) @@ -67,27 +66,27 @@ CONFIGURE_ARGS+= --enable-client-compression .endif -.if defined(DSPAM_USERDIR) -CONFIGURE_ARGS+=--with-userdir=${DSPAM_USERDIR} +.if defined(DSPAM_HOME) +CONFIGURE_ARGS+=--with-dspam-home=${DSPAM_HOME} .else -CONFIGURE_ARGS+=--with-userdir=${PREFIX}/etc/dspam +CONFIGURE_ARGS+=--with-dspam-home=${PREFIX}/etc/dspam .endif .if defined(WITH_MAILDROP) RUN_DEPENDS+= maildrop:${PORTSDIR}/mail/maildrop -CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/bin/maildrop $u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/maildrop $u' .endif .if defined(WITH_PROCMAIL) RUN_DEPENDS+= procmail:${PORTSDIR}/mail/procmail -CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/bin/procmail $u' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/bin/procmail $u' .endif .if defined(WITH_SENDMAIL_LDA) && exists(/usr/sbin/sendmail) -CONFIGURE_ARGS+= --with-local-delivery-agent=/usr/sbin/sendmail +CONFIGURE_ARGS+= --with-delivery-agent=/usr/sbin/sendmail .else .if defined(WITH_SENDMAIL_LDA) && exists(${LOCALBASE}/sbin/sendmail) -CONFIGURE_ARGS+= --with-local-delivery-agent='${LOCALBASE}/sbin/sendmail' +CONFIGURE_ARGS+= --with-delivery-agent='${LOCALBASE}/sbin/sendmail' .endif .endif @@ -103,18 +102,10 @@ CONFIGURE_ARGS+= --with-signature-life=${WITH_SIGNATURE_LIFE} .endif -.if defined(WITH_ENABLE_SPAM_DELIVERY) -CONFIGURE_ARGS+= --enable-spam-delivery -.endif - .if defined(WITH_SIGNATURE_HEADERS) CONFIGURE_ARGS+= --enable-signature-headers .endif -.if defined(WITH_WHITELIST) -CONFIGURE_ARGS+= --enable-whitelist -.endif - .if defined(WITH_OPT_IN) CONFIGURE_ARGS+= --enable-opt-in .endif @@ -123,10 +114,6 @@ CONFIGURE_ARGS+= --disable-trusted-user-security .endif -.if defined(WITH_TUM) -CONFIGURE_ARGS+= --enable-tum -.endif - .if defined(WITH_ALT_BAYESIAN) CONFIGURE_ARGS+= --enable-alternative-bayesian .endif @@ -147,7 +134,7 @@ CONFIGURE_ARGS+= --enable-verbose-debug .endif -DOCS= CHANGE README +DOCS= CHANGELOG README RELEASE.NOTES LICENSE post-patch: @${REINPLACE_CMD} -e 's|%%LIBTOOLFLAGS%%|${LIBTOOLFLAGS}|g ; \ @@ -155,11 +142,11 @@ pre-configure: .if defined(WITH_MAILDROP) && (defined(WITH_PROCMAIL) || defined(WITH_SENDMAIL_LDA)) - @${ECHO_CMD} "You can only use one local delivery agent at once." + @${ECHO_CMD} "You can only use one delivery agent at once." @${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." + @${ECHO_CMD} "You can only use one delivery agent at once." @${FALSE} .endif .if !defined(WITH_MYSQL) && (defined(WITH_MYSQL_COMPRESS) || defined(WITH_VIRT_USERS)) diff -ruN dspam.orig/distinfo dspam/distinfo --- dspam.orig/distinfo Wed May 5 18:40:51 2004 +++ dspam/distinfo Sat Jun 19 23:14:54 2004 @@ -1,2 +1,2 @@ -MD5 (dspam-2.10.6.tar.gz) = ddb40d26cc923d7569d48b3072e61715 -SIZE (dspam-2.10.6.tar.gz) = 485466 +MD5 (dspam-3.0.0.tar.gz) = f5b568e8fea50faaf4c1fcabee177934 +SIZE (dspam-3.0.0.tar.gz) = 575382 diff -ruN dspam.orig/files/patch-Makefile.in dspam/files/patch-Makefile.in --- dspam.orig/files/patch-Makefile.in Thu Jan 1 02:00:00 1970 +++ dspam/files/patch-Makefile.in Sun Jun 20 20:34:29 2004 @@ -0,0 +1,11 @@ +--- Makefile.in~ Mon Jun 14 16:25:43 2004 ++++ Makefile.in Sun Jun 20 20:34:05 2004 +@@ -240,7 +240,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 -ruN dspam.orig/files/patch-dspam.c dspam/files/patch-dspam.c --- dspam.orig/files/patch-dspam.c Tue May 4 20:43:30 2004 +++ dspam/files/patch-dspam.c Thu Jan 1 02:00:00 1970 @@ -1,17 +0,0 @@ ---- dspam.c.orig Fri Apr 2 18:34:35 2004 -+++ dspam.c Mon Apr 26 23:59:03 2004 -@@ -2422,12 +2422,12 @@ - i++; - } - } -- arg = strsep (&margs, " "); -- -+ - if (arg != NULL) { - strlcat (args, a, sizeof(args)); - strlcat (args, " ", sizeof (args)); - } -+ arg = strsep (&margs, " "); - } - free (mmargs); - diff -ruN dspam.orig/pkg-plist dspam/pkg-plist --- dspam.orig/pkg-plist Wed May 5 18:40:51 2004 +++ dspam/pkg-plist Sun Jun 20 20:33:26 2004 @@ -1,22 +1,29 @@ @comment $FreeBSD: ports/mail/dspam/pkg-plist,v 1.8 2004/05/04 18:43:30 pav Exp $ bin/dspam -bin/dspam_2mysql -bin/dspam_dump +bin/dspam_2sql bin/dspam_clean bin/dspam_corpus bin/dspam_crc +bin/dspam_dump bin/dspam_genaliases bin/dspam_merge -bin/dspam_ngstats -%%DB4%%bin/dspam_purge -%%DB4%%bin/dspam_purge.libdb4 bin/dspam_stats -%%DB4%%bin/libdb4_purge -lib/libdspam.so -lib/libdspam.so.4 +include/dspam/buffer.h +include/dspam/decode.h +include/dspam/error.h +include/dspam/lht.h +include/dspam/libdspam.h +include/dspam/libdspam_objects.h +include/dspam/nodetree.h +include/dspam/storage_driver.h lib/libdspam.a +lib/libdspam.so +lib/libdspam.so.5 +libdata/pkgconfig/dspam.pc %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/CHANGE +%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG +%%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES +%%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%@dirrm %%DOCSDIR%% %%MYSQL%%%%EXAMPLESDIR%%/README %%MYSQL%%%%EXAMPLESDIR%%/mysql.data --- dspam.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406201840.i5KIei7l042890>