From 7e543105af435d08d084469c6fea37a548605268 Mon Sep 17 00:00:00 2001 From: roy Date: Thu, 6 Dec 2012 10:47:35 +0000 Subject: Update to dspam-3.10.2 with many changes from 3.8.0 Too many changes to note, but this works with PostgreSQL-9.1.5 without spitting out any warnings which is my reason for updating it. A few of prior pkgsrc patches have been merged upstream now. --- mail/dspam/Makefile | 11 ++-- mail/dspam/PLIST | 155 ++++++++++++++++++++++++++++++++++++++++---- mail/dspam/distinfo | 12 ++-- mail/dspam/patches/patch-ad | 59 ++++++++++------- 4 files changed, 187 insertions(+), 50 deletions(-) (limited to 'mail/dspam') diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index 6b4a7c0dde9..07a4c29918c 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.70 2012/10/08 12:19:09 asau Exp $ +# $NetBSD: Makefile,v 1.71 2012/12/06 10:47:35 roy Exp $ -DISTNAME= dspam-3.8.0 -PKGREVISION= 8 +DISTNAME= dspam-3.10.2 CATEGORIES= mail -MASTER_SITES= http://dspam.nuclearelephant.com/sources/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dspam/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dspam.sourceforge.net/ @@ -17,7 +16,11 @@ USE_LIBTOOL= yes USE_TOOLS+= pax perl:run pkg-config REPLACE_PERL= src/tools/dspam_train.in REPLACE_PERL+= src/tools/dspam_logrotate +REPLACE_PERL+= src/tools/dspam_notify.in REPLACE_PERL+= webui/cgi-bin/*.cgi webui/cgi-bin/configure.pl.in +REPLACE_PERL+= webui/cgi-bin/htmlize.pl +REPLACE_PERL+= webui/cgi-bin/templates/strings.pl +REPLACE_PERL+= webui/cgi-bin/templates/*/strings.pl PKGCONFIG_OVERRIDE+= src/dspam.pc.in diff --git a/mail/dspam/PLIST b/mail/dspam/PLIST index 212b2a13d60..bebffe838e6 100644 --- a/mail/dspam/PLIST +++ b/mail/dspam/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2009/06/14 18:04:31 joerg Exp $ +@comment $NetBSD: PLIST,v 1.20 2012/12/06 10:47:35 roy Exp $ ${PLIST.hash}bin/cssstat ${PLIST.hash}bin/csscompress ${PLIST.hash}bin/cssclean @@ -11,6 +11,7 @@ bin/dspam_crc bin/dspam_dump bin/dspam_logrotate bin/dspam_merge +bin/dspam_notify bin/dspam_stats bin/dspam_train bin/dspamc @@ -22,22 +23,27 @@ include/dspam/decode.h include/dspam/diction.h include/dspam/error.h include/dspam/heap.h -include/dspam/ldap_client.h include/dspam/libdspam.h include/dspam/libdspam_objects.h include/dspam/nodetree.h +include/dspam/pref.h +include/dspam/read_config.h include/dspam/storage_driver.h include/dspam/tokenizer.h lib/libdspam.la lib/pkgconfig/dspam.pc man/man1/dspam.1 +man/man1/dspam_admin.1 man/man1/dspam_clean.1 +man/man1/dspam_crc.1 man/man1/dspam_dump.1 +man/man1/dspam_logrotate.1 man/man1/dspam_merge.1 man/man1/dspam_stats.1 man/man1/dspam_train.1 man/man3/dspam_addattribute.3 man/man3/dspam_attach.3 +man/man3/dspam_clearattributes.3 man/man3/dspam_create.3 man/man3/dspam_destroy.3 man/man3/dspam_detach.3 @@ -49,6 +55,7 @@ share/doc/dspam/README share/doc/dspam/RELEASE.NOTES share/doc/dspam/UPGRADING share/doc/dspam/courier.txt +share/doc/dspam/cssclean.txt share/doc/dspam/exim.txt share/doc/dspam/markov.txt share/doc/dspam/mysql_drv.txt @@ -61,6 +68,19 @@ share/doc/dspam/relay.txt share/doc/dspam/sendmail.txt share/doc/dspam/sqlite_drv.txt share/doc/dspam/tests.txt +${PLIST.mysql}share/dspam/mysql/mysql_objects-4.1.sql +${PLIST.mysql}share/dspam/mysql/mysql_objects-space.sql +${PLIST.mysql}share/dspam/mysql/mysql_objects-speed.sql +${PLIST.mysql}share/dspam/mysql/purge.sql +${PLIST.mysql}share/dspam/mysql/purge-4.1.sql +${PLIST.mysql}share/dspam/mysql/virtual_users.sql +${PLIST.mysql}share/dspam/mysql/virtual_user_aliases.sql +${PLIST.pgsql}share/dspam/pgsql/pgsql_objects.sql +${PLIST.pgsql}share/dspam/pgsql/purge-pe.sql +${PLIST.pgsql}share/dspam/pgsql/purge.sql +${PLIST.pgsql}share/dspam/pgsql/virtual_users.sql +${PLIST.sqlite}share/dspam/sqlite/purge-2.sql +${PLIST.sqlite}share/dspam/sqlite/purge-3.sql share/dspam/txt/firstrun.txt share/dspam/txt/firstspam.txt share/dspam/txt/quarantinefull.txt @@ -68,7 +88,79 @@ share/dspam/webui/cgi-bin/admin.cgi share/dspam/webui/cgi-bin/admingraph.cgi share/dspam/webui/cgi-bin/dspam.cgi share/dspam/webui/cgi-bin/graph.cgi +share/dspam/webui/cgi-bin/htmlize.pl share/dspam/webui/cgi-bin/rgb.txt +share/dspam/webui/cgi-bin/subadmins +share/dspam/webui/cgi-bin/templates/cs/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/cs/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/cs/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/cs/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/cs/nav_alerts.html +share/dspam/webui/cgi-bin/templates/cs/nav_analysis.html +share/dspam/webui/cgi-bin/templates/cs/nav_error.html +share/dspam/webui/cgi-bin/templates/cs/nav_fragment.html +share/dspam/webui/cgi-bin/templates/cs/nav_history.html +share/dspam/webui/cgi-bin/templates/cs/nav_performance.html +share/dspam/webui/cgi-bin/templates/cs/nav_preferences.html +share/dspam/webui/cgi-bin/templates/cs/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/cs/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/cs/strings.pl +share/dspam/webui/cgi-bin/templates/de/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/de/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/de/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/de/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/de/nav_alerts.html +share/dspam/webui/cgi-bin/templates/de/nav_analysis.html +share/dspam/webui/cgi-bin/templates/de/nav_error.html +share/dspam/webui/cgi-bin/templates/de/nav_fragment.html +share/dspam/webui/cgi-bin/templates/de/nav_history.html +share/dspam/webui/cgi-bin/templates/de/nav_performance.html +share/dspam/webui/cgi-bin/templates/de/nav_preferences.html +share/dspam/webui/cgi-bin/templates/de/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/de/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/de/strings.pl +share/dspam/webui/cgi-bin/templates/es-es/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/es-es/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/es-es/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/es-es/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/es-es/nav_alerts.html +share/dspam/webui/cgi-bin/templates/es-es/nav_analysis.html +share/dspam/webui/cgi-bin/templates/es-es/nav_error.html +share/dspam/webui/cgi-bin/templates/es-es/nav_fragment.html +share/dspam/webui/cgi-bin/templates/es-es/nav_history.html +share/dspam/webui/cgi-bin/templates/es-es/nav_performance.html +share/dspam/webui/cgi-bin/templates/es-es/nav_preferences.html +share/dspam/webui/cgi-bin/templates/es-es/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/es-es/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/es-es/strings.pl +share/dspam/webui/cgi-bin/templates/fr/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/fr/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/fr/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/fr/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/fr/nav_alerts.html +share/dspam/webui/cgi-bin/templates/fr/nav_analysis.html +share/dspam/webui/cgi-bin/templates/fr/nav_error.html +share/dspam/webui/cgi-bin/templates/fr/nav_fragment.html +share/dspam/webui/cgi-bin/templates/fr/nav_history.html +share/dspam/webui/cgi-bin/templates/fr/nav_performance.html +share/dspam/webui/cgi-bin/templates/fr/nav_preferences.html +share/dspam/webui/cgi-bin/templates/fr/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/fr/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/fr/strings.pl +share/dspam/webui/cgi-bin/templates/he/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/he/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/he/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/he/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/he/nav_alerts.html +share/dspam/webui/cgi-bin/templates/he/nav_analysis.html +share/dspam/webui/cgi-bin/templates/he/nav_error.html +share/dspam/webui/cgi-bin/templates/he/nav_fragment.html +share/dspam/webui/cgi-bin/templates/he/nav_history.html +share/dspam/webui/cgi-bin/templates/he/nav_performance.html +share/dspam/webui/cgi-bin/templates/he/nav_preferences.html +share/dspam/webui/cgi-bin/templates/he/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/he/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/he/strings.pl share/dspam/webui/cgi-bin/templates/nav_admin_error.html share/dspam/webui/cgi-bin/templates/nav_admin_preferences.html share/dspam/webui/cgi-bin/templates/nav_admin_status.html @@ -82,22 +174,57 @@ share/dspam/webui/cgi-bin/templates/nav_performance.html share/dspam/webui/cgi-bin/templates/nav_preferences.html share/dspam/webui/cgi-bin/templates/nav_quarantine.html share/dspam/webui/cgi-bin/templates/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_alerts.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_analysis.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_error.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_fragment.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_history.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_performance.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_preferences.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/pt-br/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/pt-br/strings.pl +share/dspam/webui/cgi-bin/templates/ro/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/ro/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/ro/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/ro/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/ro/nav_alerts.html +share/dspam/webui/cgi-bin/templates/ro/nav_analysis.html +share/dspam/webui/cgi-bin/templates/ro/nav_error.html +share/dspam/webui/cgi-bin/templates/ro/nav_fragment.html +share/dspam/webui/cgi-bin/templates/ro/nav_history.html +share/dspam/webui/cgi-bin/templates/ro/nav_performance.html +share/dspam/webui/cgi-bin/templates/ro/nav_preferences.html +share/dspam/webui/cgi-bin/templates/ro/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/ro/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/ru/nav_admin_error.html +share/dspam/webui/cgi-bin/templates/ru/nav_admin_preferences.html +share/dspam/webui/cgi-bin/templates/ru/nav_admin_status.html +share/dspam/webui/cgi-bin/templates/ru/nav_admin_user.html +share/dspam/webui/cgi-bin/templates/ru/nav_alerts.html +share/dspam/webui/cgi-bin/templates/ru/nav_analysis.html +share/dspam/webui/cgi-bin/templates/ru/nav_error.html +share/dspam/webui/cgi-bin/templates/ru/nav_fragment.html +share/dspam/webui/cgi-bin/templates/ru/nav_history.html +share/dspam/webui/cgi-bin/templates/ru/nav_performance.html +share/dspam/webui/cgi-bin/templates/ru/nav_preferences.html +share/dspam/webui/cgi-bin/templates/ru/nav_quarantine.html +share/dspam/webui/cgi-bin/templates/ru/nav_viewmessage.html +share/dspam/webui/cgi-bin/templates/ru/strings.pl +share/dspam/webui/cgi-bin/templates/strings.pl share/dspam/webui/htdocs/base.css share/dspam/webui/htdocs/dspam-logo-small.gif -${PLIST.mysql}share/dspam/mysql/mysql_objects-4.1.sql -${PLIST.mysql}share/dspam/mysql/mysql_objects-space.sql -${PLIST.mysql}share/dspam/mysql/mysql_objects-speed.sql -${PLIST.mysql}share/dspam/mysql/purge.sql -${PLIST.mysql}share/dspam/mysql/purge-4.1.sql -${PLIST.mysql}share/dspam/mysql/virtual_users.sql -${PLIST.mysql}share/dspam/mysql/virtual_user_aliases.sql -${PLIST.pgsql}share/dspam/pgsql/pgsql_objects.sql -${PLIST.pgsql}share/dspam/pgsql/purge.sql -${PLIST.pgsql}share/dspam/pgsql/virtual_users.sql -${PLIST.sqlite}share/dspam/sqlite/purge-2.sql -${PLIST.sqlite}share/dspam/sqlite/purge-3.sql +share/dspam/webui/htdocs/dspam.js +share/dspam/webui/htdocs/favicon.ico +share/dspam/webui/htdocs/rtl.css share/examples/dspam/cgi-admins share/examples/dspam/cgi-default.prefs share/examples/dspam/configure.pl share/examples/dspam/dspam.conf share/examples/rc.d/dspam +@pkgdir lib/dspam +@pkgdir etc/dspam diff --git a/mail/dspam/distinfo b/mail/dspam/distinfo index e4b7a7d7c79..5f175255cc0 100644 --- a/mail/dspam/distinfo +++ b/mail/dspam/distinfo @@ -1,10 +1,8 @@ -$NetBSD: distinfo,v 1.33 2010/03/10 13:43:38 martti Exp $ +$NetBSD: distinfo,v 1.34 2012/12/06 10:47:35 roy Exp $ -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 (dspam-3.10.2.tar.gz) = 21133e0ee1880f3e8c849365b7e27a73f6d0413a +RMD160 (dspam-3.10.2.tar.gz) = 7e112981e45e483350b9afc056ebfa4c5561036c +Size (dspam-3.10.2.tar.gz) = 1035054 bytes SHA1 (patch-aa) = ff48b3bb84a13f841ee38115377fcb97d03798c0 -SHA1 (patch-ad) = 581ac7b6e01e68474ecf944be8620212d69900b9 -SHA1 (patch-ae) = 21f450dd67dc2101b44f1a952632b933a3c8a913 +SHA1 (patch-ad) = c1fd04d91528be4da368affc4e8b4dc85d93267c SHA1 (patch-af) = 31c86b3f0cb7d7856e46207bee656472fcd093e0 -SHA1 (patch-ag) = d4b1cf206f8113a1150687e2942bd69f0b9767ee diff --git a/mail/dspam/patches/patch-ad b/mail/dspam/patches/patch-ad index 518a57b9430..43d6a9a5a65 100644 --- a/mail/dspam/patches/patch-ad +++ b/mail/dspam/patches/patch-ad @@ -1,28 +1,28 @@ -$NetBSD: patch-ad,v 1.3 2010/03/10 13:43:38 martti Exp $ +$NetBSD: patch-ad,v 1.4 2012/12/06 10:47:35 roy Exp $ Make this pkgsrc friendly. ---- src/dspam.conf.in.orig 2006-02-15 22:06:35.000000000 +0200 -+++ src/dspam.conf.in 2006-05-05 23:44:16.000000000 +0300 -@@ -24,7 +24,7 @@ +--- src/dspam.conf.in 2012-04-11 19:48:33.000000000 +0100 ++++ src/dspam.conf.in 2012-12-05 16:25:34.000000000 +0000 +@@ -26,7 +26,7 @@ # this option. If you do not wish to lose all of your data, you will need to # migrate it to the new backend before making this change. # --StorageDriver @libdir@/@storage_driver@ -+#StorageDriver @libdir@/@storage_driver@ +-StorageDriver @libdir@/dspam/@storage_driver@ ++#StorageDriver @libdir@/dspam/@storage_driver@ # - # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call -@@ -53,7 +53,7 @@ - # the user DSPAM is processing mail for. This configuration parameter is only + # Trusted Delivery Agent: Specifies the local delivery agent DSPAM should call +@@ -55,7 +55,7 @@ + # the user DSPAM is processing mail for. This configuration parameter is only # necessary if you plan on allowing untrusted processing. # -#UntrustedDeliveryAgent "/usr/bin/procmail -d %u" +#UntrustedDeliveryAgent "@PREFIX@/bin/procmail -d %u" # - # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP -@@ -76,7 +76,7 @@ + # SMTP or LMTP Delivery: Alternatively, you may wish to use SMTP or LMTP +@@ -88,7 +88,7 @@ # a quarantine agent which will be called with all messages DSPAM thinks is # spam. Use %u to specify the user DSPAM is processing mail for. # @@ -31,33 +31,42 @@ Make this pkgsrc friendly. # # DSPAM can optionally process "plused users" (addresses in the user+detail -@@ -264,7 +264,7 @@ +@@ -350,7 +350,7 @@ # Storage driver settings: Specific to a particular storage driver. Uncomment # the configuration specific to your installation, if applicable. # --#MySQLServer /var/lib/mysql/mysql.sock -+#MySQLServer /tmp/mysql.sock - #MySQLPort - #MySQLUser dspam - #MySQLPass changeme -@@ -633,9 +633,9 @@ - # specified. If you want the client machine to perform delivery, use - # the --stdout option in conjunction with a local setup. +-#MySQLServer /var/lib/mysql/mysql.sock ++#MySQLServer /tmp/mysql.sock + #MySQLPort + #MySQLUser dspam + #MySQLPass changeme +@@ -361,7 +361,7 @@ + # If you are using replication for clustering, you can also specify a separate + # server to perform all writes to. # +-#MySQLWriteServer /var/lib/mysql/mysql.sock ++#MySQLWriteServer /tmp/mysql.sock + #MySQLWritePort + #MySQLWriteUser dspam + #MySQLWritePass changeme +@@ -807,9 +807,9 @@ + # interfaces. + # + #ServerHost 127.0.0.1 -#ServerPort 24 +#ServerPort 2400 #ServerQueueSize 32 --#ServerPID /var/run/dspam.pid -+#ServerPID @DSPAM_PIDDIR@/dspam.pid +-#ServerPID /var/run/dspam.pid ++#ServerPID @DSPAM_PIDDIR@/dspam.pid # # ServerMode specifies the type of LMTP server to start. This can be one of: -@@ -689,7 +689,7 @@ +@@ -865,7 +865,7 @@ # If you are a reporting streamlined blackhole list participant, you can # touch ip addresses within the directory the rabl_client process is watching. # -#RABLQueue /var/spool/rabl +#RABLQueue @VARBASE@/spool/rabl - # DataSource: If you are using any type of data source that does not include - # email-like headers (such as documents), uncomment the line below. This + # --- --- + -- cgit v1.2.3