rpms/rekall/devel rekall-unixODBCfix.patch, NONE, 1.1 rekall.spec, 1.39, 1.40

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/rekall/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15242

Modified Files:
	rekall.spec 
Added Files:
	rekall-unixODBCfix.patch 
Log Message:
fix build against new unixODBC

rekall-unixODBCfix.patch:

--- NEW FILE rekall-unixODBCfix.patch ---
diff -Naur rekall-2.4.6.orig/db/odbc/kb_odbc.cpp rekall-2.4.6/db/odbc/kb_odbc.cpp
--- rekall-2.4.6.orig/db/odbc/kb_odbc.cpp	2007-01-03 08:20:29.000000000 -0500
+++ rekall-2.4.6/db/odbc/kb_odbc.cpp	2009-02-17 00:57:08.000000000 -0500
@@ -1095,9 +1095,9 @@
 	SQLCHAR		name	[101]   = "" ;
 	SQLCHAR		type	[101]   = "" ;
 	SQLCHAR		remarks	[301]	= "" ;
-	SQLINTEGER	indName		;
-	SQLINTEGER	indType		;
-	SQLINTEGER	indRemarks	;
+	SQLLEN		indName		;
+	SQLLEN		indType		;
+	SQLLEN		indRemarks	;
 
 	long		odbcRC		;
 	KB::TableType	tabType		;
@@ -1904,7 +1904,7 @@
 		int		&nRows
 	)
 {
-	SQLINTEGER sqlRows ;
+	SQLLEN	   sqlRows ;
 	long	   odbcRC  = SQLRowCount (stmHandle, &sqlRows) ;
 
 	if (!checkRCOK(stmHandle, odbcRC, "Error finding ODBC row count"))
@@ -2056,7 +2056,7 @@
 		SQLCHAR		colName[101]	;
 		SQLSMALLINT	nameLen		;	
 		SQLSMALLINT	colType		;
-		SQLUINTEGER	colSize		;
+		SQLULEN		colSize		;
 		SQLSMALLINT	decimal		;
 		SQLSMALLINT	nullable	;
 		long		odbcRC		;
@@ -2219,7 +2219,7 @@
 			SQLCHAR		colName[101]	;
 			SQLSMALLINT	nameLen		;	
 			SQLSMALLINT	colType		;
-			SQLUINTEGER	colSize		;
+			SQLULEN		colSize		;
 			SQLSMALLINT	decimal		;
 			SQLSMALLINT	nullable	;
 
diff -Naur rekall-2.4.6.orig/db/odbc/kb_odbc_jet.cpp rekall-2.4.6/db/odbc/kb_odbc_jet.cpp
--- rekall-2.4.6.orig/db/odbc/kb_odbc_jet.cpp	2006-10-11 02:30:03.000000000 -0400
+++ rekall-2.4.6/db/odbc/kb_odbc_jet.cpp	2009-02-17 01:02:47.000000000 -0500
@@ -136,7 +136,7 @@
 	}
 
 	char		buffer[32]	;
-	SQLINTEGER	bufflen		;
+	SQLLEN		bufflen		;
 
 	odbcRC = SQLGetData
 		 (	m_getHandle,
diff -Naur rekall-2.4.6.orig/db/odbc/kb_odbc_mysql.cpp rekall-2.4.6/db/odbc/kb_odbc_mysql.cpp
--- rekall-2.4.6.orig/db/odbc/kb_odbc_mysql.cpp	2006-10-11 02:30:03.000000000 -0400
+++ rekall-2.4.6/db/odbc/kb_odbc_mysql.cpp	2009-02-17 01:06:08.000000000 -0500
@@ -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,
diff -Naur rekall-2.4.6.orig/db/srclib/kb_odbcrow.cpp rekall-2.4.6/db/srclib/kb_odbcrow.cpp
--- rekall-2.4.6.orig/db/srclib/kb_odbcrow.cpp	2006-10-11 02:30:03.000000000 -0400
+++ rekall-2.4.6/db/srclib/kb_odbcrow.cpp	2009-02-17 00:46:23.000000000 -0500
@@ -53,8 +53,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;
diff -Naur rekall-2.4.6.orig/db/srclib/kb_odbcval.h rekall-2.4.6/db/srclib/kb_odbcval.h
--- rekall-2.4.6.orig/db/srclib/kb_odbcval.h	2006-10-11 02:30:03.000000000 -0400
+++ rekall-2.4.6/db/srclib/kb_odbcval.h	2009-02-17 00:55:47.000000000 -0500
@@ -20,8 +20,8 @@
 	SQLSMALLINT	m_ptype		;
 	SQLSMALLINT	m_vtype		;
 	SQLPOINTER	m_vptr		;
-	SQLINTEGER	m_vlen		;
-	SQLINTEGER	m_slind		;
+	SQLLEN		m_vlen		;
+	SQLLEN		m_slind		;
 
 
 public  :
@@ -32,6 +32,6 @@
 	inline	SQLSMALLINT	ptype	() { return  m_ptype ; }
 	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		vlen	() { return  m_vlen  ; }
+	inline	SQLLEN		*slind	() { return &m_slind ; }
 }	;


Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- rekall.spec	25 Feb 2009 19:39:52 -0000	1.39
+++ rekall.spec	27 Feb 2009 21:54:41 -0000	1.40
@@ -3,7 +3,7 @@
 Name:		rekall
 Summary:	A KDE database front-end application
 Version:	2.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://www.rekallrevealed.org/
@@ -18,6 +18,7 @@
 Patch9:		rekall-2.4.6-gcc43.patch
 Patch10:	rekall-2.4.6-fixflags.patch
 Patch11:	rekall-2.4.6-xbsql.l.patch
+Patch12:	rekall-unixODBCfix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel, mysql-devel, postgresql-devel, unixODBC-devel
 BuildRequires:	kdelibs3-devel, desktop-file-utils, libacl-devel
@@ -124,6 +125,8 @@
 %patch10 -p1
 # Fix xbsql.l
 %patch11 -p1 -b .fix
+# Fix rekall to build against the latest unixODBC
+%patch12 -p1 -b .unixODBC
 
 rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
 
@@ -337,6 +340,9 @@
 %{_libdir}/librekallqt_driver_sqlite3.so*
 
 %changelog
+* Fri Feb 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.6-10
+- fix rekall to build against the latest unixODBC (thanks to tom lane)
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild