[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-3-12-g0fd8e2f

[Julien Valroff]

The following commit has been merged in the master branch:
commit 0fd8e2f2b3d773f9eab36adde620b21f90e5aba8
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Dec 4 08:54:04 2011 +0100

    Fix patch

diff --git a/debian/patches/005_dspam-notify.diff b/debian/patches/005_dspam-notify.diff
index c8e4be3..c18aca8 100644
--- a/debian/patches/005_dspam-notify.diff
+++ b/debian/patches/005_dspam-notify.diff
@@ -4,14 +4,9 @@ Forwarded: not-needed
 
 --- /dev/null
 +++ b/src/tools/dspam_notify.conf
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,29 @@
 +#!/usr/bin/perl
 +
-+# 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_EMAIL = 'dspam at example.org';
 +$FROM_NAME = 'DSPAM Filter';
@@ -41,7 +36,7 @@ Forwarded: not-needed
 +1;
 --- a/src/tools/dspam_notify.in
 +++ b/src/tools/dspam_notify.in
-@@ -4,35 +4,10 @@
+@@ -4,35 +4,15 @@
  
  use Net::SMTP;
  
@@ -62,7 +57,11 @@ Forwarded: not-needed
 -
 -# Quarantine URL
 -$DSPAM_URL = 'https://dspam.example.org';
--
++if (!(-e "/etc/dspam/dspam_notify.conf") || !(-r "/etc/dspam/dspam_notify.conf")) {
++  die("Missing configuration file: /etc/dspam/dspam_notify.conf");
++}
++require "/etc/dspam/dspam_notify.conf";
+
 -# Maximum of entries to show in mail
 -$MAX_ITEMS = 200;
 -
@@ -74,10 +73,10 @@ Forwarded: not-needed
 -
 -# Enable User Preference Checking (Very CPU Intensive!!!) Not Recommended for more than 500 email accounts.
 -$PREF_CHECK = 0;
-+if (!(-e "/etc/dspam/dspam_notify.conf") || !(-r "/etc/dspam/dspam_notify.conf")) {
-+  die("Missing configuration file: /etc/dspam/dspam_notify.conf");
-+}
-+require "/etc/dspam/dspam_notify.conf";
++# Enter the location of you dspam.conf, dspam binary and path to dspam_admin/dspam_stats.
++$DSPAMCONF = '/etc/dspam/dspam.conf';
++$DSPAM_BINARY = '/usr/bin/dspam';
++$BINDIR = '/usr/bin';
  
  ######################################
  # No need to config below this point.#

-- 
Debian packages for the DSPAM anti-spam filter