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

Sun Jan 3 17:32:27 UTC 2010

Author: julien-guest
Date: Sun Jan  3 17:32:27 2010
New Revision: 228

Log:
Updated for current git

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff

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

--- branches/experimental/debian/changelog	Sun Jan  3 15:54:40 2010	(r227)
+++ branches/experimental/debian/changelog	Sun Jan  3 17:32:27 2010	(r228)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2+git20091231-1) experimental; urgency=low
+dspam (3.9.0~rc2+git20100103-1) stable; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.
@@ -74,7 +74,7 @@
   * Converted source package to 3.0 (quilt) format
   * Add dependency to libhtml-parser-perl for the webfrontend
 
- -- Julien Valroff <julien at kirya.net>  Sun, 03 Jan 2010 16:53:28 +0100
+ -- Julien Valroff <julien at kirya.net>  Sun, 03 Jan 2010 16:56:14 +0100
 
 dspam (3.6.8-9.3) unstable; urgency=low
 

Modified: branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff
==============================================================================
--- branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Jan  3 15:54:40 2010	(r227)
+++ branches/experimental/debian/patches/002_dspam-webfrontend-config-debian.diff	Sun Jan  3 17:32:27 2010	(r228)
@@ -12,8 +12,7 @@
 +if (!(-e "/etc/dspam/webfrontend.conf") || !(-r "/etc/dspam/webfrontend.conf")) {
    &htmlheader;
    print "<html><head><title>Error!</title></head><body bgcolor='white' text='black'><center><h1>";
--  print "Missing file configure.pl";
-+  print "Missing file /etc/dspam/webfrontend.conf";
+   print "Missing file configure.pl";
    print "</h1></center></body></html>\n";
    exit;
  }
@@ -87,7 +86,7 @@
  }
  
 -GD::Graph::colour::read_rgb("rgb.txt"); 
-+GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt"); 
  
  do {
    my($spam, $nonspam, $sm, $fp, $inoc, $wh, $corpus, $virus, $black, $block, $period) = split(/\_/, $FORM{'data'});
@@ -114,8 +113,8 @@
 -$CONFIG{'OPTMODE'}	= "NONE";	# OUT=OptOut IN=OptIn NONE=not selectable
 +$CONFIG{'OPTMODE'}	= "IN";		# OUT=OptOut IN=OptIn NONE=not selectable
  
- # Add customized settings below
- $CONFIG{'LOCAL_DOMAIN'}	= "yourdomain.com";
+ # Full path to TTF font(s) used for legend, x and y labels in Graphs. GD must be compiled
+ # with TTF support if you want to use this feature.
 --- a/webui/cgi-bin/dspam.cgi
 +++ b/webui/cgi-bin/dspam.cgi
 @@ -28,14 +28,14 @@
@@ -141,7 +140,7 @@
  $CONFIG{'ADMIN'} = 0;
  if ($ENV{'REMOTE_USER'} ne "") {
 -  open(FILE, "<./admins");
-+  open(FILE, "/etc/dspam/admins");
++  open(FILE, "</etc/dspam/admins");
    while(<FILE>) {
      chomp;
      if ($_ eq $ENV{'REMOTE_USER'}) {
@@ -150,7 +149,7 @@
  $CONFIG{'SUBADMIN_USERS'} = {};
  if ($ENV{'REMOTE_USER'} ne "" && $CONFIG{'ADMIN'} == 0) {
 -  open(FILE, "<./subadmins");
-+  open(FILE, "/etc/dspam/subadmins");
++  open(FILE, "</etc/dspam/subadmins");
    while(<FILE>) {
      chomp;
      if ($_ !~ /^\s*#/) {
@@ -200,7 +199,7 @@
  }
  
 -GD::Graph::colour::read_rgb("rgb.txt"); 
-+GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt");
++GD::Graph::colour::read_rgb("/etc/dspam/rgb.txt"); 
  
  do {
    my($spam, $nonspam, $period) = split(/\_/, $FORM{'data'});

