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

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit 7a5052afedd3430591cbef91df1234ed8f25254b
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Mon Mar 4 17:21:17 2013 +0100

    Set string escape mode to legacy in PostgreSQL
    
    Dspam uses legacy escaping for strings with PostgreSQL but PostgreSQL in
    wheezy now defaults to standard-compliant mode. This commit explicitely
    require legacy mode for dspam.

diff --git a/debian/changelog b/debian/changelog
index be06286..60296fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dspam (3.10.1+dfsg-10) testing-proposed-updates; urgency=low
+
+  * Explicitely require legacy mode for string escaping in PostgreSQL since it
+    now defaults to standard compliant mode (Closes: #694942).
+
+ -- Thomas Preud'homme <robotux at debian.org>  Mon, 04 Mar 2013 13:56:45 +0100
+
 dspam (3.10.1+dfsg-9) testing-proposed-updates; urgency=low
 
   * Add a new version of the patch fixing recipient corruption when releasing
diff --git a/debian/patches/010_set_legacy_escape_strings.diff b/debian/patches/010_set_legacy_escape_strings.diff
new file mode 100644
index 0000000..968b30c
--- /dev/null
+++ b/debian/patches/010_set_legacy_escape_strings.diff
@@ -0,0 +1,17 @@
+diff --git a/src/pgsql_drv.c b/src/pgsql_drv.c
+index eac2354..b110a3f 100644
+--- a/src/pgsql_drv.c
++++ b/src/pgsql_drv.c
+@@ -3175,6 +3175,12 @@ PGconn *_pgsql_drv_connect(DSPAM_CTX *CTX)
+     return NULL;
+   }
+ 
++  if (PQserverVersion(dbh) >= 90100)
++  {
++    PGresult *result = PQexec(dbh, "SET standard_conforming_strings TO off;");
++    if (result)
++      PQclear(result);
++  }
+   return dbh;
+ 
+ FAILURE:
diff --git a/debian/patches/series b/debian/patches/series
index 6d6b1c6..e146d84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 007_ctime.pl.diff
 008_fix_exim_integration_doc.diff
 009_fix_recipient_corruption_when_releasing_message_from_quarantine.diff
+010_set_legacy_escape_strings.diff

-- 
Debian packages for the DSPAM anti-spam filter