[pkg-dspam-commits] r93 - trunk/debian/patches

[Matthijs Mohlmann]

Author: active2-guest
Date: Sun May 21 12:35:45 2006
New Revision: 93

Modified:
   trunk/debian/patches/dspam-webfrontend-config-debian.dpatch

Log:
 * Updated patch, previous caused an Internal Server error in apache.


Modified: trunk/debian/patches/dspam-webfrontend-config-debian.dpatch
==============================================================================
--- trunk/debian/patches/dspam-webfrontend-config-debian.dpatch	(original)
+++ trunk/debian/patches/dspam-webfrontend-config-debian.dpatch	Sun May 21 12:35:45 2006
@@ -8,7 +8,7 @@
 @DPATCH@
 diff -urNad dspam-3.6.6~/webui/cgi-bin/admin.cgi dspam-3.6.6/webui/cgi-bin/admin.cgi
 --- dspam-3.6.6~/webui/cgi-bin/admin.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/admin.cgi	2006-05-19 19:11:22.046834208 +0200
++++ dspam-3.6.6/webui/cgi-bin/admin.cgi	2006-05-21 14:34:16.330489760 +0200
 @@ -24,7 +24,7 @@
  require "ctime.pl";
  
@@ -66,7 +66,7 @@
      if (! -e $FILE) {
 diff -urNad dspam-3.6.6~/webui/cgi-bin/admingraph.cgi dspam-3.6.6/webui/cgi-bin/admingraph.cgi
 --- dspam-3.6.6~/webui/cgi-bin/admingraph.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/admingraph.cgi	2006-05-19 19:11:22.046834208 +0200
++++ dspam-3.6.6/webui/cgi-bin/admingraph.cgi	2006-05-21 14:34:16.330489760 +0200
 @@ -24,11 +24,11 @@
  use vars qw { %CONFIG %FORM @spam @nonspam @period @data @inoc @sm @fp @wh };
  
@@ -83,7 +83,7 @@
    my($spam, $nonspam, $sm, $fp, $inoc, $wh, $period) = split(/\_/, $FORM{'data'});
 diff -urNad dspam-3.6.6~/webui/cgi-bin/configure.pl.in dspam-3.6.6/webui/cgi-bin/configure.pl.in
 --- dspam-3.6.6~/webui/cgi-bin/configure.pl.in	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/configure.pl.in	2006-05-19 19:12:46.702964520 +0200
++++ dspam-3.6.6/webui/cgi-bin/configure.pl.in	2006-05-21 14:34:16.331489608 +0200
 @@ -29,11 +29,11 @@
  $CONFIG{'DSPAM_STATS'}	= $CONFIG{'DSPAM_BIN'} . "/dspam_stats";
  $CONFIG{'DSPAM_ARGS'}	= "--deliver=innocent --class=innocent " .
@@ -119,7 +119,7 @@
  
 diff -urNad dspam-3.6.6~/webui/cgi-bin/dspam.cgi dspam-3.6.6/webui/cgi-bin/dspam.cgi
 --- dspam-3.6.6~/webui/cgi-bin/dspam.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/dspam.cgi	2006-05-19 22:11:03.926197736 +0200
++++ dspam-3.6.6/webui/cgi-bin/dspam.cgi	2006-05-21 14:34:54.714654480 +0200
 @@ -25,7 +25,7 @@
  require "ctime.pl";
  
@@ -138,11 +138,17 @@
    while(<FILE>) {
      chomp;
      if ($_ eq $ENV{'REMOTE_USER'}) {
-@@ -1575,11 +1575,12 @@
-   }
+@@ -1563,6 +1563,7 @@
+   my(%PREFS);
+ 
+   my($FILE) = "$USER.prefs";
++  my($DEFAULT_PREFS) = "/etc/dspam/default.prefs";
+ 
+   if ($CONFIG{'PREFERENCES_EXTENSION'} == 1) {
+     open(PIPE, "$CONFIG{'DSPAM_BIN'}/dspam_admin agg pref " . quotemeta($CURRENT_USER) . "|");
+@@ -1576,10 +1577,10 @@
  
    if (keys(%PREFS) eq "0" || $CONFIG{'PREFERENCES_EXTENSION'} != 1) {
-+    $DEFAULT_PREFS = "/etc/dspam/default.prefs";
  
 -    if (! -e "./default.prefs") {
 +    if (! -e $DEFAULT_PREFS) {
@@ -155,7 +161,7 @@
        my($directive, $value) = split(/\=/);
 diff -urNad dspam-3.6.6~/webui/cgi-bin/graph.cgi dspam-3.6.6/webui/cgi-bin/graph.cgi
 --- dspam-3.6.6~/webui/cgi-bin/graph.cgi	2006-05-13 14:17:31.000000000 +0200
-+++ dspam-3.6.6/webui/cgi-bin/graph.cgi	2006-05-19 19:11:22.052833296 +0200
++++ dspam-3.6.6/webui/cgi-bin/graph.cgi	2006-05-21 14:34:16.333489304 +0200
 @@ -25,11 +25,11 @@
  use vars qw { %CONFIG %FORM @spam_day @nonspam_day @period @data };