Re: Bug#597914: [SRM] Stable update for perdition (1.17.1-2+lenny2)

[Simon Horman <horms@verge.net.au>]

Hi Julien,

I have addressed your two concerns and the
change now looks the same as the one between 1.19~rc4-1 and 1.19~rc4-2.

The new changelog is:

  * Resolve 4/8 byte problems raised in bug #597914)
    - odbc: pass a SQLLEN instead of an SQLINTEGER to SQLBindCol()
      + This seems problematic on architectures such as amd64 where
        size_t (SQLLEN) is 8 bytes wide but int (SQLINTEGER) is only
        4 bytes wide.
      + As per upstream patch
        http://hg.vergenet.net/perdition/perdition/rev/57268f4aaa94
    - core: the return value of callbacks to vanessa_socket_pipe_func()
      should be a ssize_t not an int.
      + This seems problematic on architectures such as amd64 where
        ssize_t is 8 bytes wide but int is only 4 bytes wide.
      + As per upstream patch
        http://hg.vergenet.net/perdition/perdition/rev/57268f4aaa94
    - (closes: #597914)

And the new diff is:

diff -u perdition-1.17.1/debian/changelog perdition-1.17.1/debian/changelog
--- perdition-1.17.1/debian/changelog
+++ perdition-1.17.1/debian/changelog
@@ -1,3 +1,22 @@
+perdition (1.17.1-2+lenny2) stable; urgency=low
+
+  * Resolve 4/8 byte problems raised in bug #597914)
+    - odbc: pass a SQLLEN instead of an SQLINTEGER to SQLBindCol()
+      + This seems problematic on architectures such as amd64 where
+        size_t (SQLLEN) is 8 bytes wide but int (SQLINTEGER) is only
+        4 bytes wide.
+      + As per upstream patch
+        http://hg.vergenet.net/perdition/perdition/rev/57268f4aaa94
+    - core: the return value of callbacks to vanessa_socket_pipe_func()
+      should be a ssize_t not an int.
+      + This seems problematic on architectures such as amd64 where
+        ssize_t is 8 bytes wide but int is only 4 bytes wide.
+      + As per upstream patch
+        http://hg.vergenet.net/perdition/perdition/rev/57268f4aaa94
+    - (closes: #597914)
+
+ -- Simon Horman <horms@debian.org>  Tue, 28 Sep 2010 09:44:37 +0900
+
 perdition (1.17.1-2+lenny1) stable; urgency=low
 
   * Don't call make from perdition prerm script
only in patch2:
unchanged:
--- perdition-1.17.1.orig/perdition/io.c
+++ perdition-1.17.1/perdition/io.c
@@ -517,7 +517,9 @@
  *
  **********************************************************************/
 
-static int __io_pipe_read(int fd, void *buf, size_t count, void *data){
+static ssize_t
+__io_pipe_read(int fd, void *buf, size_t count, void *data)
+{
   io_t *io;
   io_select_t *s;
   ssize_t bytes;
@@ -550,7 +552,9 @@
 }
          
 
-static int __io_pipe_write(int fd, const void *buf, size_t count, void *data){
+static ssize_t
+__io_pipe_write(int fd, const void *buf, size_t count, void *data)
+{
   io_t *io;
   io_select_t *s;
 
only in patch2:
unchanged:
--- perdition-1.17.1.orig/perdition/db/odbc/perditiondb_odbc.c
+++ perdition-1.17.1/perdition/db/odbc/perditiondb_odbc.c
@@ -214,7 +214,7 @@
 		char **str_return, size_t * len_return)
 {
 	SQLINTEGER rc;
-	SQLINTEGER rc2;
+	SQLLEN rc2;
 	int status = -1;
 	SQLHENV env;
 	SQLHDBC hdbc;