[Pkg-dspam-commits] [pkg-dspam-commits] r262 - in branches/experimental/debian: . patches

Wed Aug 18 10:17:35 UTC 2010

Author: julien-guest
Date: Wed Aug 18 10:17:26 2010
New Revision: 262

Log:
Add dspam_notify tool to the dspam-webfrontend package

Added:
   branches/experimental/debian/dspam-webfrontend.manpages
   branches/experimental/debian/patches/009_dspam-notify.diff
Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/dspam-webfrontend.install
   branches/experimental/debian/dspam-webfrontend.lintian-overrides
   branches/experimental/debian/patches/series
   branches/experimental/debian/rules

Modified: branches/experimental/debian/changelog
==============================================================================

--- branches/experimental/debian/changelog	Sat Aug 14 16:30:23 2010	(r261)
+++ branches/experimental/debian/changelog	Wed Aug 18 10:17:26 2010	(r262)
@@ -1,4 +1,4 @@
-dspam (3.9.1~rc1+git20100814-1) unstable; urgency=low
+dspam (3.9.1~rc1+git20100816-1) stable; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
@@ -86,8 +86,10 @@
   * Make use of dspam_maintenance.sh script instead of homemade purge scripts
   * Only ships SQL files for MySQL >= 4.1 as no older version is available
     in Debian
+  * Add dspam_notify script in dspam-webfrontend to send automatic quarantine
+    email notification
 
- -- Julien Valroff <julien at kirya.net>  Sat, 14 Aug 2010 14:17:40 +0200
+ -- Julien Valroff <julien at kirya.net>  Wed, 18 Aug 2010 07:13:31 +0200
 
 dspam (3.6.8-9.3) unstable; urgency=low
 

Modified: branches/experimental/debian/dspam-webfrontend.install
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.install	Sat Aug 14 16:30:23 2010	(r261)
+++ branches/experimental/debian/dspam-webfrontend.install	Wed Aug 18 10:17:26 2010	(r262)
@@ -1,6 +1,6 @@
-webui/cgi-bin/*.cgi 				var/www/dspam/
-webui/cgi-bin/templates/*.html			etc/dspam/templates/
-webui/cgi-bin/templates/strings.pl		etc/dspam/templates/
+webui/cgi-bin/*.cgi 				var/www/dspam
+webui/cgi-bin/templates/*.html			etc/dspam/templates
+webui/cgi-bin/templates/strings.pl		etc/dspam/templates
 webui/cgi-bin/templates/cs/*.html		etc/dspam/templates/cs
 webui/cgi-bin/templates/cs/strings.pl		etc/dspam/templates/cs
 webui/cgi-bin/templates/de/*.html		etc/dspam/templates/de
@@ -16,11 +16,14 @@
 webui/cgi-bin/templates/ro/*.html		etc/dspam/templates/ro
 webui/cgi-bin/templates/ru/*.html		etc/dspam/templates/ru
 webui/cgi-bin/templates/ru/strings.pl		etc/dspam/templates/ru
-webui/cgi-bin/configure.pl			usr/share/dspam/
-webui/htdocs/base.css 				usr/share/dspam/
-webui/htdocs/dspam.js				usr/share/dspam/
-webui/htdocs/dspam-logo-small.gif		usr/share/dspam/
-webui/cgi-bin/admins 				etc/dspam/
-webui/cgi-bin/subadmins 			etc/dspam/
-webui/cgi-bin/rgb.txt				etc/dspam/
-debian/dspam-apache2.conf			etc/dspam/
+webui/cgi-bin/configure.pl			usr/share/dspam
+webui/htdocs/base.css 				usr/share/dspam
+webui/htdocs/dspam.js				usr/share/dspam
+webui/htdocs/dspam-logo-small.gif		usr/share/dspam
+webui/cgi-bin/admins 				etc/dspam
+webui/cgi-bin/subadmins 			etc/dspam
+webui/cgi-bin/rgb.txt				etc/dspam
+debian/dspam-apache2.conf			etc/dspam
+src/tools/dspam_notify				usr/bin
+src/tools/dspam_notify.conf			etc/dspam
+

Modified: branches/experimental/debian/dspam-webfrontend.lintian-overrides
==============================================================================
--- branches/experimental/debian/dspam-webfrontend.lintian-overrides	Sat Aug 14 16:30:23 2010	(r261)
+++ branches/experimental/debian/dspam-webfrontend.lintian-overrides	Wed Aug 18 10:17:26 2010	(r262)
@@ -4,3 +4,4 @@
 dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/dspam.cgi
 dspam-webfrontend: dir-or-file-in-var-www var/www/dspam/graph.cgi
 dspam-webfrontend: script-not-executable ./usr/share/dspam/configure.pl
+dspam-webfrontend: script-not-executable ./etc/dspam/dspam_notify.conf

Added: branches/experimental/debian/dspam-webfrontend.manpages
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/dspam-webfrontend.manpages	Wed Aug 18 10:17:26 2010	(r262)
@@ -0,0 +1 @@
+debian/manpages/dspam_notify.1

Added: branches/experimental/debian/patches/009_dspam-notify.diff
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/debian/patches/009_dspam-notify.diff	Wed Aug 18 10:17:26 2010	(r262)
@@ -0,0 +1,76 @@
+--- a/src/tools/dspam_notify.in
++++ b/src/tools/dspam_notify.in
+@@ -4,35 +4,17 @@
+ 
+ use Net::SMTP;
+ 
++if (!(-e "/etc/dspam/dspam_notify.conf") || !(-r "/etc/dspam/dspam_notify.conf")) {
++  print "Missing configuration file: /etc/dspam/dspam_notify.conf";
++  exit;
++}
++require "/etc/dspam/dspam_notify.conf";
++
+ # Enter the location of you dspam.conf, dspam binary and path to dspam_admin/dspam_stats.
+ $DSPAMCONF = '@sysconfdir@/dspam.conf';
+ $DSPAM_BINARY = '@bindir@/@dspam_transformed@';
+ $BINDIR = '@bindir@';
+ 
+-# Who will the notifications be sent from?
+-$FROM = 'dspam at domain.tld';
+-  
+-# What will the notification subject be?
+-$SUBJECT = 'Daily Spam Quarantine Summary';
+-
+-# What text to display in the body?
+-$BODY = qq!<p>This report has been sent to you from the Anti-Spam service hosted at ISP.com. Below is a list of items in your quarantine area. You can view or release a message by clicking on the links (right). If you no longer wish to receive these reports then you may change the option on the 'Preferences' page.</p>!;
+-
+-# Quarantine URL
+-$DSPAM_URL = 'https://dspam.domain.tld';
+-
+-# Maximum of entries to show in mail
+-$MAX_ITEMS = 200;
+-
+-# Address of your SMTP server? localhost should be fine.
+-$SERVER = 'localhost';
+-
+-# Port of your SMTP server? 25 should be fine
+-$PORT = '25';
+-
+-# Enable User Preference Checking (Very CPU Intensive!!!) Not Recommended for more than 500 email accounts.
+-$PREF_CHECK = 0;
+-
+ ######################################
+ # No need to config below this point.#
+ ######################################
+--- /dev/null
++++ b/src/tools/dspam_notify.conf
+@@ -0,0 +1,29 @@
++#!/usr/bin/perl
++
++# Who will the notifications be sent from?
++$FROM = 'dspam at localhost';
++
++# What will the notification subject be?
++$SUBJECT = 'Daily Spam Quarantine Summary';
++
++# What text to display in the body?
++$BODY = qq!<p>This report has been sent to you from the Anti-Spam service hosted at ISP.com. Below is a list of items in your quarantine area. You can view or release a message by clicking on the links (right). If you no longer wish to receive these reports then you may change the option on the 'Preferences' page.</p>!
++
++# Quarantine URL
++$DSPAM_URL = 'http://localhost';
++
++# Maximum of entries to show in mail
++$MAX_ITEMS = 200;
++
++# Address of your SMTP server? localhost should be fine.
++$SERVER = 'localhost';
++
++# Port of your SMTP server? 25 should be fine
++$PORT = '25';
++
++# Enable User Preference Checking (Very CPU Intensive!!!) Not Recommended for more than 500 email accounts.
++$PREF_CHECK = 0;
++
++# Configuration was successful
++1;
++

Modified: branches/experimental/debian/patches/series
==============================================================================
--- branches/experimental/debian/patches/series	Sat Aug 14 16:30:23 2010	(r261)
+++ branches/experimental/debian/patches/series	Wed Aug 18 10:17:26 2010	(r262)
@@ -3,4 +3,5 @@
 003_update-dspam.conf.diff
 004_dspam-default.prefs-in_etc.diff
 008_where-to-find-txt-files.diff
+009_dspam-notify.diff
 010_default-daemon-port.diff

Modified: branches/experimental/debian/rules
==============================================================================
--- branches/experimental/debian/rules	Sat Aug 14 16:30:23 2010	(r261)
+++ branches/experimental/debian/rules	Wed Aug 18 10:17:26 2010	(r262)
@@ -129,6 +129,7 @@
 	dh_testroot -i
 	dh_installchangelogs -i CHANGELOG
 	dh_installdocs -i
+	dh_installman -i
 	dh_compress -i -A
 	dh_link -i
 	dh_fixperms -i

