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

[Julien Valroff]

The following commit has been merged in the master branch:
commit 936a862c33402df8e49adf77b066d5de3ecded95
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Feb 10 21:58:34 2012 +0100

    Apply patch from upstream to use POSIX::ctime() in steadof deprecated ctime.pl (Closes: #658950)

diff --git a/debian/changelog b/debian/changelog
index 917929f..2220806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dspam (3.10.1+dfsg-4) unstable; urgency=low
+
+  * Apply patch from upstream to use POSIX::ctime() in steadof deprecated
+    ctime.pl (Closes: #658950)
+
+ -- Julien Valroff <julien at debian.org>  Fri, 10 Feb 2012 21:55:13 +0100
+
 dspam (3.10.1+dfsg-3) unstable; urgency=low
 
   * Fix Apache configuration example (Closes: #638289) 
diff --git a/debian/patches/007_ctime.pl.diff b/debian/patches/007_ctime.pl.diff
new file mode 100644
index 0000000..d0ce983
--- /dev/null
+++ b/debian/patches/007_ctime.pl.diff
@@ -0,0 +1,42 @@
+Description: use POSIX::ctime() in steadof deprecated ctime.pl 
+Author: Tom Hendrikx <tom at whyscream.net>
+Bug: http://sourceforge.net/tracker/?func=detail&aid=3389943&group_id=250683&atid=1126467
+Bug-Debian: http://bugs.debian.org/658950
+
+--- a/webui/cgi-bin/admin.cgi
++++ b/webui/cgi-bin/admin.cgi
+@@ -20,7 +20,6 @@
+ use strict;
+ use Time::Local;
+ use vars qw { %CONFIG %DATA %FORM %LANG $LANGUAGE };
+-require "ctime.pl";
+ 
+ #
+ # Read configuration parameters common to all CGI scripts
+--- a/webui/cgi-bin/dspam.cgi
++++ b/webui/cgi-bin/dspam.cgi
+@@ -18,12 +18,11 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ use strict;
++use POSIX qw(strftime ctime);
+ use Time::Local;
+ use vars qw { %CONFIG %DATA %FORM %LANG $MAILBOX $CURRENT_USER $USER $TMPFILE $USERSELECT };
+ use vars qw { $CURRENT_STORE $LANGUAGE };
+ 
+-require "ctime.pl";
+-
+ #
+ # Read configuration parameters common to all CGI scripts
+ #
+@@ -36,10 +35,6 @@
+ }
+ require "/etc/dspam/webfrontend.conf";
+ 
+-if($CONFIG{"DATE_FORMAT"}) {
+-  use POSIX qw(strftime);
+-}
+-
+ #
+ # The current CGI script
+ #
diff --git a/debian/patches/series b/debian/patches/series
index 58799d3..fb522ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 004_where-to-find-txt-files.diff
 005_dspam-notify.diff
 006_default-daemon-port.diff
+007_ctime.pl.diff

-- 
Debian packages for the DSPAM anti-spam filter