diff -ur opendbx.orig/aclocal.m4 opendbx/aclocal.m4 --- opendbx.orig/aclocal.m4 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/aclocal.m4 2012-06-11 01:33:50.000000000 +0400 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -86,7 +86,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -102,7 +102,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11])dnl +[AM_AUTOMAKE_VERSION([1.11.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -ur opendbx.orig/backends/firebird/Makefile.in opendbx/backends/firebird/Makefile.in --- opendbx.orig/backends/firebird/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/firebird/Makefile.in 2012-06-11 01:33:52.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/Makefile.in opendbx/backends/Makefile.in --- opendbx.orig/backends/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/Makefile.in 2012-06-11 01:33:52.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -298,7 +298,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -323,7 +323,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -ur opendbx.orig/backends/mssql/Makefile.in opendbx/backends/mssql/Makefile.in --- opendbx.orig/backends/mssql/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/mssql/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/mssql/mssql_basic.c opendbx/backends/mssql/mssql_basic.c --- opendbx.orig/backends/mssql/mssql_basic.c 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/mssql/mssql_basic.c 2012-05-06 18:59:01.000000000 +0400 @@ -132,6 +132,8 @@ if( ( handle->generic = (void*) dbopen( tc->login, tc->host ) ) == NULL ) { memcpy( tc->errmsg, dgettext( "opendbx", mssql_odbx_errmsg[0] ), strlen( dgettext( "opendbx", mssql_odbx_errmsg[0] ) ) + 1 ); + tc->errtype = 1; + return -ODBX_ERR_BACKEND; } @@ -458,7 +460,12 @@ for( i = 0; i < ares->cols; i++ ) { - if( ( data = dbdata( dbproc, i+1 ) ) == NULL ) + if( ( dlen = dbdatlen( dbproc, i+1 ) ) == -1 ) + { + return -ODBX_ERR_SIZE; + } + + if( ( data = dbdata( dbproc, i+1 ) ) == NULL && dlen == 0 ) { gres[i].ind = 1; // column is NULL gres[i].length = 0; @@ -472,14 +479,17 @@ case SYBDATETIMN: if( dbdatecrack( dbproc, &di, (DBDATETIME*) data ) != FAIL ) { +#ifdef HAVE_LIBSYBDB_MSLIB + gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld", + (long) di.year, (long) di.month+1, (long) di.day, (long) di.hour, (long) di.minute, (long) di.second ); +#else gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld", (long) di.dateyear, (long) di.datemonth+1, (long) di.datedmonth, (long) di.datehour, (long) di.dateminute, (long) di.datesecond ); +#endif } continue; } - dlen = dbdatlen( dbproc, i+1 ); - if( gres[i].mlen < dlen + 1 ) { if( ( gres[i].value = realloc( gres[i].value, dlen + 1 ) ) == NULL ) @@ -492,6 +502,7 @@ gres[i].length = dbconvert( dbproc, dbcoltype( dbproc, i+1 ), data, dlen, SYBVARCHAR, gres[i].value, gres[i].mlen ); gres[i].value[gres[i].length] = 0; + gres[i].ind = 0; // column is not NULL } return ODBX_ROW_NEXT; diff -ur opendbx.orig/backends/mysql/Makefile.in opendbx/backends/mysql/Makefile.in --- opendbx.orig/backends/mysql/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/mysql/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/mysql/mysql_basic.c opendbx/backends/mysql/mysql_basic.c --- opendbx.orig/backends/mysql/mysql_basic.c 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/mysql/mysql_basic.c 2010-08-01 06:08:38.000000000 +0400 @@ -44,6 +44,10 @@ +static int mysql_counter = 0; + + + /* * ODBX basic operations * MySQL style @@ -69,14 +73,6 @@ return -ODBX_ERR_NOMEM; } - if( mysql_init( (MYSQL*) handle->generic ) == NULL ) - { - free( handle->generic ); - handle->generic = NULL; - - return -ODBX_ERR_NOMEM; - } - if( ( handle->aux = malloc( sizeof( struct myconn ) ) ) == NULL ) { free( handle->generic ); @@ -93,6 +89,9 @@ aux->flags = 0; aux->tls = 0; + aux->flags |= CLIENT_REMEMBER_OPTIONS; // remember options between mysql_real_connect() calls + aux->flags |= CLIENT_FOUND_ROWS; // return the number of found rows, not the number of changed rows + if( host != NULL ) { size_t hlen = strlen( host ) + 1; @@ -125,21 +124,38 @@ return -ODBX_ERR_PARAM; } - if( method != ODBX_BIND_SIMPLE ) { return -ODBX_ERR_NOTSUP; } + if( method != ODBX_BIND_SIMPLE ) + { + return -ODBX_ERR_NOTSUP; + } + + if( mysql_init( (MYSQL*) handle->generic ) == NULL ) + { + return -ODBX_ERR_NOMEM; + } + + mysql_counter++; if( mysql_options( (MYSQL*) handle->generic, MYSQL_READ_DEFAULT_GROUP, "client" ) != 0 ) { + mysql_close( (MYSQL*) handle->generic ); return -ODBX_ERR_BACKEND; } + int err; + char *host = NULL, *socket = NULL; + + if( param->host != NULL && param->host[0] != '/' ) { host = param->host; } + else { socket = param->host; } + switch( param->tls ) { case ODBX_TLS_TRY: param->flags |= CLIENT_SSL; - if( mysql_real_connect( (MYSQL*) handle->generic, param->host, - who, cred, database, param->port, NULL, param->flags ) != NULL ) + if( mysql_real_connect( (MYSQL*) handle->generic, host, + who, cred, database, param->port, socket, param->flags ) != NULL ) { goto SUCCESS; } @@ -157,20 +173,21 @@ param->flags &= ~CLIENT_SSL; } - char *host = NULL, *socket = NULL; - - if( param->host != NULL && param->host[0] != '/' ) { host = param->host; } - else { socket = param->host; } - if( mysql_real_connect( (MYSQL*) handle->generic, host, who, cred, database, param->port, socket, param->flags ) == NULL ) { + mysql_close( (MYSQL*) handle->generic ); return -ODBX_ERR_BACKEND; } SUCCESS: - return mysql_priv_setmode( handle, param->mode ); + if( ( err = mysql_priv_setmode( handle, param->mode ) ) != ODBX_ERR_SUCCESS ) + { + mysql_close( (MYSQL*) handle->generic ); + } + + return err; } @@ -206,13 +223,16 @@ if( handle->generic != NULL ) { - mysql_thread_end(); - mysql_server_end(); /** @todo Might crash if more than one connection is used */ - free( handle->generic ); handle->generic = NULL; } + if( --mysql_counter == 0 ) + { + mysql_thread_end(); + mysql_server_end(); + } + return ODBX_ERR_SUCCESS; } @@ -662,6 +682,9 @@ if( mode != NULL ) { + // For MySQL < 4.1 when explicitly set + if( strlen( mode ) == 0 ) { return ODBX_ERR_SUCCESS; } + modelen = strlen( mode ); lmode = (char*) mode; } diff -ur opendbx.orig/backends/odbc/Makefile.in opendbx/backends/odbc/Makefile.in --- opendbx.orig/backends/odbc/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/odbc/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/odbc/odbc_basic.c opendbx/backends/odbc/odbc_basic.c --- opendbx.orig/backends/odbc/odbc_basic.c 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/odbc/odbc_basic.c 2012-05-09 18:15:08.000000000 +0400 @@ -112,12 +112,13 @@ return -ODBX_ERR_BACKEND; } - gen->err = SQLSetConnectAttr( gen->conn, SQL_DEFAULT_TXN_ISOLATION, (SQLPOINTER) SQL_TXN_READ_COMMITTED, SQL_IS_UINTEGER ); + gen->err = SQLSetConnectAttr( gen->conn, SQL_TXN_ISOLATION, (SQLPOINTER) SQL_TXN_READ_COMMITTED, SQL_IS_UINTEGER ); if( !SQL_SUCCEEDED( gen->err ) ) { return -ODBX_ERR_BACKEND; } +/* Doesn't work with Windows ODBC gen->err = SQLSetConnectAttr( gen->conn, SQL_ATTR_ASYNC_ENABLE, (SQLPOINTER) SQL_ASYNC_ENABLE_ON, SQL_IS_UINTEGER ); if( !SQL_SUCCEEDED( gen->err ) ) { @@ -129,7 +130,7 @@ { return -ODBX_ERR_BACKEND; } - +*/ gen->err = SQLConnect( gen->conn, (SQLCHAR*) gen->server, strlen( gen->server ), (SQLCHAR*) who, wlen, (SQLCHAR*) cred, clen ); if( !SQL_SUCCEEDED( gen->err ) ) { @@ -772,7 +773,7 @@ return 9; case SQL_TIMESTAMP: case SQL_TYPE_TIMESTAMP: - return 20; + return 24; } SQLLEN len = 0; diff -ur opendbx.orig/backends/oracle/Makefile.in opendbx/backends/oracle/Makefile.in --- opendbx.orig/backends/oracle/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/oracle/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/oracle/oracle_basic.c opendbx/backends/oracle/oracle_basic.c --- opendbx.orig/backends/oracle/oracle_basic.c 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/oracle/oracle_basic.c 2010-08-01 06:08:39.000000000 +0400 @@ -175,7 +175,9 @@ "ADDRESS_LIST=(" "ADDRESS=(PROTOCOL=TCP)%s%s" ")" - ")(CONNECT_DATA=(SERVICE_NAME=%s))" + ")" + "(ENABLE=BROKEN)" + "(CONNECT_DATA=(SERVICE_NAME=%s))" ")"; int len; diff -ur opendbx.orig/backends/pgsql/Makefile.in opendbx/backends/pgsql/Makefile.in --- opendbx.orig/backends/pgsql/Makefile.in 2023-05-30 20:27:42.557389013 +0300 +++ opendbx/backends/pgsql/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/pgsql/pgsql_basic.c opendbx/backends/pgsql/pgsql_basic.c --- opendbx.orig/backends/pgsql/pgsql_basic.c 2023-05-30 20:27:42.560389020 +0300 +++ opendbx/backends/pgsql/pgsql_basic.c 2012-06-11 01:15:20.000000000 +0400 @@ -384,6 +384,7 @@ return ODBX_RES_ROWS; /* result is available*/ case PGRES_FATAL_ERROR: + PQconsumeInput( (PGconn*) handle->generic ); if( PQstatus( (PGconn*) handle->generic ) != CONNECTION_OK ) { conn->errtype = -1; diff -ur opendbx.orig/backends/sqlite/Makefile.in opendbx/backends/sqlite/Makefile.in --- opendbx.orig/backends/sqlite/Makefile.in 2023-05-30 20:27:42.560389020 +0300 +++ opendbx/backends/sqlite/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/sqlite3/Makefile.in opendbx/backends/sqlite3/Makefile.in --- opendbx.orig/backends/sqlite3/Makefile.in 2023-05-30 20:27:42.560389020 +0300 +++ opendbx/backends/sqlite3/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/sqlite3/sqlite3_basic.c opendbx/backends/sqlite3/sqlite3_basic.c --- opendbx.orig/backends/sqlite3/sqlite3_basic.c 2023-05-30 20:27:42.561389022 +0300 +++ opendbx/backends/sqlite3/sqlite3_basic.c 2012-05-06 16:02:42.000000000 +0400 @@ -80,6 +80,11 @@ aux->res = NULL; aux->path = NULL; aux->pathlen = 0; + aux->stmt = NULL; + aux->tail = NULL; + aux->length = 0; + aux->err = SQLITE_OK; + handle->generic = NULL; if( host != NULL ) @@ -436,6 +441,8 @@ case SQLITE_DONE: case SQLITE_OK: case SQLITE_MISUSE: // Return DONE if function called more often afterwards + sqlite3_finalize( (sqlite3_stmt*) result->generic ); + result->generic = NULL; return ODBX_ROW_DONE; } @@ -472,6 +479,11 @@ static int sqlite3_odbx_column_type( odbx_result_t* result, unsigned long pos ) { +#ifdef HAVE_SQLITE3_TABLE_COLUMN_METADATA + const char *type, *collation; + int notnull, primarykey, autoinc; +#endif + switch( sqlite3_column_type( (sqlite3_stmt*) result->generic, pos ) ) { case SQLITE_INTEGER: @@ -483,7 +495,32 @@ case SQLITE_TEXT: return ODBX_TYPE_CLOB; default: +#ifdef HAVE_SQLITE3_TABLE_COLUMN_METADATA + if( sqlite3_table_column_metadata( (sqlite3*) result->handle->generic, + sqlite3_column_database_name( (sqlite3_stmt*) result->generic, pos ), + sqlite3_column_table_name( (sqlite3_stmt*) result->generic, pos ), + sqlite3_column_origin_name( (sqlite3_stmt*) result->generic, pos ), + &type, &collation, ¬null, &primarykey, &autoinc ) != SQLITE_OK ) + { + return ODBX_TYPE_UNKNOWN; + } + + if( strstr( type, "DOUBLE" ) != NULL || strcmp( type, "FLOAT" ) == 0 || strcmp( type, "REAL" ) == 0 ) { + return ODBX_TYPE_DOUBLE; + } else if( strstr( type, "INT" ) != NULL || strcmp( type, "BOOLEAN" ) == 0 ) { + return ODBX_TYPE_BIGINT; + } else if( strstr( type, "CHAR" ) != NULL || strcmp( type, "CLOB" ) == 0 || strcmp( type, "TEXT" ) == 0 ) { + return ODBX_TYPE_CLOB; + } else if( strstr( type, "DATE" ) != NULL || strstr( type, "TIME" ) != NULL || strstr( type, "DECIMAL" ) != NULL ) { + return ODBX_TYPE_CLOB; + } else if( strcmp( type, "BLOB" ) == 0 ) { + return ODBX_TYPE_BLOB; + } else { + return ODBX_TYPE_UNKNOWN; + } +#else return ODBX_TYPE_UNKNOWN; +#endif } } diff -ur opendbx.orig/backends/sybase/Makefile.in opendbx/backends/sybase/Makefile.in --- opendbx.orig/backends/sybase/Makefile.in 2023-05-30 20:27:42.565389031 +0300 +++ opendbx/backends/sybase/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/backends/sybase/sybase_basic.c opendbx/backends/sybase/sybase_basic.c --- opendbx.orig/backends/sybase/sybase_basic.c 2023-05-30 20:27:42.565389031 +0300 +++ opendbx/backends/sybase/sybase_basic.c 2010-08-01 06:08:39.000000000 +0400 @@ -75,7 +75,7 @@ return err; } - if( cs_config( aux->ctx, CS_SET, CS_USERDATA, (CS_VOID*) &aux, sizeof( void* ), NULL ) != CS_SUCCEED ) + if( cs_config( aux->ctx, CS_SET, CS_USERDATA, (CS_VOID*) &aux, sizeof( CS_VOID* ), NULL ) != CS_SUCCEED ) { sybase_priv_cleanup( handle ); return -ODBX_ERR_NOMEM; diff -ur opendbx.orig/ChangeLog opendbx/ChangeLog --- opendbx.orig/ChangeLog 2023-05-30 20:27:42.554389007 +0300 +++ opendbx/ChangeLog 2012-06-11 01:30:15.000000000 +0400 @@ -1,3 +1,38 @@ +2012-06-10 Norbert Sendetzky + + * Bugfix: Fixed memory leak in mysql backend when connecting to the server failed (thanks to Stefan Meinecke) + * Bugfix: Fixed handling of NULL indicator in MSSQL backend if NULL is returned in a row + * Bugfix: Added workaround for PostgreSQL in case of an error (e.g. if the server is gone) to give back a correct error status + * Bugfix: Return ODBX_ROW_DONE in sqlite3_odbx_row_fetch() when calling this function after no more rows are available (due to SQLite3 change) + * Bugfix: Added -lintl if required for fixing build problems when using MinGW on Windows platforms + * Bugfix: Added ENABLE_BROKEN to Oracle descriptor for enabling keep-alive + * Bugfix: Added unbind() to Conn::finish() if it's not called before + * Bugfix: Increased buffer for time stamps in ODBC backend to allow fractions of seconds to be stored without an error + * Feature: Enhanced determination of column types in SQLite3 backend when SQLite returns a NULL value + * Feature: Improved recovery from errors in odbx-sql utility + * Change: Updated libtool to 2.2.6b + +2010-04-19 Norbert Sendetzky + + * Change: Changed required autoconf version to 2.61 + * Change: Modified spec file to build firebird, mssql and sybase backends on supported plattforms by default + * Bugfix: Fixed reference counting of objects in libopendbxplus (thanks to Rodolfo Lima) + * Bugfix: Removed ODBC connection attributes which don't work with Windows ODBC + * Bugfix: Fixed wrong error severity in mssql backend when connection couldn't be established + * Bugfix: Fixed wild pointer in oracle backend that my lead to problems when error handling isn't implemented correctly + * Bugfix: Fixed checking for highest error constant so last error message will be displayed correctly + * Bugfix: Adapted spec file for OpenSUSE build service + +2009-09-30 Norbert Sendetzky + + * Change: Changed mysql_real_connect options so odbx_rows_affected() is in line with other backends + * Change: Don't set sql_mode in mysql backend if mode is an empty string (for MySQL < 4.1) + * Bugfix: Fixed segmentation fault in mysql backend in threaded environments + * Bugfix: Fixed mysql_real_connect options to keep options on reconnect + * Bugfix: Fixed uninitialized variables in sqlite3 backend which may lead to a segfault + * Bugfix: Cleanup connection in mysql backend if setting mode failed during odbx_bind() + * Bugfix: Fixed several problems in RPM spec file + 2009-09-02 Norbert Sendetzky * Bugfix: Fixed lost statements in sqlite3 backend if an error or a timeout occured Только в opendbx: compile diff -ur opendbx.orig/config.h.in opendbx/config.h.in --- opendbx.orig/config.h.in 2023-05-30 20:27:42.566389034 +0300 +++ opendbx/config.h.in 2012-06-11 01:33:52.000000000 +0400 @@ -103,6 +103,9 @@ /* Have -lsybdb */ #undef HAVE_LIBSYBDB +/* Have mslib type of "struct dbdaterec" */ +#undef HAVE_LIBSYBDB_MSLIB + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -162,6 +165,9 @@ /* Define to 1 if you have sqlite3_prepare_v2 */ #undef HAVE_SQLITE3_PREPARE_V2 +/* Define to 1 if you have sqlite3_table_column_metadata */ +#undef HAVE_SQLITE3_TABLE_COLUMN_METADATA + /* Define to 1 if you have the header file. */ #undef HAVE_SQLITE_H @@ -189,6 +195,9 @@ /* Define to 1 if you have the `strncasecmp' function. */ #undef HAVE_STRNCASECMP +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + /* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL diff -ur opendbx.orig/configure opendbx/configure --- opendbx.orig/configure 2023-05-30 20:27:42.573389049 +0300 +++ opendbx/configure 2012-06-11 01:33:51.000000000 +0400 @@ -1,12 +1,14 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for opendbx 1.4.3. +# Generated by GNU Autoconf 2.65 for opendbx 1.4.6. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -676,7 +678,8 @@ -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -698,8 +701,8 @@ # Identity of this package. PACKAGE_NAME='opendbx' PACKAGE_TARNAME='opendbx' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='opendbx 1.4.3' +PACKAGE_VERSION='1.4.6' +PACKAGE_STRING='opendbx 1.4.6' PACKAGE_BUGREPORT='http://bugs.linuxnetworks.de/' PACKAGE_URL='' @@ -1482,7 +1485,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures opendbx 1.4.3 to adapt to many kinds of systems. +\`configure' configures opendbx 1.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1552,7 +1555,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of opendbx 1.4.3:";; + short | recursive ) echo "Configuration of opendbx 1.4.6:";; esac cat <<\_ACEOF @@ -1594,7 +1597,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command @@ -1667,8 +1670,8 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -opendbx configure 1.4.3 -generated by GNU Autoconf 2.64 +opendbx configure 1.4.6 +generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -1715,7 +1718,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1761,7 +1764,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1803,7 +1806,7 @@ fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1871,7 +1874,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1976,7 +1979,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -2013,7 +2016,7 @@ ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_cpp @@ -2059,7 +2062,7 @@ # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_cxx_try_link @@ -2130,15 +2133,18 @@ $as_echo_n "(cached) " >&6 else eval "$3=no" + # Order is important - never check a type that is potentially smaller + # than half of the expected target width. for ac_type in int$2_t 'int' 'long int' \ 'long long int' 'short int' 'signed char'; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default + enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(0 < ($ac_type) (((($ac_type) 1 << ($2 - 2)) - 1) * 2 + 1))]; +static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; test_array [0] = 0 ; @@ -2149,11 +2155,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default + enum { N = $2 / 2 - 1 }; int main () { -static int test_array [1 - 2 * !(($ac_type) (((($ac_type) 1 << ($2 - 2)) - 1) * 2 + 1) - < ($ac_type) (((($ac_type) 1 << ($2 - 2)) - 1) * 2 + 2))]; +static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) + < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; test_array [0] = 0 ; @@ -2201,6 +2208,8 @@ $as_echo_n "(cached) " >&6 else eval "$3=no" + # Order is important - never check a type that is potentially smaller + # than half of the expected target width. for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2209,7 +2218,7 @@ int main () { -static int test_array [1 - 2 * !(($ac_type) -1 >> ($2 - 1) == 1)]; +static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0 ; @@ -2332,12 +2341,69 @@ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} } # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES +# ---------------------------------------------------- +# Tries to find if the field MEMBER exists in type AGGR, after including +# INCLUDES, setting cache variable VAR accordingly. +ac_fn_c_check_member () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +$as_echo_n "checking for $2.$3... " >&6; } +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$5 +int +main () +{ +static $2 ac_aggr; +if (sizeof ac_aggr.$3) +return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$4=yes" +else + eval "$4=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$4 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_member cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by opendbx $as_me 1.4.3, which was -generated by GNU Autoconf 2.64. Invocation command line was +It was created by opendbx $as_me 1.4.6, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2590,7 +2656,7 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -2599,9 +2665,9 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -3025,6 +3091,7 @@ fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -3032,7 +3099,6 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -3149,7 +3215,7 @@ # Define the identity of the package. PACKAGE='opendbx' - VERSION='1.4.3' + VERSION='1.4.6' cat >>confdefs.h <<_ACEOF @@ -3912,32 +3978,30 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3999,10 +4063,10 @@ else ac_file='' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -4010,51 +4074,18 @@ { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -4087,13 +4118,72 @@ as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest$ac_cv_exeext +rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -6441,8 +6531,8 @@ -macro_version='2.2.6' -macro_revision='1.3012' +macro_version='2.2.6b' +macro_revision='1.3017' @@ -7042,13 +7132,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7045: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7135: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7048: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7138: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7051: output\"" >&5) + (eval echo "\"\$as_me:7141: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7511,7 +7601,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -8250,7 +8340,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8253 "configure"' > conftest.$ac_ext + echo '#line 8343 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -10078,11 +10168,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10081: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10171: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10085: \$? = $ac_status" >&5 + echo "$as_me:10175: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10247,7 +10337,7 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10417,11 +10507,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10420: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10510: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10424: \$? = $ac_status" >&5 + echo "$as_me:10514: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10522,11 +10612,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10525: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10615: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10529: \$? = $ac_status" >&5 + echo "$as_me:10619: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10577,11 +10667,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10580: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10670: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10584: \$? = $ac_status" >&5 + echo "$as_me:10674: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10720,6 +10810,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -10811,7 +10902,7 @@ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -12273,7 +12364,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -12960,7 +13051,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12963 "configure" +#line 13054 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13056,7 +13147,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 13059 "configure" +#line 13150 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13608,8 +13699,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -14513,8 +14604,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -14898,8 +14989,8 @@ ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -16026,7 +16117,7 @@ inherit_rpath_CXX=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -16854,7 +16945,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -17042,11 +17133,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17045: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17136: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17049: \$? = $ac_status" >&5 + echo "$as_me:17140: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17141,11 +17232,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17144: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17235: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17148: \$? = $ac_status" >&5 + echo "$as_me:17239: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17193,11 +17284,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17196: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17287: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17200: \$? = $ac_status" >&5 + echo "$as_me:17291: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17771,7 +17862,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -18853,7 +18944,7 @@ fi done -for ac_func in getopt memmove memset select setenv snprintf strdup strncasecmp strtol strtoul strtoull +for ac_func in getopt memmove memset select setenv snprintf strdup strncasecmp strstr strtol strtoul strtoull do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -19406,6 +19497,72 @@ fi + ac_fn_c_check_member "$LINENO" "struct dbdaterec" "year" "ac_cv_member_struct_dbdaterec_year" "#include +" +if test "x$ac_cv_member_struct_dbdaterec_year" = x""yes; then : + +$as_echo "#define HAVE_LIBSYBDB_MSLIB 1" >>confdefs.h + +fi + + odbx_saved_libs=${LIBS}; LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dgettext" >&5 +$as_echo_n "checking for library containing dgettext... " >&6; } +if test "${ac_cv_search_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dgettext (); +int +main () +{ +return dgettext (); + ; + return 0; +} +_ACEOF +for ac_lib in '' intl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dgettext=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_dgettext+set}" = set; then : + break +fi +done +if test "${ac_cv_search_dgettext+set}" = set; then : + +else + ac_cv_search_dgettext=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dgettext" >&5 +$as_echo "$ac_cv_search_dgettext" >&6; } +ac_res=$ac_cv_search_dgettext +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + LIBMSSQL="$LIBMSSQL $LIBS" +fi + + LIBS=${odbx_saved_libs} ;; mysql) for ac_header in mysql.h @@ -20275,6 +20432,110 @@ fi + as_ac_Lib=`$as_echo "ac_cv_lib_$LIBSQLITE3''_sqlite3_table_column_metadata" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_table_column_metadata in -l$LIBSQLITE3" >&5 +$as_echo_n "checking for sqlite3_table_column_metadata in -l$LIBSQLITE3... " >&6; } +if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-l$LIBSQLITE3 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char sqlite3_table_column_metadata (); +int +main () +{ +return sqlite3_table_column_metadata (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$as_ac_Lib=yes" +else + eval "$as_ac_Lib=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +eval ac_res=\$$as_ac_Lib + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +eval as_val=\$$as_ac_Lib + if test "x$as_val" = x""yes; then : + +$as_echo "#define HAVE_SQLITE3_TABLE_COLUMN_METADATA 1" >>confdefs.h + + +fi + + odbx_saved_libs=${LIBS}; LIBS="" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dgettext" >&5 +$as_echo_n "checking for library containing dgettext... " >&6; } +if test "${ac_cv_search_dgettext+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dgettext (); +int +main () +{ +return dgettext (); + ; + return 0; +} +_ACEOF +for ac_lib in '' intl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_dgettext=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_dgettext+set}" = set; then : + break +fi +done +if test "${ac_cv_search_dgettext+set}" = set; then : + +else + ac_cv_search_dgettext=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dgettext" >&5 +$as_echo "$ac_cv_search_dgettext" >&6; } +ac_res=$ac_cv_search_dgettext +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + LIBSQLITE3="$LIBSQLITE3 $LIBS" +fi + + LIBS=${odbx_saved_libs} ;; sybase) for ac_header in ctpublic.h @@ -21029,8 +21290,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by opendbx $as_me 1.4.3, which was -generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by opendbx $as_me 1.4.6, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21070,6 +21331,7 @@ -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -21092,10 +21354,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -opendbx config.status 1.4.3 -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +opendbx config.status 1.4.6 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -21133,6 +21396,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -21702,7 +21967,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -21716,7 +21981,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p diff -ur opendbx.orig/configure.ac opendbx/configure.ac --- opendbx.orig/configure.ac 2023-05-30 20:27:42.574389052 +0300 +++ opendbx/configure.ac 2012-06-11 01:32:08.000000000 +0400 @@ -1,8 +1,8 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.64) -AC_INIT([opendbx],[1.4.3],[http://bugs.linuxnetworks.de/]) +AC_PREREQ(2.61) +AC_INIT([opendbx],[1.4.6],[http://bugs.linuxnetworks.de/]) AC_CONFIG_SRCDIR([config.h.in]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -79,7 +79,7 @@ AC_FUNC_REALLOC AC_FUNC_STRTOD AC_FUNC_STRFTIME -AC_CHECK_FUNCS([getopt memmove memset select setenv snprintf strdup strncasecmp strtol strtoul strtoull]) +AC_CHECK_FUNCS([getopt memmove memset select setenv snprintf strdup strncasecmp strstr strtol strtoul strtoull]) # Checks for additional libraries @@ -167,6 +167,10 @@ [AC_DEFINE([HAVE_LIBSYBDB], 1, [Have -lsybdb]) LIBMSSQL="sybdb"], [AC_MSG_ERROR([mssql library (libsybdb) not found])] ) + AC_CHECK_MEMBER([struct dbdaterec.year], [AC_DEFINE([HAVE_LIBSYBDB_MSLIB], 1, [Have mslib type of "struct dbdaterec"])], [], [[#include ]]) + odbx_saved_libs=${LIBS}; LIBS="" + AC_SEARCH_LIBS([dgettext], [intl], [LIBMSSQL="$LIBMSSQL $LIBS"]) + LIBS=${odbx_saved_libs} ;; mysql) AC_CHECK_HEADERS([mysql.h], , [AC_MSG_ERROR([mysql header (mysql.h) not found])], [ @@ -319,6 +323,13 @@ [$LIBSQLITE3], [sqlite3_prepare_v2], [AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], 1, [Define to 1 if you have sqlite3_prepare_v2])] ) + AC_CHECK_LIB( + [$LIBSQLITE3], [sqlite3_table_column_metadata], + [AC_DEFINE([HAVE_SQLITE3_TABLE_COLUMN_METADATA], 1, [Define to 1 if you have sqlite3_table_column_metadata])] + ) + odbx_saved_libs=${LIBS}; LIBS="" + AC_SEARCH_LIBS([dgettext], [intl], [LIBSQLITE3="$LIBSQLITE3 $LIBS"]) + LIBS=${odbx_saved_libs} ;; sybase) AC_CHECK_HEADERS([ctpublic.h], , [AC_MSG_ERROR([sybase header (ctpublic.h) not found])]) diff -ur opendbx.orig/debian/changelog opendbx/debian/changelog --- opendbx.orig/debian/changelog 2023-05-30 20:27:42.574389052 +0300 +++ opendbx/debian/changelog 2012-06-11 01:33:04.000000000 +0400 @@ -1,3 +1,30 @@ +libopendbx (1.4.6-1) unstable; urgency=low + + * New upstream version (stable version) + * Fixed build requirements for Ubuntu + + -- Norbert Sendetzky Sat, 05 May 2012 00:00:00 +0100 + +libopendbx (1.4.5-1) unstable; urgency=medium + + * New upstream version (stable version) + * Fixed build requirements + * Changed debhelper compatibility level to 7 + + -- Norbert Sendetzky Fri, 25 Dec 2009 00:00:00 +0100 + +libopendbx (1.4.4-1) unstable; urgency=medium + + * New upstream version (stable version) + + -- Norbert Sendetzky Fri, 07 Aug 2009 00:00:00 +0100 + +libopendbx (1.4.3-1) unstable; urgency=medium + + * New upstream version (stable version) + + -- Norbert Sendetzky Fri, 07 Aug 2009 00:00:00 +0100 + libopendbx (1.4.2-1) unstable; urgency=medium * New upstream version (stable version) diff -ur opendbx.orig/debian/compat opendbx/debian/compat --- opendbx.orig/debian/compat 2023-05-30 20:27:42.574389052 +0300 +++ opendbx/debian/compat 2010-08-01 06:08:42.000000000 +0400 @@ -1 +1 @@ -4 +7 diff -ur opendbx.orig/debian/control opendbx/debian/control --- opendbx.orig/debian/control 2023-05-30 20:27:42.574389052 +0300 +++ opendbx/debian/control 2012-05-05 14:13:38.000000000 +0400 @@ -1,7 +1,7 @@ Source: libopendbx Priority: optional Maintainer: Norbert Sendetzky -Build-Depends: autoconf, automake, autotools-dev, debhelper (>= 4.0.0), libtool, libmysqlclient-dev, libpq-dev, libsqlite0-dev, libsqlite3-dev, firebird2-dev | firebird2.0-dev, freetds-dev, unixodbc-dev | libiodbc2-dev +Build-Depends: autoconf, automake, autotools-dev, debhelper (>= 4.0.0), libtool, libmysqlclient-dev, libpq-dev, libsqlite0-dev, libsqlite3-dev, firebird2.5-dev | firebird2.1-dev | firebird2.0-dev | firebird2-dev | firebird1.5-dev, freetds-dev, unixodbc-dev | libiodbc2-dev, libreadline-dev, libncurses-dev | libncurses5-dev, docbook2x, doxygen Build-Conflicts: autoconf2.13, automake1.4 Standards-Version: 3.7.3.0 Section: libs diff -ur opendbx.orig/doc/Makefile.in opendbx/doc/Makefile.in --- opendbx.orig/doc/Makefile.in 2023-05-30 20:27:42.575389054 +0300 +++ opendbx/doc/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/doc/opendbx.en.xml opendbx/doc/opendbx.en.xml --- opendbx.orig/doc/opendbx.en.xml 2023-05-30 20:27:42.576389056 +0300 +++ opendbx/doc/opendbx.en.xml 2010-08-01 06:08:41.000000000 +0400 @@ -348,7 +348,7 @@ #include <opendbx/api.h> - char* odbx_column_type + int odbx_column_type odbx_result_t* result unsigned long pos @@ -668,7 +668,7 @@ const char* from unsigned long fromlen char* to - unsigned long tolen + unsigned long* tolen diff -ur opendbx.orig/lib/Makefile.in opendbx/lib/Makefile.in --- opendbx.orig/lib/Makefile.in 2023-05-30 20:27:42.576389056 +0300 +++ opendbx/lib/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/lib/odbx.c opendbx/lib/odbx.c --- opendbx.orig/lib/odbx.c 2023-05-30 20:27:42.576389056 +0300 +++ opendbx/lib/odbx.c 2012-06-11 01:15:43.000000000 +0400 @@ -111,7 +111,7 @@ -/* Depricated: odbx_bind_simple() */ +/* Deprecated: odbx_bind_simple() */ int odbx_bind_simple( odbx_t* handle, const char* database, const char* username, const char* password ) { @@ -241,7 +241,7 @@ return dgettext( "opendbx", odbx_errmsg[ODBX_ERR_HANDLE] ); } - if( error <= ODBX_ERR_SUCCESS && error > -ODBX_MAX_ERRNO ) + if( error <= ODBX_ERR_SUCCESS && error >= -ODBX_MAX_ERRNO ) { return dgettext( "opendbx", odbx_errmsg[-error] ); } @@ -345,6 +345,10 @@ { if( *result ) { (*result)->handle = handle; } } + else + { + *result = NULL; + } return err; } diff -ur opendbx.orig/lib/odbx.cpp opendbx/lib/odbx.cpp --- opendbx.orig/lib/odbx.cpp 2023-05-30 20:27:42.576389056 +0300 +++ opendbx/lib/odbx.cpp 2010-08-01 06:08:41.000000000 +0400 @@ -54,8 +54,6 @@ * OpenDBX large object interface */ - - Lob::Lob( Lob_Iface* impl ) throw( std::exception ) { m_impl = impl; @@ -68,33 +66,25 @@ Lob::Lob( const Lob& ref ) throw() { - if( --(*m_ref) == 0 ) + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + m_ref = new int; + *m_ref = 0; } - m_impl = ref.m_impl; - m_ref = ref.m_ref; ++(*m_ref); } - Lob::~Lob() throw() { - if( --(*m_ref) == 0 ) + if( m_ref != NULL && --(*m_ref) == 0 ) { - try - { delete m_impl; delete m_ref; - } - catch( std::exception& e ) {} } } @@ -102,7 +92,22 @@ Lob& Lob::operator=( const Lob& ref ) throw() { - if( this != &ref ) { Lob( ref ); } + if( m_ref != NULL && --(*m_ref) == 0 ) + { + delete m_impl; + delete m_ref; + } + + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) + { + m_ref = new int; + *m_ref = 0; + } + + ++(*m_ref); return *this; } @@ -150,18 +155,15 @@ Result::Result( const Result& ref ) throw() { - if( --(*m_ref) == 0 ) + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + m_ref = new int; + *m_ref = 0; } - m_impl = ref.m_impl; - m_ref = ref.m_ref; ++(*m_ref); } @@ -169,14 +171,10 @@ Result::~Result() throw() { - if( --(*m_ref) == 0 ) + if( m_ref != NULL && --(*m_ref) == 0 ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + delete m_impl; + delete m_ref; } } @@ -184,7 +182,22 @@ Result& Result::operator=( const Result& ref ) throw() { - if( this != &ref ) { Result( ref ); } + if( m_ref != NULL && --(*m_ref) == 0 ) + { + delete m_impl; + delete m_ref; + } + + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) + { + m_ref = new int; + *m_ref = 0; + } + + ++(*m_ref); return *this; } @@ -287,18 +300,15 @@ Stmt::Stmt( const Stmt& ref ) throw() { - if( --(*m_ref) == 0 ) + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + m_ref = new int; + *m_ref = 0; } - m_impl = ref.m_impl; - m_ref = ref.m_ref; ++(*m_ref); } @@ -306,14 +316,10 @@ Stmt::~Stmt() throw() { - if( --(*m_ref) == 0 ) + if( m_ref != NULL && --(*m_ref) == 0 ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + delete m_impl; + delete m_ref; } } @@ -321,7 +327,22 @@ Stmt& Stmt::operator=( const Stmt& ref ) throw() { - if( this != &ref ) { Stmt( ref ); } + if( m_ref != NULL && --(*m_ref) == 0 ) + { + delete m_impl; + delete m_ref; + } + + m_impl = ref.m_impl; + m_ref = ref.m_ref; + + if( m_ref == NULL ) + { + m_ref = new int; + *m_ref = 0; + } + + ++(*m_ref); return *this; } @@ -384,20 +405,16 @@ Conn::Conn( const Conn& ref ) throw() { - if( m_ref != NULL && --(*m_ref) == 0 ) - { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} - } - m_impl = ref.m_impl; m_ref = ref.m_ref; - if( m_ref != NULL ) { ++(*m_ref); } + if( m_ref == NULL ) + { + m_ref = new int; + *m_ref = 0; + } + + ++(*m_ref); } @@ -406,12 +423,8 @@ { if( m_ref != NULL && --(*m_ref) == 0 ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + delete m_impl; + delete m_ref; } } @@ -421,18 +434,20 @@ { if( m_ref != NULL && --(*m_ref) == 0 ) { - try - { - delete m_impl; - delete m_ref; - } - catch( std::exception& e ) {} + delete m_impl; + delete m_ref; } m_impl = ref.m_impl; m_ref = ref.m_ref; - if( m_ref != NULL ) { ++(*m_ref); } + if( m_ref == NULL ) + { + m_ref = new int; + *m_ref = 0; + } + + ++(*m_ref); return *this; } diff -ur opendbx.orig/lib/odbx_impl.cpp opendbx/lib/odbx_impl.cpp --- opendbx.orig/lib/odbx_impl.cpp 2023-05-30 20:27:42.578389061 +0300 +++ opendbx/lib/odbx_impl.cpp 2012-06-11 01:20:25.000000000 +0400 @@ -512,6 +512,12 @@ { int err; + if( m_unbind ) + { + odbx_unbind( m_handle ); + m_unbind = false; + } + if( ( err = odbx_finish( m_handle ) ) < 0 ) { throw Exception( string( odbx_error( m_handle, err ) ), err, odbx_error_type( m_handle, err ) ); diff -ur opendbx.orig/lib/odbxlib.c opendbx/lib/odbxlib.c --- opendbx.orig/lib/odbxlib.c 2023-05-30 20:27:42.579389063 +0300 +++ opendbx/lib/odbxlib.c 2010-08-01 06:08:41.000000000 +0400 @@ -132,7 +132,7 @@ len = plen = snprintf( lib, ODBX_PATHSIZE, LIBPATH ); len += snprintf( lib + len, ODBX_PATHSIZE - len, "/" ); len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX ); - len += snprintf( lib + len, ODBX_PATHSIZE - len, backend ); + len += snprintf( lib + len, ODBX_PATHSIZE - len, "%s", backend ); len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" ); len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX ); @@ -219,7 +219,7 @@ len = plen = snprintf( lib, ODBX_PATHSIZE, PACKAGE ); len += snprintf( lib + len, ODBX_PATHSIZE - len, "\\" ); len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX ); - len += snprintf( lib + len, ODBX_PATHSIZE - len, backend ); + len += snprintf( lib + len, ODBX_PATHSIZE - len, "%s", backend ); len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" ); len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX ); diff -ur opendbx.orig/lib/opendbx/api opendbx/lib/opendbx/api --- opendbx.orig/lib/opendbx/api 2023-05-30 20:27:42.579389063 +0300 +++ opendbx/lib/opendbx/api 2010-08-01 06:08:41.000000000 +0400 @@ -766,7 +766,7 @@ * Each statement object uses a reference counter to remember if the * internal variables are shared with other objects. If this isn't the * case or if this object is the last one referencing the variables, - * the object is cleanup up and the allocated memory freed. + * the object is cleaned up and the allocated memory freed. */ ~Stmt() throw(); @@ -1268,8 +1268,8 @@ * aren't stored in the database column so only the original string will * be written to the disk. * - * A C++ reference of the third parameter containing the escaped string - * afterwards is also returned by this method to providing the possibility + * A C++ reference of the second parameter containing the escaped string + * afterwards is also returned by this method too, providing the possibility * to write more elegant code. * * @param from Input string with which may contain dangerous characters diff -ur opendbx.orig/ltmain.sh opendbx/ltmain.sh --- opendbx.orig/ltmain.sh 2023-05-30 20:27:42.582389069 +0300 +++ opendbx/ltmain.sh 2012-06-11 01:33:47.000000000 +0400 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-4" +VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then diff -ur opendbx.orig/m4/libtool.m4 opendbx/m4/libtool.m4 --- opendbx.orig/m4/libtool.m4 2023-05-30 20:27:42.584389074 +0300 +++ opendbx/m4/libtool.m4 2012-06-11 01:33:47.000000000 +0400 @@ -2445,7 +2445,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) version_type=linux need_lib_prefix=no need_version=no @@ -3084,7 +3084,7 @@ ;; # This must be Linux ELF. -linux* | k*bsd*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3705,7 +3705,7 @@ ;; esac ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # KAI C++ Compiler @@ -3989,7 +3989,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -4285,6 +4285,7 @@ fi supports_anon_versioning=no case `$LD -v 2>&1` in + *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... @@ -4376,7 +4377,7 @@ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - gnu* | linux* | tpf* | k*bsd*-gnu) + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no if test "$host_os" = linux-dietlibc; then case $cc_basename in @@ -5860,7 +5861,7 @@ _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff -ur opendbx.orig/m4/ltversion.m4 opendbx/m4/ltversion.m4 --- opendbx.orig/m4/ltversion.m4 2023-05-30 20:27:42.584389074 +0300 +++ opendbx/m4/ltversion.m4 2012-06-11 01:33:47.000000000 +0400 @@ -9,15 +9,15 @@ # Generated from ltversion.in. -# serial 3012 ltversion.m4 +# serial 3017 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.2.6b]) +m4_define([LT_PACKAGE_REVISION], [1.3017]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.2.6b' +macro_revision='1.3017' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -ur opendbx.orig/Makefile.in opendbx/Makefile.in --- opendbx.orig/Makefile.in 2023-05-30 20:27:42.554389007 +0300 +++ opendbx/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -39,8 +39,9 @@ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(srcdir)/opendbx.pc.in $(srcdir)/opendbx.spec.in \ $(srcdir)/opendbxplus.pc.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \ - config.rpath config.sub depcomp install-sh ltmain.sh missing + AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \ + config.guess config.rpath config.sub depcomp install-sh \ + ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -407,7 +408,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -432,7 +433,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -596,7 +597,8 @@ fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -640,17 +642,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -ur opendbx.orig/NEWS opendbx/NEWS --- opendbx.orig/NEWS 2023-05-30 20:27:42.554389007 +0300 +++ opendbx/NEWS 2010-08-01 06:08:41.000000000 +0400 @@ -0,0 +1 @@ +Please have a look at the ChangeLog file for updates \ В конце файла нет новой строки diff -ur opendbx.orig/opendbx.spec opendbx/opendbx.spec --- opendbx.orig/opendbx.spec 2023-05-30 20:27:42.585389076 +0300 +++ opendbx/opendbx.spec 2012-06-11 01:34:28.000000000 +0400 @@ -3,24 +3,78 @@ # # By default OpenDBX is build with this backends: # - mysql -# - pgsql # - odbc +# - pgsql # - sqlite3 # to disable use --without [module-name] # # Optional supported backends are: # - firebird # - mssql -# - sqlite # - oracle +# - sqlite # - sybase # to enable use --with [module-name] # +%if 0%{?_with_firebird:1} + %define build_firebird 1 +%endif +%if 0%{!?_without_firebird:1} && 0%{?fedora} >= 12 + %define build_firebird 1 +%endif +%if 0%{!?_without_firebird:1} && 0%{?suse_version} >= 1120 + %define build_firebird 1 +%endif + +%if 0%{?_with_mssql:1} + %define build_mssql 1 +%endif +%if 0%{!?_without_mssql:1} && 0%{?fedora} >= 9 + %define build_mssql 1 +%endif +%if 0%{!?_without_mssql:1} && 0%{?mdkversion} >= 200910 + %define build_mssql 1 +%endif + +%if 0%{!?_without_mysql:1} + %define build_mysql 1 +%endif + +%if 0%{!?_without_odbc:1} + %define build_odbc 1 +%endif + +%if 0%{?_with_oracle:1} + %define build_oracle 1 +%endif + +%if 0%{!?_without_pgsql:1} + %define build_pgsql 1 +%endif + +%if 0%{?_with_sqlite:1} + %define build_sqlite 1 +%endif + +%if 0%{!?_without_sqlite3:1} + %define build_sqlite3 1 +%endif + +%if 0%{?_with_sybase:1} + %define build_sybase 1 +%endif +%if 0%{!?_without_sybase:1} && 0%{?fedora} >= 9 + %define build_mssql 1 +%endif +%if 0%{!?_without_sybase:1} && 0%{?mdkversion} >= 200910 + %define build_mssql 1 +%endif + Name: opendbx -Version: 1.4.3 -Release: 1%{?dist} +Version: 1.4.6 +Release: 1 Summary: Unified database layer with a clean and lightweight interface Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych @@ -28,7 +82,7 @@ License: LGPL URL: http://www.linuxnetworks.de/opendbx/download/ Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++, gettext %description @@ -56,7 +110,7 @@ Group: Applications/Databases Requires: %{name} >= %{version} Requires: readline, ncurses -BuildRequires: gcc-c++, readline, readline-devel, ncurses, ncurses-devel +BuildRequires: gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel %description utils Utility application for manipulating database content either interactively by @@ -86,7 +140,53 @@ Pliki nagłówkowe biblioteki opendbx. -%if %{!?_without_mysql:1}%{?_without_mysql:0} +%if 0%{?build_firebird:1} + +%package firebird +Summary: Firebird/Interbase backend for OpenDBX +Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: firebird +BuildRequires: firebird-devel + +%description firebird +Firebird/Interbase backend for the OpenDBX database abstraction library + +%description firebird -l de.UTF-8 +Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek + +%description firebird -l pl.UTF-8 +Backend bazy danych Firebird dla biblioteki opendbx. + +%endif + + +%if 0%{?build_mssql:1} + +%package mssql +Summary: MS SQL Server backend for OpenDBX +Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: freetds +BuildRequires: freetds-devel + +%description mssql +MS SQL Server backend for the OpenDBX database abstraction library + +%description mssql -l de.UTF-8 +MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek + +%description mssql -l pl.UTF-8 +Backend bazy danych MS SQL dla biblioteki opendbx. + +%endif + + +%if 0%{?build_mysql:1} %package mysql Summary: MySQL backend for OpenDBX @@ -109,7 +209,51 @@ %endif -%if %{!?_without_pgsql:1}%{?_without_pgsql:0} +%if 0%{?build_odbc:1} + +%package odbc +Summary: ODBC backend for OpenDBX +Summary(de.UTF-8): ODBC Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: unixODBC +BuildRequires: unixODBC-devel + +%description odbc +ODBC backend for the OpenDBX database abstraction library + +%description odbc -l de.UTF-8 +ODBC Unterstützung für die OpenDBX Datenbankbibliothek + +%description odbc -l pl.UTF-8 +Backend bazy danych ODBC dla biblioteki opendbx. + +%endif + + +%if 0%{?build_oracle:1} + +%package oracle +Summary: Oracle backend for OpenDBX +Summary(de.UTF-8): Oracle Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description oracle +Oracle ctlib backend for the OpenDBX database abstraction library + +%description oracle -l de.UTF-8 +Oracle Unterstützung für die OpenDBX Datenbankbibliothek + +%description oracle -l pl.UTF-8 +Backend bazy danych Oracle dla biblioteki OpenDBX. + +%endif + + +%if 0%{?build_pgsql:1} %package pgsql Summary: PostgreSQL backend for OpenDBX @@ -132,30 +276,7 @@ %endif -%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0} - -%package sqlite3 -Summary: SQLite3 backend for OpenDBX -Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: sqlite >= 3.0 -BuildRequires: sqlite-devel >= 3.0 - -%description sqlite3 -SQLite3 backend for the OpenDBX database abstraction library - -%description sqlite3 -l de.UTF-8 -Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek - -%description sqlite3 -l pl.UTF-8 -Backend bazy danych sqlite3 dla biblioteki opendbx. - -%endif - - -%if %{?_with_sqlite:1}%{!?_with_sqlite:0} +%if 0%{?build_sqlite:1} %package sqlite Summary: SQLite backend for OpenDBX @@ -178,74 +299,35 @@ %endif -%if %{?_with_firebird:1}%{!?_with_firebird:0} - -%package firebird -Summary: Firebird/Interbase backend for OpenDBX -Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: firebird -BuildRequires: firebird-devel - -%description firebird -Firebird/Interbase backend for the OpenDBX database abstraction library +%if 0%{?build_sqlite3:1} -%description firebird -l de.UTF-8 -Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek - -%description firebird -l pl.UTF-8 -Backend bazy danych Firebird dla biblioteki opendbx. - -%endif - - -%if %{?_with_mssql:1}%{!?_with_mssql:0} - -%package mssql -Summary: MS SQL Server backend for OpenDBX -Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX +%package sqlite3 +Summary: SQLite3 backend for OpenDBX +Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: freetds -BuildRequires: freetds-devel - -%description mssql -MS SQL Server backend for the OpenDBX database abstraction library - -%description mssql -l de.UTF-8 -MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek - -%description mssql -l pl.UTF-8 -Backend bazy danych MS SQL dla biblioteki opendbx. - +%if 0%{?mandriva_version} +Requires: sqlite3 +BuildRequires: sqlite3-devel +%else +Requires: sqlite >= 3.0 +BuildRequires: sqlite-devel >= 3.0 %endif +%description sqlite3 +SQLite3 backend for the OpenDBX database abstraction library -%if %{?_with_oracle:1}%{!?_with_oracle:0} - -%package oracle -Summary: Oracle backend for OpenDBX -Summary(de.UTF-8): Oracle Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description oracle -Oracle ctlib backend for the OpenDBX database abstraction library - -%description oracle -l de.UTF-8 -Oracle Unterstützung für die OpenDBX Datenbankbibliothek +%description sqlite3 -l de.UTF-8 +Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek -%description oracle -l pl.UTF-8 -Backend bazy danych Oracle dla biblioteki OpenDBX. +%description sqlite3 -l pl.UTF-8 +Backend bazy danych sqlite3 dla biblioteki opendbx. %endif -%if %{?_with_sybase:1}%{!?_with_sybase:0} +%if 0%{?build_sybase:1} %package sybase Summary: Sybase backend for OpenDBX @@ -268,62 +350,37 @@ %endif -%if %{!?_without_odbc:1}%{?_without_odbc:0} - -%package odbc -Summary: ODBC backend for OpenDBX -Summary(de.UTF-8): ODBC Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: unixODBC -BuildRequires: unixODBC-devel - -%description odbc -ODBC backend for the OpenDBX database abstraction library - -%description odbc -l de.UTF-8 -ODBC Unterstützung für die OpenDBX Datenbankbibliothek - -%description odbc -l pl.UTF-8 -Backend bazy danych ODBC dla biblioteki opendbx. - -%endif - - %prep -%setup -q +%setup -q -n opendbx-%{version} %build CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS; -LDFLAGS="%{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS; +LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS; %configure \ --disable-rpath \ --disable-static \ --with-backends="\ -%{?_with_firebird:firebird }\ -%{?_with_mssql:mssql }\ -%{!?_without_mysql:mysql }\ -%{!?_without_odbc:odbc }\ -%{?_with_oracle:oracle }\ -%{!?_without_pgsql:pgsql }\ -%{?_with_sqlite:sqlite }\ -%{!?_without_sqlite3:sqlite3 }\ -%{?_with_sybase:sybase }\ +%{?build_firebird:firebird }\ +%{?build_mssql:mssql }\ +%{?build_mysql:mysql }\ +%{?build_odbc:odbc }\ +%{?build_oracle:oracle }\ +%{?build_pgsql:pgsql }\ +%{?build_sqlite:sqlite }\ +%{?build_sqlite3:sqlite3 }\ +%{?build_sybase:sybase }\ " || cat config.log %{__make} %{?_smp_mflags} %install -if test "%{buildroot}" != "/"; then rm -rf %{buildroot}; fi %{__make} DESTDIR=%{buildroot} install +rm %{buildroot}%{_libdir}/lib*.*a rm %{buildroot}%{_libdir}/opendbx/lib*.*a -rm %{buildroot}%{_libdir}/libopendbx.*a -rm %{buildroot}%{_libdir}/libopendbxplus.*a %find_lang %{name} %find_lang %{name}-utils @@ -340,9 +397,9 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%{_libdir}/opendbx %{_libdir}/libopendbx.so.* %{_libdir}/libopendbxplus.so.* +%dir %{_libdir}/opendbx %doc AUTHORS COPYING ChangeLog NEWS README TODO @@ -366,74 +423,81 @@ #%{_mandir}/man3/* -%if %{!?_without_mysql:1}%{?_without_mysql:0} -%files mysql +%if 0%{?build_firebird:1} +%files firebird %defattr(-,root,root,-) -%{_libdir}/opendbx/libmysqlbackend.so* +%{_libdir}/opendbx/libfirebirdbackend.so* %endif -%if %{!?_without_pgsql:1}%{?_without_pgsql:0} -%files pgsql +%if 0%{?build_mssql:1} +%files mssql %defattr(-,root,root,-) -%{_libdir}/opendbx/libpgsqlbackend.so* +%{_libdir}/opendbx/libmssqlbackend.so* %endif -%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0} -%files sqlite3 +%if 0%{?build_mysql:1} +%files mysql %defattr(-,root,root,-) -%{_libdir}/opendbx/libsqlite3backend.so* +%{_libdir}/opendbx/libmysqlbackend.so* %endif -%if %{?_with_sqlite:1}%{!?_with_sqlite:0} -%files sqlite +%if 0%{?build_odbc:1} +%files odbc %defattr(-,root,root,-) -%{_libdir}/opendbx/libsqlitebackend.so* +%{_libdir}/opendbx/libodbcbackend.so* %endif -%if %{?_with_firebird:1}%{!?_with_firebird:0} -%files firebird +%if 0%{?build_oracle:1} +%files oracle %defattr(-,root,root,-) -%{_libdir}/opendbx/libfirebirdbackend.so* +%{_libdir}/opendbx/liboraclebackend.so* %endif -%if %{?_with_mssql:1}%{!?_with_mssql:0} -%files mssql +%if 0%{?build_pgsql:1} +%files pgsql %defattr(-,root,root,-) -%{_libdir}/opendbx/libmssqlbackend.so* +%{_libdir}/opendbx/libpgsqlbackend.so* %endif -%if %{?_with_oracle:1}%{!?_with_oracle:0} -%files oracle +%if 0%{?build_sqlite:1} +%files sqlite %defattr(-,root,root,-) -%{_libdir}/opendbx/liboraclebackend.so* +%{_libdir}/opendbx/libsqlitebackend.so* %endif -%if %{?_with_sybase:1}%{!?_with_sybase:0} -%files sybase +%if 0%{?build_sqlite3:1} +%files sqlite3 %defattr(-,root,root,-) -%{_libdir}/opendbx/libsybasebackend.so* +%{_libdir}/opendbx/libsqlite3backend.so* %endif -%if %{?_with_odbc:1}%{!?_with_odbc:0} -%files odbc +%if 0%{?build_sybase:1} +%files sybase %defattr(-,root,root,-) -%{_libdir}/opendbx/libodbcbackend.so* +%{_libdir}/opendbx/libsybasebackend.so* %endif %changelog -* Wed Sep 02 2009 Norbert Sendetzky 1.4.3-1 -- Added workarounds for RHEL, CentOS and Mandriva regarding readline -- Fixed odbc package in spec file +* Mon Apr 19 2010 Norbert Sendetzky 1.4.5-1 +- Centralized decisions which backends to build +- Build firebird, mssql and sybase backends for supported distributions +- Reordered backends + +* Wed Sep 30 2009 Norbert Sendetzky 1.4.4-1 +- Fixed included backends in main package +- Fixed odbx package - Fixed builds on x86_64 platforms +- Compatible with OpenSUSE build service +- Added workarounds for RHEL, CentOS and Mandriva regarding readline * Sun Apr 19 2009 Norbert Sendetzky 1.4.1-1 - Added opendbxplus.pc diff -ur opendbx.orig/opendbx.spec.in opendbx/opendbx.spec.in --- opendbx.orig/opendbx.spec.in 2023-05-30 20:27:42.585389076 +0300 +++ opendbx/opendbx.spec.in 2010-08-01 06:08:41.000000000 +0400 @@ -3,24 +3,78 @@ # # By default OpenDBX is build with this backends: # - mysql -# - pgsql # - odbc +# - pgsql # - sqlite3 # to disable use --without [module-name] # # Optional supported backends are: # - firebird # - mssql -# - sqlite # - oracle +# - sqlite # - sybase # to enable use --with [module-name] # +%if 0%{?_with_firebird:1} + %define build_firebird 1 +%endif +%if 0%{!?_without_firebird:1} && 0%{?fedora} >= 12 + %define build_firebird 1 +%endif +%if 0%{!?_without_firebird:1} && 0%{?suse_version} >= 1120 + %define build_firebird 1 +%endif + +%if 0%{?_with_mssql:1} + %define build_mssql 1 +%endif +%if 0%{!?_without_mssql:1} && 0%{?fedora} >= 9 + %define build_mssql 1 +%endif +%if 0%{!?_without_mssql:1} && 0%{?mdkversion} >= 200910 + %define build_mssql 1 +%endif + +%if 0%{!?_without_mysql:1} + %define build_mysql 1 +%endif + +%if 0%{!?_without_odbc:1} + %define build_odbc 1 +%endif + +%if 0%{?_with_oracle:1} + %define build_oracle 1 +%endif + +%if 0%{!?_without_pgsql:1} + %define build_pgsql 1 +%endif + +%if 0%{?_with_sqlite:1} + %define build_sqlite 1 +%endif + +%if 0%{!?_without_sqlite3:1} + %define build_sqlite3 1 +%endif + +%if 0%{?_with_sybase:1} + %define build_sybase 1 +%endif +%if 0%{!?_without_sybase:1} && 0%{?fedora} >= 9 + %define build_mssql 1 +%endif +%if 0%{!?_without_sybase:1} && 0%{?mdkversion} >= 200910 + %define build_mssql 1 +%endif + Name: @PACKAGE@ Version: @VERSION@ -Release: 1%{?dist} +Release: 1 Summary: Unified database layer with a clean and lightweight interface Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych @@ -28,7 +82,7 @@ License: LGPL URL: http://www.linuxnetworks.de/opendbx/download/ Source0: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++, gettext %description @@ -56,7 +110,7 @@ Group: Applications/Databases Requires: %{name} >= %{version} Requires: readline, ncurses -BuildRequires: gcc-c++, readline, readline-devel, ncurses, ncurses-devel +BuildRequires: gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel %description utils Utility application for manipulating database content either interactively by @@ -86,7 +140,53 @@ Pliki nagłówkowe biblioteki opendbx. -%if %{!?_without_mysql:1}%{?_without_mysql:0} +%if 0%{?build_firebird:1} + +%package firebird +Summary: Firebird/Interbase backend for OpenDBX +Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: firebird +BuildRequires: firebird-devel + +%description firebird +Firebird/Interbase backend for the OpenDBX database abstraction library + +%description firebird -l de.UTF-8 +Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek + +%description firebird -l pl.UTF-8 +Backend bazy danych Firebird dla biblioteki opendbx. + +%endif + + +%if 0%{?build_mssql:1} + +%package mssql +Summary: MS SQL Server backend for OpenDBX +Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: freetds +BuildRequires: freetds-devel + +%description mssql +MS SQL Server backend for the OpenDBX database abstraction library + +%description mssql -l de.UTF-8 +MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek + +%description mssql -l pl.UTF-8 +Backend bazy danych MS SQL dla biblioteki opendbx. + +%endif + + +%if 0%{?build_mysql:1} %package mysql Summary: MySQL backend for OpenDBX @@ -109,7 +209,51 @@ %endif -%if %{!?_without_pgsql:1}%{?_without_pgsql:0} +%if 0%{?build_odbc:1} + +%package odbc +Summary: ODBC backend for OpenDBX +Summary(de.UTF-8): ODBC Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: unixODBC +BuildRequires: unixODBC-devel + +%description odbc +ODBC backend for the OpenDBX database abstraction library + +%description odbc -l de.UTF-8 +ODBC Unterstützung für die OpenDBX Datenbankbibliothek + +%description odbc -l pl.UTF-8 +Backend bazy danych ODBC dla biblioteki opendbx. + +%endif + + +%if 0%{?build_oracle:1} + +%package oracle +Summary: Oracle backend for OpenDBX +Summary(de.UTF-8): Oracle Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description oracle +Oracle ctlib backend for the OpenDBX database abstraction library + +%description oracle -l de.UTF-8 +Oracle Unterstützung für die OpenDBX Datenbankbibliothek + +%description oracle -l pl.UTF-8 +Backend bazy danych Oracle dla biblioteki OpenDBX. + +%endif + + +%if 0%{?build_pgsql:1} %package pgsql Summary: PostgreSQL backend for OpenDBX @@ -132,30 +276,7 @@ %endif -%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0} - -%package sqlite3 -Summary: SQLite3 backend for OpenDBX -Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: sqlite >= 3.0 -BuildRequires: sqlite-devel >= 3.0 - -%description sqlite3 -SQLite3 backend for the OpenDBX database abstraction library - -%description sqlite3 -l de.UTF-8 -Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek - -%description sqlite3 -l pl.UTF-8 -Backend bazy danych sqlite3 dla biblioteki opendbx. - -%endif - - -%if %{?_with_sqlite:1}%{!?_with_sqlite:0} +%if 0%{?build_sqlite:1} %package sqlite Summary: SQLite backend for OpenDBX @@ -178,74 +299,35 @@ %endif -%if %{?_with_firebird:1}%{!?_with_firebird:0} - -%package firebird -Summary: Firebird/Interbase backend for OpenDBX -Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: firebird -BuildRequires: firebird-devel - -%description firebird -Firebird/Interbase backend for the OpenDBX database abstraction library +%if 0%{?build_sqlite3:1} -%description firebird -l de.UTF-8 -Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek - -%description firebird -l pl.UTF-8 -Backend bazy danych Firebird dla biblioteki opendbx. - -%endif - - -%if %{?_with_mssql:1}%{!?_with_mssql:0} - -%package mssql -Summary: MS SQL Server backend for OpenDBX -Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX +%package sqlite3 +Summary: SQLite3 backend for OpenDBX +Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX +Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: freetds -BuildRequires: freetds-devel - -%description mssql -MS SQL Server backend for the OpenDBX database abstraction library - -%description mssql -l de.UTF-8 -MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek - -%description mssql -l pl.UTF-8 -Backend bazy danych MS SQL dla biblioteki opendbx. - +%if 0%{?mandriva_version} +Requires: sqlite3 +BuildRequires: sqlite3-devel +%else +Requires: sqlite >= 3.0 +BuildRequires: sqlite-devel >= 3.0 %endif +%description sqlite3 +SQLite3 backend for the OpenDBX database abstraction library -%if %{?_with_oracle:1}%{!?_with_oracle:0} - -%package oracle -Summary: Oracle backend for OpenDBX -Summary(de.UTF-8): Oracle Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} - -%description oracle -Oracle ctlib backend for the OpenDBX database abstraction library - -%description oracle -l de.UTF-8 -Oracle Unterstützung für die OpenDBX Datenbankbibliothek +%description sqlite3 -l de.UTF-8 +Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek -%description oracle -l pl.UTF-8 -Backend bazy danych Oracle dla biblioteki OpenDBX. +%description sqlite3 -l pl.UTF-8 +Backend bazy danych sqlite3 dla biblioteki opendbx. %endif -%if %{?_with_sybase:1}%{!?_with_sybase:0} +%if 0%{?build_sybase:1} %package sybase Summary: Sybase backend for OpenDBX @@ -268,62 +350,37 @@ %endif -%if %{!?_without_odbc:1}%{?_without_odbc:0} - -%package odbc -Summary: ODBC backend for OpenDBX -Summary(de.UTF-8): ODBC Unterstützung für OpenDBX -Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: unixODBC -BuildRequires: unixODBC-devel - -%description odbc -ODBC backend for the OpenDBX database abstraction library - -%description odbc -l de.UTF-8 -ODBC Unterstützung für die OpenDBX Datenbankbibliothek - -%description odbc -l pl.UTF-8 -Backend bazy danych ODBC dla biblioteki opendbx. - -%endif - - %prep -%setup -q +%setup -q -n opendbx-%{version} %build CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS; -LDFLAGS="%{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS; +LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS; %configure \ --disable-rpath \ --disable-static \ --with-backends="\ -%{?_with_firebird:firebird }\ -%{?_with_mssql:mssql }\ -%{!?_without_mysql:mysql }\ -%{!?_without_odbc:odbc }\ -%{?_with_oracle:oracle }\ -%{!?_without_pgsql:pgsql }\ -%{?_with_sqlite:sqlite }\ -%{!?_without_sqlite3:sqlite3 }\ -%{?_with_sybase:sybase }\ +%{?build_firebird:firebird }\ +%{?build_mssql:mssql }\ +%{?build_mysql:mysql }\ +%{?build_odbc:odbc }\ +%{?build_oracle:oracle }\ +%{?build_pgsql:pgsql }\ +%{?build_sqlite:sqlite }\ +%{?build_sqlite3:sqlite3 }\ +%{?build_sybase:sybase }\ " || cat config.log %{__make} %{?_smp_mflags} %install -if test "%{buildroot}" != "/"; then rm -rf %{buildroot}; fi %{__make} DESTDIR=%{buildroot} install +rm %{buildroot}%{_libdir}/lib*.*a rm %{buildroot}%{_libdir}/opendbx/lib*.*a -rm %{buildroot}%{_libdir}/libopendbx.*a -rm %{buildroot}%{_libdir}/libopendbxplus.*a %find_lang %{name} %find_lang %{name}-utils @@ -340,9 +397,9 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%{_libdir}/opendbx %{_libdir}/libopendbx.so.* %{_libdir}/libopendbxplus.so.* +%dir %{_libdir}/opendbx %doc AUTHORS COPYING ChangeLog NEWS README TODO @@ -366,74 +423,81 @@ #%{_mandir}/man3/* -%if %{!?_without_mysql:1}%{?_without_mysql:0} -%files mysql +%if 0%{?build_firebird:1} +%files firebird %defattr(-,root,root,-) -%{_libdir}/opendbx/libmysqlbackend.so* +%{_libdir}/opendbx/libfirebirdbackend.so* %endif -%if %{!?_without_pgsql:1}%{?_without_pgsql:0} -%files pgsql +%if 0%{?build_mssql:1} +%files mssql %defattr(-,root,root,-) -%{_libdir}/opendbx/libpgsqlbackend.so* +%{_libdir}/opendbx/libmssqlbackend.so* %endif -%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0} -%files sqlite3 +%if 0%{?build_mysql:1} +%files mysql %defattr(-,root,root,-) -%{_libdir}/opendbx/libsqlite3backend.so* +%{_libdir}/opendbx/libmysqlbackend.so* %endif -%if %{?_with_sqlite:1}%{!?_with_sqlite:0} -%files sqlite +%if 0%{?build_odbc:1} +%files odbc %defattr(-,root,root,-) -%{_libdir}/opendbx/libsqlitebackend.so* +%{_libdir}/opendbx/libodbcbackend.so* %endif -%if %{?_with_firebird:1}%{!?_with_firebird:0} -%files firebird +%if 0%{?build_oracle:1} +%files oracle %defattr(-,root,root,-) -%{_libdir}/opendbx/libfirebirdbackend.so* +%{_libdir}/opendbx/liboraclebackend.so* %endif -%if %{?_with_mssql:1}%{!?_with_mssql:0} -%files mssql +%if 0%{?build_pgsql:1} +%files pgsql %defattr(-,root,root,-) -%{_libdir}/opendbx/libmssqlbackend.so* +%{_libdir}/opendbx/libpgsqlbackend.so* %endif -%if %{?_with_oracle:1}%{!?_with_oracle:0} -%files oracle +%if 0%{?build_sqlite:1} +%files sqlite %defattr(-,root,root,-) -%{_libdir}/opendbx/liboraclebackend.so* +%{_libdir}/opendbx/libsqlitebackend.so* %endif -%if %{?_with_sybase:1}%{!?_with_sybase:0} -%files sybase +%if 0%{?build_sqlite3:1} +%files sqlite3 %defattr(-,root,root,-) -%{_libdir}/opendbx/libsybasebackend.so* +%{_libdir}/opendbx/libsqlite3backend.so* %endif -%if %{?_with_odbc:1}%{!?_with_odbc:0} -%files odbc +%if 0%{?build_sybase:1} +%files sybase %defattr(-,root,root,-) -%{_libdir}/opendbx/libodbcbackend.so* +%{_libdir}/opendbx/libsybasebackend.so* %endif %changelog -* Wed Sep 02 2009 Norbert Sendetzky 1.4.3-1 -- Added workarounds for RHEL, CentOS and Mandriva regarding readline -- Fixed odbc package in spec file +* Mon Apr 19 2010 Norbert Sendetzky 1.4.5-1 +- Centralized decisions which backends to build +- Build firebird, mssql and sybase backends for supported distributions +- Reordered backends + +* Wed Sep 30 2009 Norbert Sendetzky 1.4.4-1 +- Fixed included backends in main package +- Fixed odbx package - Fixed builds on x86_64 platforms +- Compatible with OpenSUSE build service +- Added workarounds for RHEL, CentOS and Mandriva regarding readline * Sun Apr 19 2009 Norbert Sendetzky 1.4.1-1 - Added opendbxplus.pc Двоичные файлы opendbx.orig/po/de.gmo и opendbx/po/de.gmo различаются diff -ur opendbx.orig/po/de.po opendbx/po/de.po --- opendbx.orig/po/de.po 2023-05-30 20:27:42.586389078 +0300 +++ opendbx/po/de.po 2012-06-11 01:58:10.000000000 +0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: OpenDBX 1.3.0\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" "PO-Revision-Date: 2007-02-18 00:00+0100\n" "Last-Translator: Norbert Sendetzky \n" "Language-Team: de \n" Двоичные файлы opendbx.orig/po/en@quot.gmo и opendbx/po/en@quot.gmo различаются diff -ur opendbx.orig/po/en@quot.po opendbx/po/en@quot.po --- opendbx.orig/po/en@quot.po 2023-05-30 20:27:42.586389078 +0300 +++ opendbx/po/en@quot.po 2012-06-11 01:58:10.000000000 +0400 @@ -1,7 +1,7 @@ # English translations for opendbx package. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the opendbx package. -# Automatically generated, 2009. +# Automatically generated, 2012. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: opendbx 1.4.3\n" +"Project-Id-Version: opendbx 1.4.6\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" -"PO-Revision-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" +"PO-Revision-Date: 2012-06-10 23:58+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" diff -ur opendbx.orig/po/opendbx.pot opendbx/po/opendbx.pot --- opendbx.orig/po/opendbx.pot 2023-05-30 20:27:42.586389078 +0300 +++ opendbx/po/opendbx.pot 2012-06-11 01:58:10.000000000 +0400 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: opendbx 1.4.3\n" +"Project-Id-Version: opendbx 1.4.6\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -ur opendbx.orig/test/Makefile.in opendbx/test/Makefile.in --- opendbx.orig/test/Makefile.in 2023-05-30 20:27:42.587389081 +0300 +++ opendbx/test/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/test/odbxplus-regression.cpp opendbx/test/odbxplus-regression.cpp --- opendbx.orig/test/odbxplus-regression.cpp 2023-05-30 20:27:42.587389081 +0300 +++ opendbx/test/odbxplus-regression.cpp 2012-05-06 14:13:47.000000000 +0400 @@ -293,11 +293,15 @@ } // Test case: Calling getRow() more often must not result in error - result.getRow(); + if( result.getRow() != ODBX_ROW_DONE ) { + throw std::runtime_error( string( "Sub-sequent calls to getRow() don't return ODBX_RES_DONE" ) ); + } } // Test case: Calling getResult() more often must not result in error - result.getResult(); + if( result.getResult() != ODBX_RES_DONE ) { + throw std::runtime_error( string( "Sub-sequent calls to getResult() don't return ODBX_RES_DONE" ) ); + } result.finish(); } diff -ur opendbx.orig/test/odbxtest.sh opendbx/test/odbxtest.sh --- opendbx.orig/test/odbxtest.sh 2023-05-30 20:27:42.587389081 +0300 +++ opendbx/test/odbxtest.sh 2012-05-06 16:10:59.000000000 +0400 @@ -12,13 +12,13 @@ ODBXAPP="./odbxtest ./odbxplustest" # Import database parameter -. odbxtest.site +. ./odbxtest.site # compare results -function odbxcompare () +odbxcompare () { - diff test.out ref/$1.ref > /dev/null + diff -b test.out ref/$1.ref > /dev/null if test $? -eq 1 then diff -ur opendbx.orig/test/ref/sqlite3.ref opendbx/test/ref/sqlite3.ref --- opendbx.orig/test/ref/sqlite3.ref 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/test/ref/sqlite3.ref 2012-05-06 16:09:38.000000000 +0400 @@ -1,21 +1,21 @@ ODBX_CAP_BASIC: 1 ODBX_CAP_LO: 0 - ODBX_OPT_API_VERSION: 10200 - ODBX_OPT_THREAD_SAFE: 1 - ODBX_OPT_TLS: 0 - ODBX_OPT_CONNECT_TIMEOUT: 0 + ODBX_OPT_API_VERSION: 10200 + ODBX_OPT_THREAD_SAFE: 1 + ODBX_OPT_TLS: 0 + ODBX_OPT_CONNECT_TIMEOUT: 0 ODBX_OPT_MULTI_STATEMENTS: 1 (using) - ODBX_OPT_PAGED_RESULTS: 0 - ODBX_OPT_COMPRESS: 0 + ODBX_OPT_PAGED_RESULTS: 0 + ODBX_OPT_COMPRESS: 0 ODBX_CAP_BASIC: 1 ODBX_CAP_LO: 0 - ODBX_OPT_API_VERSION: 10200 - ODBX_OPT_THREAD_SAFE: 1 - ODBX_OPT_TLS: 0 - ODBX_OPT_CONNECT_TIMEOUT: 0 + ODBX_OPT_API_VERSION: 10200 + ODBX_OPT_THREAD_SAFE: 1 + ODBX_OPT_TLS: 0 + ODBX_OPT_CONNECT_TIMEOUT: 0 ODBX_OPT_MULTI_STATEMENTS: 1 (using) - ODBX_OPT_PAGED_RESULTS: 0 - ODBX_OPT_COMPRESS: 0 + ODBX_OPT_PAGED_RESULTS: 0 + ODBX_OPT_COMPRESS: 0 Affected rows: 0 Affected rows: 1 Affected rows: 1 @@ -39,7 +39,7 @@ column 16 (type 32): timestmp = '1999-01-01 00:00:00' column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06' column 18 (type 32): dateval = '1999-01-01' - column 0 (type 255): i1 = NULL + column 0 (type 3): i1 = NULL column 1 (type 3): i16 = '2' column 2 (type 3): i32 = '4' column 3 (type 3): i64 = '8' @@ -49,7 +49,7 @@ column 7 (type 9): f8 = '8.5' column 8 (type 32): c2 = 'FR' column 9 (type 32): nc12 = 'éçèéçè' - column 10 (type 255): str20 = NULL + column 10 (type 32): str20 = NULL column 11 (type 32): nstr24 = 'éçèéçèéçèéçè' column 12 (type 32): clob64k = 'text' column 13 (type 32): nclob64k = 'éçè very long national text éçè' @@ -101,7 +101,7 @@ column 16 (type 32): timestmp = '1999-01-01 00:00:00' column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06' column 18 (type 32): dateval = '1999-01-01' - column 0 (type 255): i1 = NULL + column 0 (type 3): i1 = NULL column 1 (type 3): i16 = '2' column 2 (type 3): i32 = '4' column 3 (type 3): i64 = '8' @@ -111,7 +111,7 @@ column 7 (type 9): f8 = '8.5' column 8 (type 32): c2 = 'FR' column 9 (type 32): nc12 = 'éçèéçè' - column 10 (type 255): str20 = NULL + column 10 (type 32): str20 = NULL column 11 (type 32): nstr24 = 'éçèéçèéçèéçè' column 12 (type 32): clob64k = 'text' column 13 (type 32): nclob64k = 'éçè very long national text éçè' diff -ur opendbx.orig/utils/argmap.cpp opendbx/utils/argmap.cpp --- opendbx.orig/utils/argmap.cpp 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/utils/argmap.cpp 2011-10-12 23:33:12.000000000 +0400 @@ -3,19 +3,8 @@ * (c) 2006-2008, Norbert Sendetzky * Inspired by PowerDNS ArgvMap code * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Distributed under the terms of the GNU Library General Public Licence + * version 2 or (at your option) any later version. */ diff -ur opendbx.orig/utils/argmap.hpp opendbx/utils/argmap.hpp --- opendbx.orig/utils/argmap.hpp 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/utils/argmap.hpp 2011-10-12 23:33:18.000000000 +0400 @@ -3,19 +3,8 @@ * (c) 2006-2008, Norbert Sendetzky * Inspired by PowerDNS ArgvMap code * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Distributed under the terms of the GNU Library General Public Licence + * version 2 or (at your option) any later version. */ diff -ur opendbx.orig/utils/doc/Makefile.in opendbx/utils/doc/Makefile.in --- opendbx.orig/utils/doc/Makefile.in 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/utils/doc/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff -ur opendbx.orig/utils/Makefile.am opendbx/utils/Makefile.am --- opendbx.orig/utils/Makefile.am 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/utils/Makefile.am 2012-06-11 01:19:35.000000000 +0400 @@ -8,7 +8,7 @@ odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\" -odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) -lreadline -lncurses +odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) $(LTLIBINTL) -lreadline -lncurses EXTRA_DIST = keywords pkgdata_DATA = keywords diff -ur opendbx.orig/utils/Makefile.in opendbx/utils/Makefile.in --- opendbx.orig/utils/Makefile.in 2023-05-30 20:27:42.588389083 +0300 +++ opendbx/utils/Makefile.in 2012-06-11 01:33:53.000000000 +0400 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -63,8 +63,10 @@ @ENABLEUTILS_TRUE@ odbx_sql-completion.$(OBJEXT) \ @ENABLEUTILS_TRUE@ odbx_sql-odbx-sql.$(OBJEXT) odbx_sql_OBJECTS = $(am_odbx_sql_OBJECTS) +am__DEPENDENCIES_1 = @ENABLEUTILS_TRUE@odbx_sql_DEPENDENCIES = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) \ -@ENABLEUTILS_TRUE@ ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) +@ENABLEUTILS_TRUE@ ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) \ +@ENABLEUTILS_TRUE@ $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -313,7 +315,7 @@ @ENABLEUTILS_TRUE@INCLUDES = -I../lib @ENABLEUTILS_TRUE@odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp @ENABLEUTILS_TRUE@odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\" -@ENABLEUTILS_TRUE@odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) -lreadline -lncurses +@ENABLEUTILS_TRUE@odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) $(LTLIBINTL) -lreadline -lncurses @ENABLEUTILS_TRUE@EXTRA_DIST = keywords @ENABLEUTILS_TRUE@pkgdata_DATA = keywords all: all-recursive @@ -518,7 +520,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -543,7 +545,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ diff -ur opendbx.orig/utils/odbx-sql.cpp opendbx/utils/odbx-sql.cpp --- opendbx.orig/utils/odbx-sql.cpp 2023-05-30 20:27:42.589389085 +0300 +++ opendbx/utils/odbx-sql.cpp 2012-06-11 01:13:23.000000000 +0400 @@ -146,7 +146,7 @@ { len = strlen( line ); sql += "\n" + string( line, len ); - free( line ); + ::free( line ); if( sql[sql.size()-1] == ';' ) { break; } } @@ -228,11 +228,16 @@ rl_completion_entry_function = &complete; Conn conn( A.asString( "backend" ), A.asString( "host" ), A.asString( "port" ) ); - conn.bind( A.asString( "database" ), A.asString( "username" ), A.asString( "password" ) ); - loopstmts( conn, &fparam, A.mustDo( "interactive" ) ); + while( 1 ) + { + conn.bind( A.asString( "database" ), A.asString( "username" ), A.asString( "password" ) ); + + loopstmts( conn, &fparam, A.mustDo( "interactive" ) ); + + conn.unbind(); + } - conn.finish(); delete g_comp; } catch( std::runtime_error &e ) Двоичные файлы opendbx.orig/utils/po/de.gmo и opendbx/utils/po/de.gmo различаются diff -ur opendbx.orig/utils/po/de.po opendbx/utils/po/de.po --- opendbx.orig/utils/po/de.po 2023-05-30 20:27:42.589389085 +0300 +++ opendbx/utils/po/de.po 2012-06-11 01:58:10.000000000 +0400 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: opendbx 1.3.7\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" "PO-Revision-Date: 2008-04-04 00:18+0200\n" "Last-Translator: \n" "Language-Team: German\n" @@ -108,11 +108,11 @@ msgid "Password: " msgstr "Passwort: " -#: utils/odbx-sql.cpp:240 +#: utils/odbx-sql.cpp:245 msgid "Error: " msgstr "Fehler: " -#: utils/odbx-sql.cpp:245 +#: utils/odbx-sql.cpp:250 msgid "Error: Caught unknown exception" msgstr "Fehler: Es ist eine unbekannte Ausnahme aufgetreten" Двоичные файлы opendbx.orig/utils/po/en@quot.gmo и opendbx/utils/po/en@quot.gmo различаются diff -ur opendbx.orig/utils/po/en@quot.po opendbx/utils/po/en@quot.po --- opendbx.orig/utils/po/en@quot.po 2023-05-30 20:27:42.589389085 +0300 +++ opendbx/utils/po/en@quot.po 2012-06-11 01:58:10.000000000 +0400 @@ -1,7 +1,7 @@ # English translations for opendbx package. -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2012 Free Software Foundation, Inc. # This file is distributed under the same license as the opendbx package. -# Automatically generated, 2009. +# Automatically generated, 2012. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: opendbx 1.4.3\n" +"Project-Id-Version: opendbx 1.4.6\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" -"PO-Revision-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" +"PO-Revision-Date: 2012-06-10 23:58+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -126,10 +126,10 @@ msgid "Password: " msgstr "Password: " -#: utils/odbx-sql.cpp:240 +#: utils/odbx-sql.cpp:245 msgid "Error: " msgstr "Error: " -#: utils/odbx-sql.cpp:245 +#: utils/odbx-sql.cpp:250 msgid "Error: Caught unknown exception" msgstr "Error: Caught unknown exception" diff -ur opendbx.orig/utils/po/opendbx-utils.pot opendbx/utils/po/opendbx-utils.pot --- opendbx.orig/utils/po/opendbx-utils.pot 2023-05-30 20:27:42.590389087 +0300 +++ opendbx/utils/po/opendbx-utils.pot 2012-06-11 01:58:10.000000000 +0400 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: opendbx 1.4.3\n" +"Project-Id-Version: opendbx 1.4.6\n" "Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n" -"POT-Creation-Date: 2009-08-30 14:05+0200\n" +"POT-Creation-Date: 2012-06-10 23:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,10 +104,10 @@ msgid "Password: " msgstr "" -#: utils/odbx-sql.cpp:240 +#: utils/odbx-sql.cpp:245 msgid "Error: " msgstr "" -#: utils/odbx-sql.cpp:245 +#: utils/odbx-sql.cpp:250 msgid "Error: Caught unknown exception" msgstr ""