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

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit a54c2c582df2e1df3f356859e296fc07b11a3553
Author: Thomas Preud'homme <robotux at celest.fr>
Date:   Wed May 29 15:30:30 2013 +0200

    Adopt changes only in wheezy
    
    Adopt fixes for #694942 and #702764 which are currently only present in
    wheezy.

diff --git a/debian/changelog b/debian/changelog
index 42fc344..201dd55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ dspam (3.10.2+dfsg-8) UNRELEASED; urgency=low
     + Remove useless libdspam7-drv virtual package.
     + Wrap lines to 80 characters.
   * Drop elements for upgrade from pre-wheezy systems.
+  * Create plpgsql only if it is not loaded yet (Closes: #702764).
+  * Explicitly 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>  Tue, 05 Mar 2013 15:53:20 +0100
 
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..cdd9ff8
--- /dev/null
+++ b/debian/patches/010_set_legacy_escape_strings.diff
@@ -0,0 +1,27 @@
+Require legacy mode for string escaping in pgsql
+
+Explicitly require legacy mode for string escaping in PostgreSQL since it
+now defaults to standard compliant mode.
+
+Author: Julien Cristau <jcristau at debian.org>
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694942
+Bug-Debian: http://bugs.debian.org/694942
+Forwarded: no
+Last-Update: 2013-05-29
+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 4ed04b3..9daa0c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 007_process_quarantine_if_spanish.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