rpms/rekall/devel rekall-2.4.6-gcc43.patch, NONE, 1.1 rekall-flex-glibc27.diff, NONE, 1.1 rekall-xbsql-overflows.diff, NONE, 1.1 rekall.spec, 1.29, 1.30 sources, 1.6, 1.7
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Wed Feb 20 17:14:09 UTC 2008
- Previous message (by thread): rpms/udev/devel udev-118-slink-selinux.patch, NONE, 1.1 udev.spec, 1.232, 1.233
- Next message (by thread): rpms/perl-Sub-Uplevel/devel .cvsignore, 1.7, 1.8 perl-Sub-Uplevel.spec, 1.14, 1.15 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: spot
Update of /cvs/pkgs/rpms/rekall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv671
Modified Files:
rekall.spec sources
Added Files:
rekall-2.4.6-gcc43.patch rekall-flex-glibc27.diff
rekall-xbsql-overflows.diff
Log Message:
2.4.6
rekall-2.4.6-gcc43.patch:
--- NEW FILE rekall-2.4.6-gcc43.patch ---
diff -up rekall-2.4.6/test/dummy/testdriver.cpp.BAD rekall-2.4.6/test/dummy/testdriver.cpp
--- rekall-2.4.6/test/dummy/testdriver.cpp.BAD 2008-02-20 10:19:30.000000000 -0500
+++ rekall-2.4.6/test/dummy/testdriver.cpp 2008-02-20 10:19:37.000000000 -0500
@@ -21,7 +21,7 @@
#include <qdatetime.h>
#include <stdarg.h>
-
+#include <cstdlib>
#include "std.h"
#include "eli.h"
diff -up rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp.BAD rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp
--- rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp.BAD 2008-02-20 10:00:57.000000000 -0500
+++ rekall-2.4.6/db/sqlite3/kb_sqlite3.cpp 2008-02-20 10:01:08.000000000 -0500
@@ -20,6 +20,7 @@
#include "kb_dprintf.h"
#endif
+#include <cstdlib>
static QIntDict<SQLite3TypeMap> dIdentToType ;
static QDict <KBSQLite3Type> typesDict ;
diff -up rekall-2.4.6/db/srclib/kb_odbcrow.cpp.BAD rekall-2.4.6/db/srclib/kb_odbcrow.cpp
--- rekall-2.4.6/db/srclib/kb_odbcrow.cpp.BAD 2008-02-20 09:59:34.000000000 -0500
+++ rekall-2.4.6/db/srclib/kb_odbcrow.cpp 2008-02-20 10:00:14.000000000 -0500
@@ -1,3 +1,5 @@
+#include <cstdlib>
+
static SQLINTEGER mapCRLF
( char *buffer,
SQLINTEGER bufflen
diff -up rekall-2.4.6/db/srclib/kb_odbcval.cpp.BAD rekall-2.4.6/db/srclib/kb_odbcval.cpp
--- rekall-2.4.6/db/srclib/kb_odbcval.cpp.BAD 2008-02-20 09:59:04.000000000 -0500
+++ rekall-2.4.6/db/srclib/kb_odbcval.cpp 2008-02-20 09:59:16.000000000 -0500
@@ -19,6 +19,7 @@
/* It is #included and *not* part of a linked library, in case of */
/* subtle differences in constant values ans such like. */
+#include <cstdlib>
/* KBODBCValue */
/* KBODBCValue : Constructor for ODBC binding value object */
rekall-flex-glibc27.diff:
--- NEW FILE rekall-flex-glibc27.diff ---
--- rekall-2.4.6/libs/el32/SConscript
+++ rekall-2.4.6/libs/el32/SConscript
@@ -40,7 +40,7 @@ env = rb.environment ()
if rkConfig.mode != 'win' :
- env.Append (LEXFLAGS = '-Pel_yy')
+ env.Append (LEXFLAGS = '-Pel_yy --nounistd')
env.Append (YACCFLAGS = '-pel_yy')
env.CFile ('lex.el_yy.c', 'el.l')
env.CFile ('el.tab.cpp', 'el.y')
--- rekall-2.4.6/libs/el32/el.l
+++ rekall-2.4.6/libs/el32/el.l
@@ -8,6 +8,8 @@
#define read(f,b,l) el_read(b,l)
#define output(c)
+extern "C" { extern int isatty(int desc); }
+
static void comment () ;
static void string (int) ;
rekall-xbsql-overflows.diff:
--- NEW FILE rekall-xbsql-overflows.diff ---
--- rekall-2.4.6/support/xbsql/xb_fieldset.cpp
+++ rekall-2.4.6/support/xbsql/xb_fieldset.cpp
@@ -72,8 +72,8 @@ XBSQL::Index
char buff[255] ;
strncpy (buff, tabname, sizeof(buff)) ;
- strncat (buff, "_", sizeof(buff)) ;
- strncat (buff, getFieldName(fldno), sizeof(buff)) ;
+ strncat (buff, "_", sizeof(buff)-strlen(buff)-1) ;
+ strncat (buff, getFieldName(fldno), sizeof(buff)-strlen(buff)-1) ;
const char *path = xbase->getPath (buff, "ndx") ;
int fd = open (path, O_RDONLY) ;
--- rekall-2.4.6/support/xbsql/xbsql.cpp
+++ rekall-2.4.6/support/xbsql/xbsql.cpp
@@ -379,8 +379,8 @@ bool XBaseSQL::createTable
xbNdx ndxFile (&dbfFile) ;
strncpy (name, table, sizeof(name)) ;
- strncat (name, "_", sizeof(name)) ;
- strncat (name, schema[idx].FieldName, sizeof(name)) ;
+ strncat (name, "_", sizeof(name)-strlen(name)-1) ;
+ strncat (name, schema[idx].FieldName, sizeof(name)-strlen(name)-1) ;
path = getPath (name, "ndx") ;
idxflag = index[idx] == XBSQL::IndexUnique ?
@@ -482,8 +482,8 @@ XBSQLTable *XBaseSQL::openTable
char name[256] ;
strncpy (name, table, sizeof(name)) ;
- strncat (name, "_", sizeof(name)) ;
- strncat (name, fSet.getFieldName (idx), sizeof(name)) ;
+ strncat (name, "_", sizeof(name)-strlen(name)-1) ;
+ strncat (name, fSet.getFieldName (idx), sizeof(name)-strlen(name)-1) ;
path = getPath (name, "ndx") ;
if (access(path, R_OK) == 0)
@@ -880,11 +880,11 @@ bool XBaseSQL::renameTable
const char *fname = fSet.getFieldName (idx) ;
strncpy (_oldName, oldName, sizeof(_oldName)) ;
- strncat (_oldName, "_", sizeof(_oldName)) ;
- strncat (_oldName, fname, sizeof(_oldName)) ;
+ strncat (_oldName, "_", sizeof(_oldName)-strlen(_oldName)-1) ;
+ strncat (_oldName, fname, sizeof(_oldName)-strlen(_oldName)-1) ;
strncpy (_newName, newName, sizeof(_newName)) ;
- strncat (_newName, "_", sizeof(_newName)) ;
- strncat (_newName, fname, sizeof(_newName)) ;
+ strncat (_newName, "_", sizeof(_newName)-strlen(_newName)-1) ;
+ strncat (_newName, fname, sizeof(_newName)-strlen(_newName)-1) ;
oldAnon = getPath (_oldName, "ndx") ;
newAnon = getPath (_newName, "ndx") ;
@@ -959,8 +959,8 @@ bool XBaseSQL::dropTable
const char *fname = fSet.getFieldName (idx) ;
strncpy (_idxName, table, sizeof(_idxName)) ;
- strncat (_idxName, "_", sizeof(_idxName)) ;
- strncat (_idxName, fname, sizeof(_idxName)) ;
+ strncat (_idxName, "_", sizeof(_idxName)-strlen(_idxName)-1) ;
+ strncat (_idxName, fname, sizeof(_idxName)-strlen(_idxName)-1) ;
tabAnon = getPath (_idxName, "ndx") ;
Index: rekall.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/rekall.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- rekall.spec 20 Feb 2008 01:46:24 -0000 1.29
+++ rekall.spec 20 Feb 2008 17:13:22 -0000 1.30
@@ -1,7 +1,7 @@
Name: rekall
Summary: A KDE database front-end application
-Version: 2.4.5
-Release: 7%{?dist}.1
+Version: 2.4.6
+Release: 1%{?dist}
Group: Development/Tools
License: GPLv2
URL: http://www.rekallrevealed.org/
@@ -11,7 +11,9 @@
Patch4: rekall-2.4.0-noldconfig.patch
Patch5: rekall-2.4.5-lib64.patch
Patch6: rekall-2.4.5-python25.patch
-Patch7: rekall-2.4.5-qt3-kdedocdir.patch
+Patch7: rekall-flex-glibc27.diff
+Patch8: rekall-xbsql-overflows.diff
+Patch9: rekall-2.4.6-gcc43.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, mysql-devel, postgresql-devel
BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel
@@ -57,6 +59,14 @@
%description mysql
Driver to add MySQL support to Rekall.
+%package odbc
+Summary: Rekall ODBC driver
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description odbc
+Driver to add ODBC support to Rekall.
+
%package postgresql
Summary: Rekall PostgreSQL driver
Group: System Environment/Libraries
@@ -91,8 +101,12 @@
%endif
# Only FC-7 or greater needs this:
%patch6 -p1
-# missing kdedocdir define on qt3 build
+# Fix for glibc2.7
%patch7 -p1
+# Fix possible overflows in xbsql
+%patch8 -p1
+# Fix gcc43 compile
+%patch9 -p1
rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig
%build
@@ -101,6 +115,7 @@
sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py
echo "prefix=%{_prefix}" >> scons/settings.qt3
echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3
+echo "with-odbc-libraries=%{_libdir}" >> scons/settings.qt3
echo "with-pcre-libraries=%{_libdir}" >> scons/settings.qt3
echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3
echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3
@@ -141,13 +156,6 @@
ln -s %{_bindir}/rekallqt rekall
ln -s %{_bindir}/rekallqtManual rekallManual
-# rekall needs these files to exist as .so to function properly.
-cd $RPM_BUILD_ROOT%{_libdir}
-for i in *.so.245; do
- NEWNAME=`echo $i | sed 's/.245//'`;
- ln -s $i $NEWNAME;
-done
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -169,6 +177,10 @@
%postun mysql -p /sbin/ldconfig
+%post odbc -p /sbin/ldconfig
+
+%postun odbc -p /sbin/ldconfig
+
%post postgresql -p /sbin/ldconfig
%postun postgresql -p /sbin/ldconfig
@@ -189,7 +201,7 @@
%{_bindir}/rekallqt
%{_bindir}/rkdcop
%{_datadir}/pixmaps/rekall.png
-%dir %{_datadir}/apps/rekallqt
+%dir %{_datadir}/apps/rekallqt/
%{_datadir}/apps/rekallqt/dict/
%{_datadir}/apps/rekallqt/gui/
%{_datadir}/apps/rekallqt/highlights/
@@ -201,6 +213,7 @@
%{_datadir}/apps/rekallqt/services/kdeparts.lst
%{_datadir}/apps/rekallqt/services/rekall_component.desktop
%{_datadir}/apps/rekallqt/services/rekall_copier.desktop
+%{_datadir}/apps/rekallqt/services/rekall_driver_csv.desktop
%{_datadir}/apps/rekallqt/services/rekall_driver_dbtcp.desktop
%{_datadir}/apps/rekallqt/services/rekall_driver_test.desktop
%{_datadir}/apps/rekallqt/services/rekall_driver_xbase.desktop
@@ -223,6 +236,7 @@
%{_libdir}/librekallqt_common.so*
%{_libdir}/librekallqt_componentview.so*
%{_libdir}/librekallqt_copierview.so*
+%{_libdir}/librekallqt_driver_csv.so*
%{_libdir}/librekallqt_driver_dbtcp.so*
%{_libdir}/librekallqt_driver_test.so*
%{_libdir}/librekallqt_driver_xbase.so*
@@ -261,6 +275,11 @@
%{_datadir}/apps/rekallqt/services/rekall_driver_mysql.desktop
%{_libdir}/librekallqt_driver_mysql.so*
+%files odbc
+%defattr(-, root, root, 0755)
+%{_datadir}/apps/rekallqt/services/rekall_driver_odbc.desktop
+%{_libdir}/librekallqt_driver_odbc.so*
+
%files postgresql
%defattr(-, root, root, 0755)
%{_datadir}/apps/rekallqt/services/rekall_driver_pgsql.desktop
@@ -282,6 +301,9 @@
%{_libdir}/librekallqt_driver_sqlite3.so*
%changelog
+* Tue Feb 19 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.6-1
+- 2.4.6
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.4.5-7.1
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rekall/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 18 Jan 2007 16:37:06 -0000 1.6
+++ sources 20 Feb 2008 17:13:22 -0000 1.7
@@ -1 +1 @@
-957858c14b5ba8f473ae8c97b6ea48bd rekall-2.4.5.tar.gz
+a0308a22309ab1c52e7fb5d8fa7cd8ff rekall-2.4.6.tar.gz
- Previous message (by thread): rpms/udev/devel udev-118-slink-selinux.patch, NONE, 1.1 udev.spec, 1.232, 1.233
- Next message (by thread): rpms/perl-Sub-Uplevel/devel .cvsignore, 1.7, 1.8 perl-Sub-Uplevel.spec, 1.14, 1.15 sources, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list