OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 07-May-2006 18:46:20
Branch: HEAD Handle: 2006050717462000
Modified files:
openpkg-src/mdbtools mdbtools.patch mdbtools.spec
Log:
add a bunch of fixes from the FreeBSD port of mdbtools and fix
dependencies
Summary:
Revision Changes Path
1.2 +119 -1 openpkg-src/mdbtools/mdbtools.patch
1.2 +3 -1 openpkg-src/mdbtools/mdbtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 mdbtools.patch
--- openpkg-src/mdbtools/mdbtools.patch 7 May 2006 16:23:25 -0000
1.1
+++ openpkg-src/mdbtools/mdbtools.patch 7 May 2006 16:46:20 -0000
1.2
@@ -1,6 +1,6 @@
Index: configure
--- configure.orig 2003-01-19 02:55:48 +0100
-+++ configure 2006-05-07 11:03:45 +0200
++++ configure 2006-05-07 18:43:22 +0200
@@ -8862,7 +8862,7 @@
echo "${ECHO_T}$ac_cv_lib_readline_add_history" >&6
if test $ac_cv_lib_readline_add_history = yes; then
@@ -10,3 +10,121 @@
cat >>confdefs.h <<\_ACEOF
#define HAVE_READLINE 1
+Index: include/mdbsql.h
+--- include/mdbsql.h.orig 2002-03-27 14:00:01 +0100
++++ include/mdbsql.h 2006-05-07 18:43:22 +0200
+@@ -6,6 +6,10 @@
+ #ifndef _mdbsql_h_
+ #define _mdbsql_h_
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ typedef struct {
+ MdbHandle *mdb;
+ int all_columns;
+@@ -59,4 +63,7 @@
+ void mdb_sql_listtables(MdbSQL *sql);
+ void mdb_sql_select(MdbSQL *sql);
+
++#ifdef __cplusplus
++}
++#endif
+ #endif
+Index: include/mdbtools.h
+--- include/mdbtools.h.orig 2003-01-12 23:59:42 +0100
++++ include/mdbtools.h 2006-05-07 18:43:22 +0200
+@@ -40,6 +40,10 @@
+ #define MDB_MEMO_OVERHEAD 12
+ #define MDB_BIND_SIZE 16384
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ enum {
+ MDB_PAGE_DB = 0,
+ MDB_PAGE_DATA,
+@@ -345,4 +349,8 @@
+ /* index.c */
+ extern GPtrArray *mdb_read_indices(MdbTableDef *table);
+ extern void mdb_index_dump(MdbTableDef *table, MdbIndex *idx);
++
++#ifdef __cplusplus
++}
++#endif
+ #endif /* _mdbtools_h_ */
+Index: src/libmdb/backend.c
+--- src/libmdb/backend.c.orig 2002-12-11 00:35:25 +0100
++++ src/libmdb/backend.c 2006-05-07 18:43:22 +0200
+@@ -112,10 +112,9 @@
+
+ char *mdb_get_coltype_string(MdbBackend *backend, int col_type)
+ {
+-char buf[100];
++ static char buf[16];
+ if (col_type > 0x10) {
+- // return NULL;
+- sprintf(buf,"type %04x", col_type);
++ sprintf(buf, "type %04x", col_type);
+ return buf;
+ } else {
+ return backend->types_table[col_type];
+Index: src/libmdb/data.c
+--- src/libmdb/data.c.orig 2003-01-12 23:59:43 +0100
++++ src/libmdb/data.c 2006-05-07 18:43:22 +0200
+@@ -171,6 +171,9 @@
+ unsigned char null_mask[33]; /* 256 columns max / 8 bits per byte */
+ unsigned char isnull;
+
++ if (table->num_rows <= row)
++ return 0;
++
+ row_start = mdb_get_int16(mdb, (fmt->row_count_offset + 2) + (row*2));
+ row_end = mdb_find_end_of_row(mdb, row);
+
+Index: src/libmdb/file.c
+--- src/libmdb/file.c.orig 2003-01-12 23:59:43 +0100
++++ src/libmdb/file.c 2006-05-07 18:43:22 +0200
+@@ -20,7 +20,7 @@
+ #include "mdbtools.h"
+
+ MdbFormatConstants MdbJet4Constants = {
+- 4096, 0x0c, 12, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25
++ 4096, 0x0c, 16, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25
+ };
+ MdbFormatConstants MdbJet3Constants = {
+ 2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18
+Index: src/libmdb/write.c
+--- src/libmdb/write.c.orig 2003-01-09 21:24:27 +0100
++++ src/libmdb/write.c 2006-05-07 18:43:22 +0200
+@@ -306,7 +306,7 @@
+ return 0;
+ }
+ }
+- num_fields = mdb_crack_row(table, row_start, row_end, &fields);
++ num_fields = mdb_crack_row(table, row_start, row_end, fields);
+
+ #if MDB_DEBUG_WRITE
+ for (i=0;i<num_fields;i++) {
+@@ -322,7 +322,7 @@
+ }
+ }
+
+- new_row_size = mdb_pack_row(table, row_buffer, num_fields, &fields);
++ new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
+ #if MDB_DEBUG_WRITE
+ buffer_dump(row_buffer, 0, new_row_size-1);
+ #endif
+Index: src/sql/parser.y
+--- src/sql/parser.y.orig 2002-12-27 16:09:02 +0100
++++ src/sql/parser.y 2006-05-07 18:43:22 +0200
+@@ -109,6 +109,7 @@
+ database:
+ PATH
+ | NAME
++ ;
+
+ table:
+ NAME { mdb_sql_add_table(_mdb_sql(NULL), $1); free($1); }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 mdbtools.spec
--- openpkg-src/mdbtools/mdbtools.spec 7 May 2006 16:23:25 -0000
1.1
+++ openpkg-src/mdbtools/mdbtools.spec 7 May 2006 16:46:20 -0000
1.2
@@ -42,8 +42,10 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20040130, flex, bison
PreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: readline, ncurses
+PreReq: readline, ncurses
AutoReq: no
AutoReqProv: no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
