diff options
author | xtraeme <xtraeme> | 2004-10-22 05:43:28 +0000 |
---|---|---|
committer | xtraeme <xtraeme> | 2004-10-22 05:43:28 +0000 |
commit | 1fb9d46b7dc5bf3bafd835f719dcb2bacb70020a (patch) | |
tree | 41eeaea075a031107457cf3001c7c66af64169ad /mail/dspam | |
parent | 5e0d0c0e77681be870ed4ec13b81a17adb027afb (diff) | |
download | pkgsrc-1fb9d46b7dc5bf3bafd835f719dcb2bacb70020a.tar.gz |
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 (limited to 'mail/dspam')
-rw-r--r-- | mail/dspam/Makefile | 53 | ||||
-rw-r--r-- | mail/dspam/PLIST | 33 | ||||
-rw-r--r-- | mail/dspam/distinfo | 8 | ||||
-rw-r--r-- | mail/dspam/options.mk | 148 | ||||
-rw-r--r-- | mail/dspam/patches/patch-aa | 37 |
5 files changed, 135 insertions, 144 deletions
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 0d2a730ffb5..a99a7674ea2 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -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_LIBTOOL= yes 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_SIGNATURE_LIFE?= 14 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 @@ CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \ 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 --git a/mail/dspam/PLIST b/mail/dspam/PLIST index 80c3bca3df5..e0650c9873d 100644 --- a/mail/dspam/PLIST +++ b/mail/dspam/PLIST @@ -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_corpus.1 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_preferences.html 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 --git a/mail/dspam/distinfo b/mail/dspam/distinfo index add6d85edd3..36dc5ab974b 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -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 --git a/mail/dspam/options.mk b/mail/dspam/options.mk index af3fa1658b4..ed0d4165d90 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -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 @@ PKG_SUPPORTED_OPTIONS= compress dotfiles graphs largescale \ 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) +DSPAM_DELIVERY_AGENT_BIN?= ${LOCALBASE}/bin/maildrop BUILD_DEPENDS+= maildrop-[0-9]*:../../mail/maildrop -CONFIGURE_ARGS+= --with-delivery-agent="${LOCALBASE}/bin/maildrop" +CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .elif !empty(DSPAM_DELIVERY_AGENT) -CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT:Q} +DSPAM_DELIVERY_AGENT_BIN?= ${DSPAM_DELIVERY_AGENT} +CONFIGURE_ARGS+= --with-delivery-agent=${DSPAM_DELIVERY_AGENT_BIN:Q} .else PKG_FAIL_REASON+= "${PKGBASE}: unknown delivery agent \`${DSPAM_DELIVERY_AGENT}'" .endif @@ -65,51 +40,74 @@ 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 -### Default: bdb +### Possible: mysql, pgsql, bdb or sqlite +### Default: sqlite ### -DSPAM_STORAGE_DRIVER?= bdb +DSPAM_STORAGE_DRIVER?= sqlite BUILD_DEFS+= DSPAM_STORAGE_DRIVER -MYSQL_PLIST_SUBST= MYSQL="@comment " -PGSQL_PLIST_SUBST= PGSQL="@comment " -.if empty(DSPAM_STORAGE_DRIVER:Mmysql) -PKG_OPTIONS:= ${PKG_OPTIONS:Ncompress} -.endif .if empty(DSPAM_STORAGE_DRIVER:Mmysql) && empty(DSPAM_STORAGE_DRIVER:Mpgsql) PKG_OPTIONS:= ${PKG_OPTIONS:Nvirtualusers} .endif .if !empty(DSPAM_STORAGE_DRIVER:Mmysql) -. if !empty(PKG_OPTIONS:Mcompress) -CONFIGURE_ARGS+= --enable-client-compression -. endif . include "../../databases/mysql4-client/buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=mysql_drv CONFIGURE_ARGS+= \ --with-mysql-includes=${BUILDLINK_PREFIX.mysql-client}/include/mysql \ --with-mysql-libraries=${BUILDLINK_PREFIX.mysql-client}/lib -MYSQL_PLIST_SUBST= MYSQL="" +MYSQL_PLIST_SUBST= MYSQL= .elif !empty(DSPAM_STORAGE_DRIVER:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=pgsql_drv CONFIGURE_ARGS+= \ --with-pgsql-includes=${PGSQL_PREFIX}/include/postgresql \ --with-pgsql-libraries=${PGSQL_PREFIX}/lib -PGSQL_PLIST_SUBST= PGSQL="" +PGSQL_PLIST_SUBST= PGSQL= .elif !empty(DSPAM_STORAGE_DRIVER:Mbdb) BDB_ACCEPTED= db4 db3 . include "../../mk/bdb.buildlink3.mk" CONFIGURE_ARGS+= --with-storage-driver=lib${BDB_TYPE}_drv +.elif !empty(DSPAM_STORAGE_DRIVER:Msqlite) +. include "../../databases/sqlite/buildlink3.mk" +CONFIGURE_ARGS+= --with-storage-driver=sqlite_drv +SQLITE_PLIST_SUBST= SQLITE= .else PKG_FAIL_REASON+= "${PKGBASE}: unknown storage driver \`${DSPAM_STORAGE_DRIVER}\'" .endif + +MYSQL_PLIST_SUBST?= MYSQL="@comment " +PGSQL_PLIST_SUBST?= PGSQL="@comment " +SQLITE_PLIST_SUBST?= SQLITE="@comment " + PLIST_SUBST+= ${MYSQL_PLIST_SUBST} PLIST_SUBST+= ${PGSQL_PLIST_SUBST} +PLIST_SUBST+= ${SQLITE_PLIST_SUBST} + +### +### Only available for mysql and pgsql backends. +### +.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) || !empty(DSPAM_STORAGE_DRIVER:Mpgsql) +PKG_SUPPORTED_OPTIONS+= preferences-extension virtualusers +.endif + +# Used to store user prefernces in the backend instead of flat files +# (built-in method) +.if !empty(PKG_OPTIONS:Mpreferences-extension) +CONFIGURE_ARGS+= --enable-preferences-extension +.endif + +### +### Tells DSPAM to create virtual user ids. Use this if your users are +### not system users. +### +.if !empty(PKG_OPTIONS:Mvirtualusers) +CONFIGURE_ARGS+= --enable-virtual-users +.endif ### ### Use of home directory dot file for opt-in/opt-out ### -.if !empty(PKG_OPTIONS:Mdotfiles) -CONFIGURE_ARGS+= --enable-homedir-dotfiles +.if !empty(PKG_OPTIONS:Mhomedir) +CONFIGURE_ARGS+= --enable-homedir .endif ### @@ -125,11 +123,12 @@ DEPENDS+= p5-GDGraph3d-[0-9]*:../../graphics/p5-GDGraph3d ### .if !empty(PKG_OPTIONS:Mlargescale) CONFIGURE_ARGS+= --enable-large-scale +SUBST_CLASSES+= large SUBST_STAGE.large= pre-configure SUBST_FILES.large= cgi/dspam.cgi cgi/admin.cgi SUBST_SED.large= \ -e "s|CONFIG{'LARGE_SCALE'}.*=.*0|CONFIG{'LARGE_SCALE'} = 1|" -SUBST_MESSAGE.large= "Enabling large-scale options in DSPAM." +SUBST_MESSAGE.large= "Enabling large-scale option in DSPAM." .endif ### @@ -140,48 +139,21 @@ CONFIGURE_ARGS+= --enable-long-usernames .endif ### -### Store DSPAM signatures as an attachment to the mail. This option -### doesn't work correctly with mail clients, e.g. elm, that quote an -### embedded, forwarded message; it should only be used on networks -### where all clients can properly understand an embedded multipart -### message, e.g. Outlook, Evolution, etc., and forward the attachment -### as an attachment instead of quoted text. +### Support for a domain scale implementation. ### -.if !empty(PKG_OPTIONS:Msig-attachment) -CONFIGURE_ARGS+= --enable-signature-attachments +.if !empty(PKG_OPTIONS:Mdomainscale) +CONFIGURE_ARGS+= --enable-domain-scale .endif ### -### Store DSPAM signatures in the message header of the mail. -### -.if !empty(PKG_OPTIONS:Msig-headers) -CONFIGURE_ARGS+= --enable-signature-headers -.endif - -### -### Prepend "[SPAM]" to the Subject: header of messages classified as spam. -### -.if !empty(PKG_OPTIONS:Mspam-subject) -CONFIGURE_ARGS+= --enable-spam-subject -.endif - +### EXPERIMENTAL: +### Support for neural networking, please take a look at the docs. ### -### Tells DSPAM to create virtual user ids. Use this if your users are -### not system users. -### -.if !empty(PKG_OPTIONS:Mvirtualusers) -CONFIGURE_ARGS+= --enable-virtual-users -.endif - -### -### This option will cause DSPAM to cease all writing of signatures -### and DSPAM headers to the message, and deliver the message in as -### pristine format as possible. DO NOT use this switch unless the -### original message can be presented for retraining with the ORIGINAL -### HEADERS and NO MODIFICATIONS. -### -.if !empty(PKG_OPTIONS:Mwebmail) -CONFIGURE_ARGS+= --enable-webmail +.if !empty(DSPAM_STORAGE_DRIVER:Mmysql) +PKG_SUPPORTED_OPTIONS+= neural +. if !empty(PKG_OPTIONS:Mneural) +CONFIGURE_ARGS+= --enable-neural-networking +. endif .endif ### diff --git a/mail/dspam/patches/patch-aa b/mail/dspam/patches/patch-aa index 24e6a3ccdd7..c648e3949a4 100644 --- a/mail/dspam/patches/patch-aa +++ b/mail/dspam/patches/patch-aa @@ -1,28 +1,13 @@ -$NetBSD: patch-aa,v 1.1 2004/08/09 20:14:21 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2004/10/22 05:43:29 xtraeme Exp $ ---- util.c.orig Mon Jun 7 17:27:49 2004 -+++ util.c -@@ -331,11 +331,13 @@ _ds_prepare_path_for (const char *filena - file_buffer_start = file; - path[0] = 0; +--- Makefile.in.orig 2004-10-22 07:27:16.000000000 +0200 ++++ Makefile.in 2004-10-22 07:27:35.000000000 +0200 +@@ -261,7 +261,7 @@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = dspam.pc + etcdir = $(sysconfdir) +-etc_SCRIPTS = dspam_conf ++etc_SCRIPTS = -+ if (file[0] == '/') -+ strlcat (path, "/", sizeof (path)); - dir = strsep (&file, "/"); -+ - while (dir != NULL) - { - strlcat (path, dir, sizeof (path)); -- strlcat (path, "/", sizeof (path)); - dir = strsep (&file, "/"); - - if (dir != NULL && stat (path, &s)) -@@ -350,6 +352,8 @@ _ds_prepare_path_for (const char *filena - return EFILE; - } - } -+ if (dir != NULL) -+ strlcat (path, "/", sizeof (path)); - } - free (file_buffer_start); - return 0; + # Defaults from dspam.conf + EXTRA_DIST = autogen.sh RELEASE.NOTES CHANGELOG LICENSE example.c \ |