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

[Julien Valroff]

Author: julien-guest
Date: Sat Jan  2 09:25:34 2010
New Revision: 226

Log:
Updated for current git

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff
   branches/experimental/debian/patches/005_background-dspam.diff

Modified: branches/experimental/debian/changelog
==============================================================================
--- branches/experimental/debian/changelog	Wed Dec 30 20:14:45 2009	(r225)
+++ branches/experimental/debian/changelog	Sat Jan  2 09:25:34 2010	(r226)
@@ -1,4 +1,4 @@
-dspam (3.9.0~rc2+git20091228-1) experimental; urgency=low
+dspam (3.9.0~rc2+git20091231-1) experimental; urgency=low
 
   [ Kurt B. Kaiser ]
   * debian/rules: don't use --build config option if host equals target.

Modified: branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff
==============================================================================
--- branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff	Wed Dec 30 20:14:45 2009	(r225)
+++ branches/experimental/debian/patches/004_dspam-default.prefs-in_etc.diff	Sat Jan  2 09:25:34 2010	(r226)
@@ -2,9 +2,26 @@
 Author: Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>
 Forwarded: not-needed
 
+--- a/webui/cgi-bin/admin.cgi
++++ b/webui/cgi-bin/admin.cgi
+@@ -169,14 +169,6 @@
+ 
+   if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
+     $FILE = "/etc/dspam/default.prefs";
+-    if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "/etc/dspam/default.prefs") {
+-      $DATA{'ERROR'} = "<em>WARNING:</em> " .
+-        "These default preferences will not be loaded by DSPAM, but only by ".
+-        " the CGI interface when a user initially sets up their preferences. ".
+-        "To have DSPAM override its configuration with these default ".
+-        "preferences, symlink $CONFIG{'DSPAM_HOME'}/default.prefs to the ".
+-        "default.prefs file in the CGI directory.<BR><BR>";
+-    }
+   } else {
+     $FILE = GetPath($FORM{'username'}) . ".prefs";
+   }
 --- a/src/pref.c
 +++ b/src/pref.c
-@@ -179,7 +179,7 @@
+@@ -181,7 +181,7 @@
    PTX[0] = NULL;
  
    if (user == NULL) {
@@ -13,8 +30,8 @@
    } else {
      _ds_userdir_path (filename, home, user, "prefs");
    }
-@@ -307,7 +307,7 @@
-   FILE *out_file;
+@@ -311,7 +311,7 @@
+   ignore = ignore; /* Keep compiler happy */
  
    if (username == NULL) {
 -    snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
@@ -22,8 +39,8 @@
    } else {
      _ds_userdir_path (filename, home, username, "prefs");
    }
-@@ -334,7 +334,7 @@
-   int nlines; 
+@@ -340,7 +340,7 @@
+   ignore = ignore; /* Keep compiler happy */
  
    if (username == NULL) {
 -    snprintf(filename, MAX_FILENAME_LENGTH, "%s/default.prefs", home);
@@ -31,20 +48,3 @@
    } else {
      _ds_userdir_path (filename, home, username, "prefs");
    }
---- a/webui/cgi-bin/admin.cgi
-+++ b/webui/cgi-bin/admin.cgi
-@@ -169,14 +169,6 @@
- 
-   if ($FORM{'username'} eq "" || $FORM{'username'} eq "default") {
-     $FILE = "/etc/dspam/default.prefs";
--    if ($CONFIG{'PREFERENCES_EXTENSION'} != 1 && ! -l "/etc/dspam/default.prefs") {
--      $DATA{'ERROR'} = "<em>WARNING:</em> " .
--        "These default preferences will not be loaded by DSPAM, but only by ".
--        " the CGI interface when a user initially sets up their preferences. ".
--        "To have DSPAM override its configuration with these default ".
--        "preferences, symlink $CONFIG{'DSPAM_HOME'}/default.prefs to the ".
--        "default.prefs file in the CGI directory.<BR><BR>";
--    }
-   } else {
-     $FILE = GetPath($FORM{'username'}) . ".prefs";
-   }

Modified: branches/experimental/debian/patches/005_background-dspam.diff
==============================================================================
--- branches/experimental/debian/patches/005_background-dspam.diff	Wed Dec 30 20:14:45 2009	(r225)
+++ branches/experimental/debian/patches/005_background-dspam.diff	Sat Jan  2 09:25:34 2010	(r226)
@@ -5,9 +5,9 @@
 
 --- a/src/dspam.c
 +++ b/src/dspam.c
-@@ -3969,6 +3969,11 @@
-   DRIVER_CTX DTX;
+@@ -3971,6 +3971,11 @@
    char *pidfile;
+   ATX = ATX; /* Keep compiler happy */
  
 +  /* Fork dspam into the background */
 +  if (fork()) {