Hi Peter, I will be uploading an NMU for this issue shortly. Final patch is attached.
Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. [EMAIL PROTECTED] http://www.debian.org/
diff -u rekall-2.2.6/debian/changelog rekall-2.2.6/debian/changelog
--- rekall-2.2.6/debian/changelog
+++ rekall-2.2.6/debian/changelog
@@ -1,3 +1,12 @@
+rekall (2.2.6-4.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for RC bugfix.
+ * Additional 64-bit compilation fixes, now that unixodbc is 64-bit
+ clean out of the box (closes: #357919).
+
+ -- Steve Langasek <[EMAIL PROTECTED]> Mon, 20 Mar 2006 00:56:37 -0800
+
rekall (2.2.6-4) unstable; urgency=low
* Set build dependency to libmysqlclient15-dev (closes: #343808)
diff -u rekall-2.2.6/debian/patches/41_64bit.patch
rekall-2.2.6/debian/patches/41_64bit.patch
--- rekall-2.2.6/debian/patches/41_64bit.patch
+++ rekall-2.2.6/debian/patches/41_64bit.patch
@@ -1,6 +1,41 @@
+only in patch2:
+unchanged:
+--- rekall-2.2.6.orig/db/odbc/kb_odbc_mysql.cpp
++++ rekall-2.2.6/db/odbc/kb_odbc_mysql.cpp
+@@ -126,7 +126,7 @@
+ }
+
+ char buffer[32] ;
+- SQLINTEGER bufflen ;
++ SQLLEN bufflen ;
+
+ odbcRC = SQLGetData
+ ( m_getHandle,
+@@ -297,7 +297,7 @@
+ }
+
+ char buffer[GETBUFSIZ+8] ;
+- SQLINTEGER bufflen ;
++ SQLLEN bufflen ;
+
+ odbcRC = SQLGetData
+ ( stmHandle,
+only in patch2:
+unchanged:
+--- rekall-2.2.6.orig/db/odbc/kb_odbc_jet.cpp
++++ rekall-2.2.6/db/odbc/kb_odbc_jet.cpp
+@@ -136,7 +136,7 @@
+ }
+
+ char buffer[32] ;
+- SQLINTEGER bufflen ;
++ SQLLEN bufflen ;
+
+ odbcRC = SQLGetData
+ ( m_getHandle,
diff -Nur rekall-2.2.6/db/odbc/kb_odbc.cpp rekall-2.2.6.new/db/odbc/kb_odbc.cpp
---- rekall-2.2.6/db/odbc/kb_odbc.cpp 2005-12-18 12:30:42.000000000 +0100
-+++ rekall-2.2.6.new/db/odbc/kb_odbc.cpp 2005-12-18 13:35:58.000000000
+0100
+--- rekall-2.2.6.orig/db/odbc/kb_odbc.cpp
++++ rekall-2.2.6/db/odbc/kb_odbc.cpp
@@ -266,9 +266,9 @@
{
fprintf
@@ -16,0 +52,75 @@
+@@ -1026,9 +1026,9 @@
+ SQLCHAR name [101] = "" ;
+ SQLCHAR type [101] = "" ;
+ SQLCHAR remarks [301] = "" ;
+- SQLINTEGER indName ;
+- SQLINTEGER indType ;
+- SQLINTEGER indRemarks ;
++ SQLLEN indName ;
++ SQLLEN indType ;
++ SQLLEN indRemarks ;
+
+ long odbcRC ;
+
+@@ -1843,7 +1843,7 @@
+ int &nRows
+ )
+ {
+- SQLINTEGER sqlRows ;
++ SQLLEN sqlRows ;
+ long odbcRC = SQLRowCount (stmHandle, &sqlRows) ;
+
+ if (!checkRCOK(stmHandle, odbcRC, "Error finding ODBC row count"))
+@@ -1993,7 +1993,7 @@
+ SQLCHAR colName[101] ;
+ SQLSMALLINT nameLen ;
+ SQLSMALLINT colType ;
+- SQLUINTEGER colSize ;
++ SQLULEN colSize ;
+ SQLSMALLINT decimal ;
+ SQLSMALLINT nullable ;
+ long odbcRC ;
+@@ -2140,7 +2140,7 @@
+ SQLCHAR colName[101] ;
+ SQLSMALLINT nameLen ;
+ SQLSMALLINT colType ;
+- SQLUINTEGER colSize ;
++ SQLULEN colSize ;
+ SQLSMALLINT decimal ;
+ SQLSMALLINT nullable ;
+
+only in patch2:
+unchanged:
+--- rekall-2.2.6.orig/db/srclib/kb_odbcrow.cpp
++++ rekall-2.2.6/db/srclib/kb_odbcrow.cpp
+@@ -46,8 +46,8 @@
+ for (uint colno = 0 ; colno < nvals ; colno += 1)
+ {
+ char buffer[GETBUFSIZ + 8];
+- SQLINTEGER bufflen ;
+- SQLINTEGER bufflen2 ;
++ SQLLEN bufflen ;
++ SQLLEN bufflen2 ;
+ SQLRETURN odbcRC ;
+
+ *(long*)(&buffer[GETBUFSIZ + 4]) = MAGIC;
+only in patch2:
+unchanged:
+--- rekall-2.2.6.orig/db/srclib/kb_odbcval.h
++++ rekall-2.2.6/db/srclib/kb_odbcval.h
+@@ -21,7 +21,7 @@
+ SQLSMALLINT m_vtype ;
+ SQLPOINTER m_vptr ;
+ SQLINTEGER m_vlen ;
+- SQLINTEGER m_slind ;
++ SQLLEN m_slind ;
+
+
+ public :
+@@ -33,5 +33,5 @@
+ inline SQLSMALLINT vtype () { return m_vtype ; }
+ inline SQLPOINTER vptr () { return m_vptr ; }
+ inline SQLINTEGER vlen () { return m_vlen ; }
+- inline SQLINTEGER *slind () { return &m_slind ; }
++ inline SQLLEN *slind () { return &m_slind ; }
+ } ;
signature.asc
Description: Digital signature
