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: 01-Oct-2006 13:50:13
Branch: HEAD Handle: 2006100112501200
Modified files:
openpkg-src/mdbtools mdbtools.patch mdbtools.spec
Log:
upgrading package: mdbtools 0.5 -> 0.6pre1
Summary:
Revision Changes Path
1.3 +37 -89 openpkg-src/mdbtools/mdbtools.patch
1.4 +3 -3 openpkg-src/mdbtools/mdbtools.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 mdbtools.patch
--- openpkg-src/mdbtools/mdbtools.patch 7 May 2006 16:46:20 -0000
1.2
+++ openpkg-src/mdbtools/mdbtools.patch 1 Oct 2006 11:50:12 -0000
1.3
@@ -1,7 +1,7 @@
Index: configure
---- configure.orig 2003-01-19 02:55:48 +0100
-+++ configure 2006-05-07 18:43:22 +0200
-@@ -8862,7 +8862,7 @@
+--- configure.orig 2004-06-18 11:34:27 +0200
++++ configure 2006-10-01 13:46:05 +0200
+@@ -20124,7 +20124,7 @@
echo "${ECHO_T}$ac_cv_lib_readline_add_history" >&6
if test $ac_cv_lib_readline_add_history = yes; then
@@ -11,8 +11,8 @@
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
+--- include/mdbsql.h.orig 2004-03-07 00:59:54 +0100
++++ include/mdbsql.h 2006-10-01 13:46:05 +0200
@@ -6,6 +6,10 @@
#ifndef _mdbsql_h_
#define _mdbsql_h_
@@ -24,18 +24,18 @@
typedef struct {
MdbHandle *mdb;
int all_columns;
-@@ -59,4 +63,7 @@
- void mdb_sql_listtables(MdbSQL *sql);
- void mdb_sql_select(MdbSQL *sql);
+@@ -78,4 +82,7 @@
+ extern void mdb_sql_bind_column(MdbSQL *sql, int colnum, char *varaddr);
+ extern void mdb_sql_bind_len(MdbSQL *sql, int colnum, int *len_ptr);
+#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 @@
+--- include/mdbtools.h.orig 2004-06-17 01:42:19 +0200
++++ include/mdbtools.h 2006-10-01 13:46:05 +0200
+@@ -41,6 +41,10 @@
#define MDB_MEMO_OVERHEAD 12
#define MDB_BIND_SIZE 16384
@@ -46,85 +46,33 @@
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);
-+
+@@ -146,9 +150,6 @@
+ #define IS_JET4(mdb) (mdb->f->jet_version==MDB_VER_JET4)
+ #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+
+-/* hash to store registered backends */
+-extern GHashTable *mdb_backends;
+-
+ /* forward declarations */
+ typedef struct mdbindex MdbIndex;
+ typedef struct mdbsargtree MdbSargNode;
+@@ -517,4 +518,7 @@
+ extern int mdb_unicode2ascii(MdbHandle *mdb, unsigned char *buf, int
offset, int len, char *dest);
+ extern int mdb_ascii2unicode(MdbHandle *mdb, unsigned char *buf, int
offset, int len, char *dest);
+
+#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); }
+Index: src/util/Makefile.in
+--- src/util/Makefile.in.orig 2004-06-18 11:34:23 +0200
++++ src/util/Makefile.in 2006-10-01 13:47:36 +0200
+@@ -156,7 +156,7 @@
+ bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv
mdb-header mdb-sql mdb-ver mdb-prop mdb-import prtable prcat prdata prkkd
prdump prole updrow prindex
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
+ LDADD = ../libmdb/libmdb.la
[EMAIL PROTECTED]@mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
[EMAIL PROTECTED]@mdb_sql_LDADD = ../sql/libmdbsql.la ../libmdb/libmdb.la
+ subdir = src/util
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mdbtools/mdbtools.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 mdbtools.spec
--- openpkg-src/mdbtools/mdbtools.spec 7 May 2006 16:48:42 -0000
1.3
+++ openpkg-src/mdbtools/mdbtools.spec 1 Oct 2006 11:50:12 -0000
1.4
@@ -32,11 +32,11 @@
Class: EVAL
Group: Database
License: LGPL/GPL
-Version: 0.5
-Release: 20060507
+Version: 0.6pre1
+Release: 20061001
# list of sources
-Source0:
http://download.sourceforge.net/mdbtools/mdbtools-%{version}.tar.gz
+Source0:
http://switch.dl.sourceforge.net/mdbtools/mdbtools-%{version}.tar.gz
Patch0: mdbtools.patch
# build information
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
