Attachment #13305 for bug #46314

View | Details | Raw Unified | Return to bug 46314
Collapse All | Expand All




# 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.


m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
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'.])])

[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.1], [],
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])


# 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.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

Lines 1-4 Link Here

(-)opendbx.orig/backends/firebird/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 1-4 Link Here

(-)opendbx.orig/backends/Makefile.in (-3 / +3 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Lines 298-304 Link Here
298	# (which will cause the Makefiles to be regenerated when you run `make');	298	# (which will cause the Makefiles to be regenerated when you run `make');
299	# (2) otherwise, pass the desired values on the `make' command line.	299	# (2) otherwise, pass the desired values on the `make' command line.
300	$(RECURSIVE_TARGETS):	300	$(RECURSIVE_TARGETS):
301	@failcom='exit 1'; \	301	@fail= failcom='exit 1'; \
302	for f in x $$MAKEFLAGS; do \	302	for f in x $$MAKEFLAGS; do \
303	case $$f in \	303	case $$f in \
304	= \| --[!k]*);; \	304	= \| --[!k]*);; \
Lines 323-329 Link Here
323	fi; test -z "$$fail"	323	fi; test -z "$$fail"
324		324
325	$(RECURSIVE_CLEAN_TARGETS):	325	$(RECURSIVE_CLEAN_TARGETS):
326	@failcom='exit 1'; \	326	@fail= failcom='exit 1'; \
327	for f in x $$MAKEFLAGS; do \	327	for f in x $$MAKEFLAGS; do \
328	case $$f in \	328	case $$f in \
329	= \| --[!k]*);; \	329	= \| --[!k]*);; \

Lines 1-4 Link Here

(-)opendbx.orig/backends/mssql/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 132-137 Link Here

(-)opendbx.orig/backends/mssql/mssql_basic.c (-3 / +14 lines)
132	if( ( handle->generic = (void*) dbopen( tc->login, tc->host ) ) == NULL )	132	if( ( handle->generic = (void*) dbopen( tc->login, tc->host ) ) == NULL )
133	{	133	{
134	memcpy( tc->errmsg, dgettext( "opendbx", mssql_odbx_errmsg[0] ), strlen( dgettext( "opendbx", mssql_odbx_errmsg[0] ) ) + 1 );	134	memcpy( tc->errmsg, dgettext( "opendbx", mssql_odbx_errmsg[0] ), strlen( dgettext( "opendbx", mssql_odbx_errmsg[0] ) ) + 1 );
		135	tc->errtype = 1;
		136
135	return -ODBX_ERR_BACKEND;	137	return -ODBX_ERR_BACKEND;
136	}	138	}
137		139
Lines 458-464 Link Here
458		460
459	for( i = 0; i < ares->cols; i++ )	461	for( i = 0; i < ares->cols; i++ )
460	{	462	{
461	if( ( data = dbdata( dbproc, i+1 ) ) == NULL )	463	if( ( dlen = dbdatlen( dbproc, i+1 ) ) == -1 )
		464	{
		465	return -ODBX_ERR_SIZE;
		466	}
		467
		468	if( ( data = dbdata( dbproc, i+1 ) ) == NULL && dlen == 0 )
462	{	469	{
463	gres[i].ind = 1; // column is NULL	470	gres[i].ind = 1; // column is NULL
464	gres[i].length = 0;	471	gres[i].length = 0;
Lines 472-485 Link Here
472	case SYBDATETIMN:	479	case SYBDATETIMN:
473	if( dbdatecrack( dbproc, &di, (DBDATETIME*) data ) != FAIL )	480	if( dbdatecrack( dbproc, &di, (DBDATETIME*) data ) != FAIL )
474	{	481	{
		482	#ifdef HAVE_LIBSYBDB_MSLIB
		483	gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
		484	(long) di.year, (long) di.month+1, (long) di.day, (long) di.hour, (long) di.minute, (long) di.second );
		485	#else
475	gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",	486	gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
476	(long) di.dateyear, (long) di.datemonth+1, (long) di.datedmonth, (long) di.datehour, (long) di.dateminute, (long) di.datesecond );	487	(long) di.dateyear, (long) di.datemonth+1, (long) di.datedmonth, (long) di.datehour, (long) di.dateminute, (long) di.datesecond );
		488	#endif
477	}	489	}
478	continue;	490	continue;
479	}	491	}
480		492
481	dlen = dbdatlen( dbproc, i+1 );
482
483	if( gres[i].mlen < dlen + 1 )	493	if( gres[i].mlen < dlen + 1 )
484	{	494	{
485	if( ( gres[i].value = realloc( gres[i].value, dlen + 1 ) ) == NULL )	495	if( ( gres[i].value = realloc( gres[i].value, dlen + 1 ) ) == NULL )
Lines 492-497 Link Here
492		502
493	gres[i].length = dbconvert( dbproc, dbcoltype( dbproc, i+1 ), data, dlen, SYBVARCHAR, gres[i].value, gres[i].mlen );	503	gres[i].length = dbconvert( dbproc, dbcoltype( dbproc, i+1 ), data, dlen, SYBVARCHAR, gres[i].value, gres[i].mlen );
494	gres[i].value[gres[i].length] = 0;	504	gres[i].value[gres[i].length] = 0;
		505	gres[i].ind = 0; // column is not NULL
495	}	506	}
496		507
497	return ODBX_ROW_NEXT;	508	return ODBX_ROW_NEXT;

Lines 1-4 Link Here

(-)opendbx.orig/backends/mysql/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 44-49 Link Here

(-)opendbx.orig/backends/mysql/mysql_basic.c (-20 / +43 lines)
44		44
45		45
46		46
		47	static int mysql_counter = 0;
		48
		49
		50
47	/*	51	/*
48	* ODBX basic operations	52	* ODBX basic operations
49	* MySQL style	53	* MySQL style
Lines 69-82 Link Here
69	return -ODBX_ERR_NOMEM;	73	return -ODBX_ERR_NOMEM;
70	}	74	}
71		75
72	if( mysql_init( (MYSQL*) handle->generic ) == NULL )
73	{
74	free( handle->generic );
75	handle->generic = NULL;
76
77	return -ODBX_ERR_NOMEM;
78	}
79
80	if( ( handle->aux = malloc( sizeof( struct myconn ) ) ) == NULL )	76	if( ( handle->aux = malloc( sizeof( struct myconn ) ) ) == NULL )
81	{	77	{
82	free( handle->generic );	78	free( handle->generic );
Lines 93-98 Link Here
93	aux->flags = 0;	89	aux->flags = 0;
94	aux->tls = 0;	90	aux->tls = 0;
95		91
		92	aux->flags \|= CLIENT_REMEMBER_OPTIONS; // remember options between mysql_real_connect() calls
		93	aux->flags \|= CLIENT_FOUND_ROWS; // return the number of found rows, not the number of changed rows
		94
96	if( host != NULL )	95	if( host != NULL )
97	{	96	{
98	size_t hlen = strlen( host ) + 1;	97	size_t hlen = strlen( host ) + 1;
Lines 125-145 Link Here
125	return -ODBX_ERR_PARAM;	124	return -ODBX_ERR_PARAM;
126	}	125	}
127		126
128	if( method != ODBX_BIND_SIMPLE ) { return -ODBX_ERR_NOTSUP; }	127	if( method != ODBX_BIND_SIMPLE )
		128	{
		129	return -ODBX_ERR_NOTSUP;
		130	}
		131
		132	if( mysql_init( (MYSQL*) handle->generic ) == NULL )
		133	{
		134	return -ODBX_ERR_NOMEM;
		135	}
		136
		137	mysql_counter++;
129		138
130	if( mysql_options( (MYSQL*) handle->generic, MYSQL_READ_DEFAULT_GROUP, "client" ) != 0 )	139	if( mysql_options( (MYSQL*) handle->generic, MYSQL_READ_DEFAULT_GROUP, "client" ) != 0 )
131	{	140	{
		141	mysql_close( (MYSQL*) handle->generic );
132	return -ODBX_ERR_BACKEND;	142	return -ODBX_ERR_BACKEND;
133	}	143	}
134		144
		145	int err;
		146	char host = NULL, socket = NULL;
		147
		148	if( param->host != NULL && param->host[0] != '/' ) { host = param->host; }
		149	else { socket = param->host; }
		150
135	switch( param->tls )	151	switch( param->tls )
136	{	152	{
137	case ODBX_TLS_TRY:	153	case ODBX_TLS_TRY:
138		154
139	param->flags \|= CLIENT_SSL;	155	param->flags \|= CLIENT_SSL;
140		156
141	if( mysql_real_connect( (MYSQL*) handle->generic, param->host,	157	if( mysql_real_connect( (MYSQL*) handle->generic, host,
142	who, cred, database, param->port, NULL, param->flags ) != NULL )	158	who, cred, database, param->port, socket, param->flags ) != NULL )
143	{	159	{
144	goto SUCCESS;	160	goto SUCCESS;
145	}	161	}
Lines 157-176 Link Here
157	param->flags &= ~CLIENT_SSL;	173	param->flags &= ~CLIENT_SSL;
158	}	174	}
159		175
160	char host = NULL, socket = NULL;
161
162	if( param->host != NULL && param->host[0] != '/' ) { host = param->host; }
163	else { socket = param->host; }
164
165	if( mysql_real_connect( (MYSQL*) handle->generic, host,	176	if( mysql_real_connect( (MYSQL*) handle->generic, host,
166	who, cred, database, param->port, socket, param->flags ) == NULL )	177	who, cred, database, param->port, socket, param->flags ) == NULL )
167	{	178	{
		179	mysql_close( (MYSQL*) handle->generic );
168	return -ODBX_ERR_BACKEND;	180	return -ODBX_ERR_BACKEND;
169	}	181	}
170		182
171	SUCCESS:	183	SUCCESS:
172		184
173	return mysql_priv_setmode( handle, param->mode );	185	if( ( err = mysql_priv_setmode( handle, param->mode ) ) != ODBX_ERR_SUCCESS )
		186	{
		187	mysql_close( (MYSQL*) handle->generic );
		188	}
		189
		190	return err;
174	}	191	}
175		192
176		193
Lines 206-218 Link Here
206		223
207	if( handle->generic != NULL )	224	if( handle->generic != NULL )
208	{	225	{
209	mysql_thread_end();
210	mysql_server_end(); /** @todo Might crash if more than one connection is used */
211
212	free( handle->generic );	226	free( handle->generic );
213	handle->generic = NULL;	227	handle->generic = NULL;
214	}	228	}
215		229
		230	if( --mysql_counter == 0 )
		231	{
		232	mysql_thread_end();
		233	mysql_server_end();
		234	}
		235
216	return ODBX_ERR_SUCCESS;	236	return ODBX_ERR_SUCCESS;
217	}	237	}
218		238
Lines 662-667 Link Here
662		682
663	if( mode != NULL )	683	if( mode != NULL )
664	{	684	{
		685	// For MySQL < 4.1 when explicitly set
		686	if( strlen( mode ) == 0 ) { return ODBX_ERR_SUCCESS; }
		687
665	modelen = strlen( mode );	688	modelen = strlen( mode );
666	lmode = (char*) mode;	689	lmode = (char*) mode;
667	}	690	}

Lines 1-4 Link Here

(-)opendbx.orig/backends/odbc/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,




		return -ODBX_ERR_BACKEND;
	}

	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 ) )
	{

	{
		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 ) )
	{

			return 9;
		case SQL_TIMESTAMP:
		case SQL_TYPE_TIMESTAMP:
			return 24;
	}

	SQLLEN len = 0;

Lines 1-4 Link Here

(-)opendbx.orig/backends/oracle/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 175-181 Link Here

(-)opendbx.orig/backends/oracle/oracle_basic.c (-1 / +3 lines)
175	"ADDRESS_LIST=("	175	"ADDRESS_LIST=("
176	"ADDRESS=(PROTOCOL=TCP)%s%s"	176	"ADDRESS=(PROTOCOL=TCP)%s%s"
177	")"	177	")"
178	")(CONNECT_DATA=(SERVICE_NAME=%s))"	178	")"
		179	"(ENABLE=BROKEN)"
		180	"(CONNECT_DATA=(SERVICE_NAME=%s))"
179	")";	181	")";
180		182
181	int len;	183	int len;

Lines 1-4 Link Here

(-)opendbx.orig/backends/pgsql/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 384-389 Link Here

(-)opendbx.orig/backends/pgsql/pgsql_basic.c (+1 lines)
384	return ODBX_RES_ROWS; /* result is available*/	384	return ODBX_RES_ROWS; /* result is available*/
385	case PGRES_FATAL_ERROR:	385	case PGRES_FATAL_ERROR:
386		386
		387	PQconsumeInput( (PGconn*) handle->generic );
387	if( PQstatus( (PGconn*) handle->generic ) != CONNECTION_OK )	388	if( PQstatus( (PGconn*) handle->generic ) != CONNECTION_OK )
388	{	389	{
389	conn->errtype = -1;	390	conn->errtype = -1;

Lines 1-4 Link Here

(-)opendbx.orig/backends/sqlite/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 1-4 Link Here

(-)opendbx.orig/backends/sqlite3/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 80-85 Link Here

(-)opendbx.orig/backends/sqlite3/sqlite3_basic.c (+37 lines)
80	aux->res = NULL;	80	aux->res = NULL;
81	aux->path = NULL;	81	aux->path = NULL;
82	aux->pathlen = 0;	82	aux->pathlen = 0;
		83	aux->stmt = NULL;
		84	aux->tail = NULL;
		85	aux->length = 0;
		86	aux->err = SQLITE_OK;
		87
83	handle->generic = NULL;	88	handle->generic = NULL;
84		89
85	if( host != NULL )	90	if( host != NULL )
Lines 436-441 Link Here
436	case SQLITE_DONE:	441	case SQLITE_DONE:
437	case SQLITE_OK:	442	case SQLITE_OK:
438	case SQLITE_MISUSE: // Return DONE if function called more often afterwards	443	case SQLITE_MISUSE: // Return DONE if function called more often afterwards
		444	sqlite3_finalize( (sqlite3_stmt*) result->generic );
		445	result->generic = NULL;
439	return ODBX_ROW_DONE;	446	return ODBX_ROW_DONE;
440	}	447	}
441		448
Lines 472-477 Link Here
472		479
473	static int sqlite3_odbx_column_type( odbx_result_t* result, unsigned long pos )	480	static int sqlite3_odbx_column_type( odbx_result_t* result, unsigned long pos )
474	{	481	{
		482	#ifdef HAVE_SQLITE3_TABLE_COLUMN_METADATA
		483	const char type, collation;
		484	int notnull, primarykey, autoinc;
		485	#endif
		486
475	switch( sqlite3_column_type( (sqlite3_stmt*) result->generic, pos ) )	487	switch( sqlite3_column_type( (sqlite3_stmt*) result->generic, pos ) )
476	{	488	{
477	case SQLITE_INTEGER:	489	case SQLITE_INTEGER:
Lines 483-489 Link Here
483	case SQLITE_TEXT:	495	case SQLITE_TEXT:
484	return ODBX_TYPE_CLOB;	496	return ODBX_TYPE_CLOB;
485	default:	497	default:
		498	#ifdef HAVE_SQLITE3_TABLE_COLUMN_METADATA
		499	if( sqlite3_table_column_metadata( (sqlite3*) result->handle->generic,
		500	sqlite3_column_database_name( (sqlite3_stmt*) result->generic, pos ),
		501	sqlite3_column_table_name( (sqlite3_stmt*) result->generic, pos ),
		502	sqlite3_column_origin_name( (sqlite3_stmt*) result->generic, pos ),
		503	&type, &collation, &notnull, &primarykey, &autoinc ) != SQLITE_OK )
		504	{
		505	return ODBX_TYPE_UNKNOWN;
		506	}
		507
		508	if( strstr( type, "DOUBLE" ) != NULL \|\| strcmp( type, "FLOAT" ) == 0 \|\| strcmp( type, "REAL" ) == 0 ) {
		509	return ODBX_TYPE_DOUBLE;
		510	} else if( strstr( type, "INT" ) != NULL \|\| strcmp( type, "BOOLEAN" ) == 0 ) {
		511	return ODBX_TYPE_BIGINT;
		512	} else if( strstr( type, "CHAR" ) != NULL \|\| strcmp( type, "CLOB" ) == 0 \|\| strcmp( type, "TEXT" ) == 0 ) {
		513	return ODBX_TYPE_CLOB;
		514	} else if( strstr( type, "DATE" ) != NULL \|\| strstr( type, "TIME" ) != NULL \|\| strstr( type, "DECIMAL" ) != NULL ) {
		515	return ODBX_TYPE_CLOB;
		516	} else if( strcmp( type, "BLOB" ) == 0 ) {
		517	return ODBX_TYPE_BLOB;
		518	} else {
		519	return ODBX_TYPE_UNKNOWN;
		520	}
		521	#else
486	return ODBX_TYPE_UNKNOWN;	522	return ODBX_TYPE_UNKNOWN;
		523	#endif
487	}	524	}
488	}	525	}
489		526

Lines 1-4 Link Here

(-)opendbx.orig/backends/sybase/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 75-81 Link Here

(-)opendbx.orig/backends/sybase/sybase_basic.c (-1 / +1 lines)
75	return err;	75	return err;
76	}	76	}
77		77
78	if( cs_config( aux->ctx, CS_SET, CS_USERDATA, (CS_VOID) &aux, sizeof( void ), NULL ) != CS_SUCCEED )	78	if( cs_config( aux->ctx, CS_SET, CS_USERDATA, (CS_VOID) &aux, sizeof( CS_VOID ), NULL ) != CS_SUCCEED )
79	{	79	{
80	sybase_priv_cleanup( handle );	80	sybase_priv_cleanup( handle );
81	return -ODBX_ERR_NOMEM;	81	return -ODBX_ERR_NOMEM;




2012-06-10 Norbert Sendetzky <norbert@linuxnetworks.de>

	* 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 <norbert@linuxnetworks.de>

	* 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 <norbert@linuxnetworks.de>

	* 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 <norbert@linuxnetworks.de>

	* Bugfix: Fixed lost statements in sqlite3 backend if an error or a timeout occured

Lines 103-108 Link Here

(-)opendbx.orig/config.h.in (+9 lines)
103	/* Have -lsybdb */	103	/* Have -lsybdb */
104	#undef HAVE_LIBSYBDB	104	#undef HAVE_LIBSYBDB
105		105
		106	/* Have mslib type of "struct dbdaterec" */
		107	#undef HAVE_LIBSYBDB_MSLIB
		108
106	/* Define to 1 if you have the <limits.h> header file. */	109	/* Define to 1 if you have the <limits.h> header file. */
107	#undef HAVE_LIMITS_H	110	#undef HAVE_LIMITS_H
108		111
Lines 162-167 Link Here
162	/* Define to 1 if you have sqlite3_prepare_v2 */	165	/* Define to 1 if you have sqlite3_prepare_v2 */
163	#undef HAVE_SQLITE3_PREPARE_V2	166	#undef HAVE_SQLITE3_PREPARE_V2
164		167
		168	/* Define to 1 if you have sqlite3_table_column_metadata */
		169	#undef HAVE_SQLITE3_TABLE_COLUMN_METADATA
		170
165	/* Define to 1 if you have the <sqlite.h> header file. */	171	/* Define to 1 if you have the <sqlite.h> header file. */
166	#undef HAVE_SQLITE_H	172	#undef HAVE_SQLITE_H
167		173
Lines 189-194 Link Here
189	/* Define to 1 if you have the `strncasecmp' function. */	195	/* Define to 1 if you have the `strncasecmp' function. */
190	#undef HAVE_STRNCASECMP	196	#undef HAVE_STRNCASECMP
191		197
		198	/* Define to 1 if you have the `strstr' function. */
		199	#undef HAVE_STRSTR
		200
192	/* Define to 1 if you have the `strtol' function. */	201	/* Define to 1 if you have the `strtol' function. */
193	#undef HAVE_STRTOL	202	#undef HAVE_STRTOL
194		203




#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for opendbx 1.4.6.
#
# Report bugs to <http://bugs.linuxnetworks.de/>.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 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.




test -n "$DJDIR" || exec 7<&0 </dev/null
exec 6>&1

# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,

# Identity of this package.
PACKAGE_NAME='opendbx'
PACKAGE_TARNAME='opendbx'
PACKAGE_VERSION='1.4.6'
PACKAGE_STRING='opendbx 1.4.6'
PACKAGE_BUGREPORT='http://bugs.linuxnetworks.de/'
PACKAGE_URL=''


  # 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.6 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...



if test -n "$ac_init_help"; then
  case $ac_init_help in
     short | recursive ) echo "Configuration of opendbx 1.4.6:";;
   esac
  cat <<\_ACEOF


  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
              nonstandard directory <lib dir>
  LIBS        libraries to pass to the linker, e.g. -l<library>
  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
              you have headers in a nonstandard directory <include dir>
  CPP         C preprocessor
  CXX         C++ compiler command

test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
  cat <<\_ACEOF
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

	ac_retval=1
fi
  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval

} # ac_fn_c_try_compile


  # 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;}
  as_fn_set_status $ac_retval

} # ac_fn_c_try_link


fi
  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval

} # ac_fn_c_try_run


    ac_retval=1
fi
  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval

} # ac_fn_c_try_cpp


	ac_retval=1
fi
  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval

} # ac_fn_cxx_try_compile


    ac_retval=1
fi
  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval

} # ac_fn_cxx_try_cpp


  # 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;}
  as_fn_set_status $ac_retval

} # ac_fn_cxx_try_link


  $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 << N) << N) - 1) * 2 + 1))];
test_array [0] = 0

  ;

  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 << N) << N) - 1) * 2 + 1)
		 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
test_array [0] = 0

  ;

  $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

int
main ()
{
static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
test_array [0] = 0

  ;

  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.6, which was
generated by GNU Autoconf 2.65.  Invocation command line was

  $ $0 $@


for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
  test "x$ac_site_file" = xNONE && continue
  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

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.  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


fi

  test -d ./--version && rmdir ./--version
  if test "${ac_cv_path_mkdir+set}" = set; then
    MKDIR_P="$ac_cv_path_mkdir -p"
  else

    # 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


# Define the identity of the package.
 PACKAGE='opendbx'
 VERSION='1.4.6'


cat >>confdefs.h <<_ACEOF

... 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.  */

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"
# 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 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:

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:${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

{ 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

rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
# 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
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"

as_fn_error "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." "$LINENO" 5; }
fi
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 <stdio.h>
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 :




macro_version='2.2.6b'
macro_revision='1.3017'




else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
  (eval echo "\"\$as_me:7135: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&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:7141: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"

  ;;

# This must be Linux ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
  lt_cv_deplibs_check_method=pass_all
  ;;


  ;;
*-*-irix6*)
  # Find out which ABI we are using.
  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=$?

   -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:10171: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&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.

      lt_prog_compiler_static='-non_shared'
      ;;

    linux* | k*bsd*-gnu | kopensolaris*-gnu)
      case $cc_basename in
      # old Intel for x86_64 which still supported -KPIC.
      ecc*)

   -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:10510: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&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.

   -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:10615: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&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

   -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:10670: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&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

    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 ...

      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 | kopensolaris*-gnu)
      tmp_diet=no
      if test "$host_os" = linux-dietlibc; then
	case $cc_basename in

  ;;

# This must be Linux ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no

  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
#line 13054 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H

  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
#line 13150 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H

... 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

... 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

... 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

        inherit_rpath_CXX=yes
        ;;

      linux* | k*bsd*-gnu | kopensolaris*-gnu)
        case $cc_basename in
          KCC*)
	    # Kuck and Associates, Inc. (KAI) C++ Compiler

	    ;;
	esac
	;;
      linux* | k*bsd*-gnu | kopensolaris*-gnu)
	case $cc_basename in
	  KCC*)
	    # KAI C++ Compiler

   -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:17136: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&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.

   -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:17235: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&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

   -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:17287: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&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

  ;;

# This must be Linux ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no

fi
done

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"


fi

			ac_fn_c_check_member "$LINENO" "struct dbdaterec" "year" "ac_cv_member_struct_dbdaterec_year" "#include <sybdb.h>
"
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


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

# 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.6, which was
generated by GNU Autoconf 2.65.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS


  -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


_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.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

    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 )

t delim
:nl
h
s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p

t nl
:delim
h
s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p

Lines 1-8 Link Here

(-)opendbx.orig/configure.ac (-3 / +14 lines)
1	# -- Autoconf --	1	# -- Autoconf --
2	# Process this file with autoconf to produce a configure script.	2	# Process this file with autoconf to produce a configure script.
3		3
4	AC_PREREQ(2.64)	4	AC_PREREQ(2.61)
5	AC_INIT([opendbx],[1.4.3],[http://bugs.linuxnetworks.de/])	5	AC_INIT([opendbx],[1.4.6],[http://bugs.linuxnetworks.de/])
6	AC_CONFIG_SRCDIR([config.h.in])	6	AC_CONFIG_SRCDIR([config.h.in])
7	AC_CONFIG_MACRO_DIR([m4])	7	AC_CONFIG_MACRO_DIR([m4])
8	AC_CONFIG_HEADERS([config.h])	8	AC_CONFIG_HEADERS([config.h])
Lines 79-85 Link Here
79	AC_FUNC_REALLOC	79	AC_FUNC_REALLOC
80	AC_FUNC_STRTOD	80	AC_FUNC_STRTOD
81	AC_FUNC_STRFTIME	81	AC_FUNC_STRFTIME
82	AC_CHECK_FUNCS([getopt memmove memset select setenv snprintf strdup strncasecmp strtol strtoul strtoull])	82	AC_CHECK_FUNCS([getopt memmove memset select setenv snprintf strdup strncasecmp strstr strtol strtoul strtoull])
83		83
84		84
85	# Checks for additional libraries	85	# Checks for additional libraries
Lines 167-172 Link Here
167	[AC_DEFINE([HAVE_LIBSYBDB], 1, [Have -lsybdb]) LIBMSSQL="sybdb"],	167	[AC_DEFINE([HAVE_LIBSYBDB], 1, [Have -lsybdb]) LIBMSSQL="sybdb"],
168	[AC_MSG_ERROR([mssql library (libsybdb) not found])]	168	[AC_MSG_ERROR([mssql library (libsybdb) not found])]
169	)	169	)
		170	AC_CHECK_MEMBER([struct dbdaterec.year], [AC_DEFINE([HAVE_LIBSYBDB_MSLIB], 1, [Have mslib type of "struct dbdaterec"])], [], [[#include <sybdb.h>]])
		171	odbx_saved_libs=${LIBS}; LIBS=""
		172	AC_SEARCH_LIBS([dgettext], [intl], [LIBMSSQL="$LIBMSSQL $LIBS"])
		173	LIBS=${odbx_saved_libs}
170	;;	174	;;
171	mysql)	175	mysql)
172	AC_CHECK_HEADERS([mysql.h], , [AC_MSG_ERROR([mysql header (mysql.h) not found])], [	176	AC_CHECK_HEADERS([mysql.h], , [AC_MSG_ERROR([mysql header (mysql.h) not found])], [
Lines 319-324 Link Here
319	[$LIBSQLITE3], [sqlite3_prepare_v2],	323	[$LIBSQLITE3], [sqlite3_prepare_v2],
320	[AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], 1, [Define to 1 if you have sqlite3_prepare_v2])]	324	[AC_DEFINE([HAVE_SQLITE3_PREPARE_V2], 1, [Define to 1 if you have sqlite3_prepare_v2])]
321	)	325	)
		326	AC_CHECK_LIB(
		327	[$LIBSQLITE3], [sqlite3_table_column_metadata],
		328	[AC_DEFINE([HAVE_SQLITE3_TABLE_COLUMN_METADATA], 1, [Define to 1 if you have sqlite3_table_column_metadata])]
		329	)
		330	odbx_saved_libs=${LIBS}; LIBS=""
		331	AC_SEARCH_LIBS([dgettext], [intl], [LIBSQLITE3="$LIBSQLITE3 $LIBS"])
		332	LIBS=${odbx_saved_libs}
322	;;	333	;;
323	sybase)	334	sybase)
324	AC_CHECK_HEADERS([ctpublic.h], , [AC_MSG_ERROR([sybase header (ctpublic.h) not found])])	335	AC_CHECK_HEADERS([ctpublic.h], , [AC_MSG_ERROR([sybase header (ctpublic.h) not found])])




libopendbx (1.4.6-1) unstable; urgency=low

  * New upstream version (stable version)
  * Fixed build requirements for Ubuntu

 -- Norbert Sendetzky <norbert@linuxnetworks.de>  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 <norbert@linuxnetworks.de>  Fri, 25 Dec 2009 00:00:00 +0100

libopendbx (1.4.4-1) unstable; urgency=medium

  * New upstream version (stable version)

 -- Norbert Sendetzky <norbert@linuxnetworks.de>  Fri, 07 Aug 2009 00:00:00 +0100

libopendbx (1.4.3-1) unstable; urgency=medium

  * New upstream version (stable version)

 -- Norbert Sendetzky <norbert@linuxnetworks.de>  Fri, 07 Aug 2009 00:00:00 +0100

libopendbx (1.4.2-1) unstable; urgency=medium

  * New upstream version (stable version)

Line 1 Link Here

(-)opendbx.orig/debian/compat (-1 / +1 lines)
1	4	1	7

Lines 1-7 Link Here

(-)opendbx.orig/debian/control (-1 / +1 lines)
1	Source: libopendbx	1	Source: libopendbx
2	Priority: optional	2	Priority: optional
3	Maintainer: Norbert Sendetzky <norbert@linuxnetworks.de>	3	Maintainer: Norbert Sendetzky <norbert@linuxnetworks.de>
4	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	4	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
5	Build-Conflicts: autoconf2.13, automake1.4	5	Build-Conflicts: autoconf2.13, automake1.4
6	Standards-Version: 3.7.3.0	6	Standards-Version: 3.7.3.0
7	Section: libs	7	Section: libs

Lines 1-4 Link Here

(-)opendbx.orig/doc/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 348-354 Link Here

(-)opendbx.orig/doc/opendbx.en.xml (-2 / +2 lines)
348	<funcsynopsisinfo>#include <opendbx/api.h></funcsynopsisinfo>	348	<funcsynopsisinfo>#include <opendbx/api.h></funcsynopsisinfo>
349		349
350	<funcprototype>	350	<funcprototype>
351	<funcdef>char* <function>odbx_column_type</function></funcdef>	351	<funcdef>int <function>odbx_column_type</function></funcdef>
352	<paramdef>odbx_result_t* <parameter>result</parameter></paramdef>	352	<paramdef>odbx_result_t* <parameter>result</parameter></paramdef>
353	<paramdef>unsigned long <parameter>pos</parameter></paramdef>	353	<paramdef>unsigned long <parameter>pos</parameter></paramdef>
354	</funcprototype>	354	</funcprototype>
Lines 668-674 Link Here
668	<paramdef>const char* <parameter>from</parameter></paramdef>	668	<paramdef>const char* <parameter>from</parameter></paramdef>
669	<paramdef>unsigned long <parameter>fromlen</parameter></paramdef>	669	<paramdef>unsigned long <parameter>fromlen</parameter></paramdef>
670	<paramdef>char* <parameter>to</parameter></paramdef>	670	<paramdef>char* <parameter>to</parameter></paramdef>
671	<paramdef>unsigned long <parameter>tolen</parameter></paramdef>	671	<paramdef>unsigned long* <parameter>tolen</parameter></paramdef>
672	</funcprototype>	672	</funcprototype>
673		673
674	</funcsynopsis>	674	</funcsynopsis>

Lines 1-4 Link Here

(-)opendbx.orig/lib/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 111-117 Link Here

(-)opendbx.orig/lib/odbx.c (-2 / +6 lines)
111		111
112		112
113		113
114	/* Depricated: odbx_bind_simple() */	114	/* Deprecated: odbx_bind_simple() */
115		115
116	int odbx_bind_simple( odbx_t* handle, const char* database, const char* username, const char* password )	116	int odbx_bind_simple( odbx_t* handle, const char* database, const char* username, const char* password )
117	{	117	{
Lines 241-247 Link Here
241	return dgettext( "opendbx", odbx_errmsg[ODBX_ERR_HANDLE] );	241	return dgettext( "opendbx", odbx_errmsg[ODBX_ERR_HANDLE] );
242	}	242	}
243		243
244	if( error <= ODBX_ERR_SUCCESS && error > -ODBX_MAX_ERRNO )	244	if( error <= ODBX_ERR_SUCCESS && error >= -ODBX_MAX_ERRNO )
245	{	245	{
246	return dgettext( "opendbx", odbx_errmsg[-error] );	246	return dgettext( "opendbx", odbx_errmsg[-error] );
247	}	247	}
Lines 345-350 Link Here
345	{	345	{
346	if( result ) { (result)->handle = handle; }	346	if( result ) { (result)->handle = handle; }
347	}	347	}
		348	else
		349	{
		350	*result = NULL;
		351	}
348		352
349	return err;	353	return err;
350	}	354	}




	*  OpenDBX large object interface
	*/



	Lob::Lob( Lob_Iface* impl ) throw( std::exception )
	{
		m_impl = impl;


	Lob::Lob( const Lob& ref ) throw()
	{
		m_impl = ref.m_impl;
		m_ref = ref.m_ref;

		if( m_ref == NULL )
		{
			m_ref = new int;
			*m_ref = 0;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}

		m_impl = ref.m_impl;
		m_ref = ref.m_ref;
		++(*m_ref);
	}



	Lob::~Lob() throw()
	{
		if( m_ref != NULL && --(*m_ref) == 0 )
		{
			try
			{
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}
	}



	Lob& Lob::operator=( const Lob& ref ) throw()
	{
		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;
	}


	Result::Result( const Result& ref ) throw()
	{
		m_impl = ref.m_impl;
		m_ref = ref.m_ref;

		if( m_ref == NULL )
		{
			m_ref = new int;
			*m_ref = 0;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}

		m_impl = ref.m_impl;
		m_ref = ref.m_ref;
		++(*m_ref);
	}



	Result::~Result() throw()
	{
		if( m_ref != NULL && --(*m_ref) == 0 )
		{
			delete m_impl;
			delete m_ref;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}
	}



	Result& Result::operator=( const Result& ref ) throw()
	{
		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;
	}


	Stmt::Stmt( const Stmt& ref ) throw()
	{
		m_impl = ref.m_impl;
		m_ref = ref.m_ref;

		if( m_ref == NULL )
		{
			m_ref = new int;
			*m_ref = 0;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}

		m_impl = ref.m_impl;
		m_ref = ref.m_ref;
		++(*m_ref);
	}



	Stmt::~Stmt() throw()
	{
		if( m_ref != NULL && --(*m_ref) == 0 )
		{
			delete m_impl;
			delete m_ref;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}
	}



	Stmt& Stmt::operator=( const Stmt& ref ) throw()
	{
		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;
	}


	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 = new int;
			*m_ref = 0;
		}

		++(*m_ref);
	}



	{
		if( m_ref != NULL && --(*m_ref) == 0 )
		{
			delete m_impl;
			delete m_ref;
				delete m_impl;
				delete m_ref;
			}
			catch( std::exception& e ) {}
		}
	}


	{
		if( m_ref != NULL && --(*m_ref) == 0 )
		{
			delete m_impl;
			delete m_ref;
				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 = new int;
			*m_ref = 0;
		}

		++(*m_ref);

		return *this;
	}

Lines 512-517 Link Here

(-)opendbx.orig/lib/odbx_impl.cpp (+6 lines)
512	{	512	{
513	int err;	513	int err;
514		514
		515	if( m_unbind )
		516	{
		517	odbx_unbind( m_handle );
		518	m_unbind = false;
		519	}
		520
515	if( ( err = odbx_finish( m_handle ) ) < 0 )	521	if( ( err = odbx_finish( m_handle ) ) < 0 )
516	{	522	{
517	throw Exception( string( odbx_error( m_handle, err ) ), err, odbx_error_type( m_handle, err ) );	523	throw Exception( string( odbx_error( m_handle, err ) ), err, odbx_error_type( m_handle, err ) );

Lines 132-138 Link Here

(-)opendbx.orig/lib/odbxlib.c (-2 / +2 lines)
132	len = plen = snprintf( lib, ODBX_PATHSIZE, LIBPATH );	132	len = plen = snprintf( lib, ODBX_PATHSIZE, LIBPATH );
133	len += snprintf( lib + len, ODBX_PATHSIZE - len, "/" );	133	len += snprintf( lib + len, ODBX_PATHSIZE - len, "/" );
134	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX );	134	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX );
135	len += snprintf( lib + len, ODBX_PATHSIZE - len, backend );	135	len += snprintf( lib + len, ODBX_PATHSIZE - len, "%s", backend );
136	len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" );	136	len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" );
137	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX );	137	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX );
138		138
Lines 219-225 Link Here
219	len = plen = snprintf( lib, ODBX_PATHSIZE, PACKAGE );	219	len = plen = snprintf( lib, ODBX_PATHSIZE, PACKAGE );
220	len += snprintf( lib + len, ODBX_PATHSIZE - len, "\\" );	220	len += snprintf( lib + len, ODBX_PATHSIZE - len, "\\" );
221	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX );	221	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBPREFIX );
222	len += snprintf( lib + len, ODBX_PATHSIZE - len, backend );	222	len += snprintf( lib + len, ODBX_PATHSIZE - len, "%s", backend );
223	len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" );	223	len += snprintf( lib + len, ODBX_PATHSIZE - len, "backend" );
224	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX );	224	len += snprintf( lib + len, ODBX_PATHSIZE - len, LIBSUFFIX );
225		225

Lines 766-772 Link Here

(-)opendbx.orig/lib/opendbx/api (-3 / +3 lines)
766	* Each statement object uses a reference counter to remember if the	766	* Each statement object uses a reference counter to remember if the
767	* internal variables are shared with other objects. If this isn't the	767	* internal variables are shared with other objects. If this isn't the
768	* case or if this object is the last one referencing the variables,	768	* case or if this object is the last one referencing the variables,
769	* the object is cleanup up and the allocated memory freed.	769	* the object is cleaned up and the allocated memory freed.
770	*/	770	*/
771	~Stmt() throw();	771	~Stmt() throw();
772		772
Lines 1268-1275 Link Here
1268	* aren't stored in the database column so only the original string will	1268	* aren't stored in the database column so only the original string will
1269	* be written to the disk.	1269	* be written to the disk.
1270	*	1270	*
1271	* A C++ reference of the third parameter containing the escaped string	1271	* A C++ reference of the second parameter containing the escaped string
1272	* afterwards is also returned by this method to providing the possibility	1272	* afterwards is also returned by this method too, providing the possibility
1273	* to write more elegant code.	1273	* to write more elegant code.
1274	*	1274	*
1275	* @param from Input string with which may contain dangerous characters	1275	* @param from Input string with which may contain dangerous characters




# Generated from ltmain.m4sh.

# ltmain.sh (GNU libtool) 2.2.6b
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996

# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.

#       compiler:		$LTCC
#       compiler flags:		$LTCFLAGS
#       linker:		$LD (gnu? $with_gnu_ld)
#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
#       automake:		$automake_version
#       autoconf:		$autoconf_version
#


PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
TIMESTAMP=""
package_revision=1.3017

# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then




  ;;

# This must be Linux ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
  version_type=linux
  need_lib_prefix=no
  need_version=no

  ;;

# This must be Linux ELF.
linux* | k*bsd*-gnu | kopensolaris*-gnu)
  lt_cv_deplibs_check_method=pass_all
  ;;


	    ;;
	esac
	;;
      linux* | k*bsd*-gnu | kopensolaris*-gnu)
	case $cc_basename in
	  KCC*)
	    # KAI C++ Compiler

      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
      ;;

    linux* | k*bsd*-gnu | kopensolaris*-gnu)
      case $cc_basename in
      # old Intel for x86_64 which still supported -KPIC.
      ecc*)

    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 ...

      _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 | kopensolaris*-gnu)
      tmp_diet=no
      if test "$host_os" = linux-dietlibc; then
	case $cc_basename in

        _LT_TAGVAR(inherit_rpath, $1)=yes
        ;;

      linux* | k*bsd*-gnu | kopensolaris*-gnu)
        case $cc_basename in
          KCC*)
	    # Kuck and Associates, Inc. (KAI) C++ Compiler





# Generated from ltversion.in.

# serial 3017 ltversion.m4
# This file is part of GNU Libtool

m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])

AC_DEFUN([LTVERSION_VERSION],
[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)
])




# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

	$(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 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 \

#     (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):
	@fail= failcom='exit 1'; \
	for f in x $$MAKEFLAGS; do \
	  case $$f in \
	    *=* | --[!k]*);; \

	fi; test -z "$$fail"

$(RECURSIVE_CLEAN_TARGETS):
	@fail= failcom='exit 1'; \
	for f in x $$MAKEFLAGS; do \
	  case $$f in \
	    *=* | --[!k]*);; \

	  fi; \
	done
	-test -n "$(am__skip_mode_fix)" \
	|| 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 {} {} \; \

distcheck: dist
	case '$(DIST_ARCHIVES)' in \
	*.tar.gz*) \
	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
	*.tar.bz2*) \
	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
	*.tar.lzma*) \
	  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) gzip -dc $(distdir).shar.gz | unshar ;;\
	*.zip*) \
	  unzip $(distdir).zip ;;\
	esac

Line 0 Link Here

(-)opendbx.orig/NEWS (+1 lines)
	1	Please have a look at the ChangeLog file for updates




#
#  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.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

License:    LGPL
URL:    http://www.linuxnetworks.de/opendbx/download/
Source0:    %{name}-%{version}.tar.gz
BuildRoot:    %{_tmppath}/%{name}-%{version}-build
BuildRequires:    gcc-c++, gettext

%description

Group:    Applications/Databases
Requires:    %{name} >= %{version}
Requires:    readline, ncurses
BuildRequires:    gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel

%description utils
Utility application for manipulating database content either interactively by

Pliki nagłówkowe biblioteki opendbx.


%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

%endif


%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

%endif


%if 0%{?build_sqlite:1}

%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}

%package sqlite
Summary:    SQLite backend for OpenDBX

%endif


%if 0%{?build_sqlite3: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

%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
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
Group:    Development/Libraries
Requires:    %{name} = %{version}-%{release}
%if 0%{?mandriva_version}
Requires:    sqlite3
BuildRequires: sqlite3-devel
%else
Requires:    sqlite >= 3.0
BuildRequires: sqlite-devel >= 3.0
%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

%description sqlite3
SQLite3 backend for the OpenDBX database abstraction library

%description sqlite3 -l de.UTF-8
Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
%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 pl.UTF-8
Backend bazy danych sqlite3 dla biblioteki opendbx.

%endif


%if 0%{?build_sybase:1}

%package sybase
Summary:    Sybase backend for OpenDBX

%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 -n opendbx-%{version}


%build
CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;
LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;
%configure \
    --disable-rpath \
    --disable-static \
    --with-backends="\
%{?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



%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



#%{_mandir}/man3/*


%if 0%{?build_firebird:1}
%files firebird
%defattr(-,root,root,-)
%{_libdir}/opendbx/libfirebirdbackend.so*
%endif


%if 0%{?build_mssql:1}
%files mssql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libmssqlbackend.so*
%endif


%if 0%{?build_mysql:1}
%files mysql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libmysqlbackend.so*
%endif


%if 0%{?build_odbc:1}
%files odbc
%defattr(-,root,root,-)
%{_libdir}/opendbx/libodbcbackend.so*
%endif


%if 0%{?build_oracle:1}
%files oracle
%defattr(-,root,root,-)
%{_libdir}/opendbx/liboraclebackend.so*
%endif


%if 0%{?build_pgsql:1}
%files pgsql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libpgsqlbackend.so*
%endif


%if 0%{?build_sqlite:1}
%files sqlite
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsqlitebackend.so*
%endif


%if 0%{?build_sqlite3:1}
%files sqlite3
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsqlite3backend.so*
%endif


%if 0%{?build_sybase:1}
%files sybase
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsybasebackend.so*
%endif


%changelog
* Mon Apr 19 2010 Norbert Sendetzky <norbert@linuxnetworks.de> 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 <norbert@linuxnetworks.de> 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 <norbert@linuxnetworks.de> 1.4.1-1
- Added opendbxplus.pc




#
#  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
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

License:    LGPL
URL:    http://www.linuxnetworks.de/opendbx/download/
Source0:    %{name}-%{version}.tar.gz
BuildRoot:    %{_tmppath}/%{name}-%{version}-build
BuildRequires:    gcc-c++, gettext

%description

Group:    Applications/Databases
Requires:    %{name} >= %{version}
Requires:    readline, ncurses
BuildRequires:    gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel

%description utils
Utility application for manipulating database content either interactively by

Pliki nagłówkowe biblioteki opendbx.


%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

%endif


%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

%endif


%if 0%{?build_sqlite:1}

%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}

%package sqlite
Summary:    SQLite backend for OpenDBX

%endif


%if 0%{?build_sqlite3: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

%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
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
Group:    Development/Libraries
Requires:    %{name} = %{version}-%{release}
%if 0%{?mandriva_version}
Requires:    sqlite3
BuildRequires: sqlite3-devel
%else
Requires:    sqlite >= 3.0
BuildRequires: sqlite-devel >= 3.0
%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

%description sqlite3
SQLite3 backend for the OpenDBX database abstraction library

%description sqlite3 -l de.UTF-8
Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
%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 pl.UTF-8
Backend bazy danych sqlite3 dla biblioteki opendbx.

%endif


%if 0%{?build_sybase:1}

%package sybase
Summary:    Sybase backend for OpenDBX

%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 -n opendbx-%{version}


%build
CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;
LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;
%configure \
    --disable-rpath \
    --disable-static \
    --with-backends="\
%{?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



%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



#%{_mandir}/man3/*


%if 0%{?build_firebird:1}
%files firebird
%defattr(-,root,root,-)
%{_libdir}/opendbx/libfirebirdbackend.so*
%endif


%if 0%{?build_mssql:1}
%files mssql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libmssqlbackend.so*
%endif


%if 0%{?build_mysql:1}
%files mysql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libmysqlbackend.so*
%endif


%if 0%{?build_odbc:1}
%files odbc
%defattr(-,root,root,-)
%{_libdir}/opendbx/libodbcbackend.so*
%endif


%if 0%{?build_oracle:1}
%files oracle
%defattr(-,root,root,-)
%{_libdir}/opendbx/liboraclebackend.so*
%endif


%if 0%{?build_pgsql:1}
%files pgsql
%defattr(-,root,root,-)
%{_libdir}/opendbx/libpgsqlbackend.so*
%endif


%if 0%{?build_sqlite:1}
%files sqlite
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsqlitebackend.so*
%endif


%if 0%{?build_sqlite3:1}
%files sqlite3
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsqlite3backend.so*
%endif


%if 0%{?build_sybase:1}
%files sybase
%defattr(-,root,root,-)
%{_libdir}/opendbx/libsybasebackend.so*
%endif


%changelog
* Mon Apr 19 2010 Norbert Sendetzky <norbert@linuxnetworks.de> 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 <norbert@linuxnetworks.de> 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 <norbert@linuxnetworks.de> 1.4.1-1
- Added opendbxplus.pc

Lines 7-13 Link Here

(-)opendbx.orig/po/de.po (-1 / +1 lines)
7	msgstr ""	7	msgstr ""
8	"Project-Id-Version: OpenDBX 1.3.0\n"	8	"Project-Id-Version: OpenDBX 1.3.0\n"
9	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	9	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
10	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	10	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
11	"PO-Revision-Date: 2007-02-18 00:00+0100\n"	11	"PO-Revision-Date: 2007-02-18 00:00+0100\n"
12	"Last-Translator: Norbert Sendetzky <norbert@linuxnetworks.de>\n"	12	"Last-Translator: Norbert Sendetzky <norbert@linuxnetworks.de>\n"
13	"Language-Team: de <de@li.org>\n"	13	"Language-Team: de <de@li.org>\n"




# English translations for opendbx package.
# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the opendbx package.
# Automatically generated, 2012.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation

#
msgid ""
msgstr ""
"Project-Id-Version: opendbx 1.4.6\n"
"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\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"

Lines 6-14 Link Here

(-)opendbx.orig/po/opendbx.pot (-2 / +2 lines)
6	#, fuzzy	6	#, fuzzy
7	msgid ""	7	msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: opendbx 1.4.3\n"	9	"Project-Id-Version: opendbx 1.4.6\n"
10	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	10	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
11	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	11	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"

Lines 1-4 Link Here

(-)opendbx.orig/test/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 293-303 Link Here

(-)opendbx.orig/test/odbxplus-regression.cpp (-2 / +6 lines)
293	}	293	}
294		294
295	// Test case: Calling getRow() more often must not result in error	295	// Test case: Calling getRow() more often must not result in error
296	result.getRow();	296	if( result.getRow() != ODBX_ROW_DONE ) {
		297	throw std::runtime_error( string( "Sub-sequent calls to getRow() don't return ODBX_RES_DONE" ) );
		298	}
297	}	299	}
298		300
299	// Test case: Calling getResult() more often must not result in error	301	// Test case: Calling getResult() more often must not result in error
300	result.getResult();	302	if( result.getResult() != ODBX_RES_DONE ) {
		303	throw std::runtime_error( string( "Sub-sequent calls to getResult() don't return ODBX_RES_DONE" ) );
		304	}
301		305
302	result.finish();	306	result.finish();
303	}	307	}




ODBXAPP="./odbxtest ./odbxplustest"

# Import database parameter
. ./odbxtest.site


# compare results
odbxcompare ()
{
	diff -b test.out ref/$1.ref > /dev/null

	if test $? -eq 1
	then




    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_MULTI_STATEMENTS: 1 (using)
    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_MULTI_STATEMENTS: 1 (using)
    ODBX_OPT_PAGED_RESULTS: 0
    ODBX_OPT_COMPRESS: 0
    Affected rows: 0
    Affected rows: 1
    Affected rows: 1

    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 3): i1 = NULL
    column 1 (type 3): i16 = '2'
    column 2 (type 3): i32 = '4'
    column 3 (type 3): i64 = '8'

    column 7 (type 9): f8 = '8.5'
    column 8 (type 32): c2 = 'FR'
    column 9 (type 32): nc12 = 'éçèéçè'
    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 éçè'

    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 3): i1 = NULL
    column 1 (type 3): i16 = '2'
    column 2 (type 3): i32 = '4'
    column 3 (type 3): i64 = '8'

    column 7 (type 9): f8 = '8.5'
    column 8 (type 32): c2 = 'FR'
    column 9 (type 32): nc12 = 'éçèéçè'
    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 éçè'




 *  (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>
 *  Inspired by PowerDNS ArgvMap code
 *
 *  Distributed under the terms of the GNU Library General Public Licence
 *  version 2 or (at your option) any later version.
 *  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
 */






 *  (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>
 *  Inspired by PowerDNS ArgvMap code
 *
 *  Distributed under the terms of the GNU Library General Public Licence
 *  version 2 or (at your option) any later version.
 *  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
 */



Lines 1-4 Link Here

(-)opendbx.orig/utils/doc/Makefile.in (-1 / +1 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

Lines 8-14 Link Here

(-)opendbx.orig/utils/Makefile.am (-1 / +1 lines)
8		8
9	odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp	9	odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp
10	odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\"	10	odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\"
11	odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) -lreadline -lncurses	11	odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) $(LTLIBINTL) -lreadline -lncurses
12		12
13	EXTRA_DIST = keywords	13	EXTRA_DIST = keywords
14	pkgdata_DATA = keywords	14	pkgdata_DATA = keywords




# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

@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@	$(am__DEPENDENCIES_1)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles

@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) $(LTLIBINTL) -lreadline -lncurses
@ENABLEUTILS_TRUE@EXTRA_DIST = keywords
@ENABLEUTILS_TRUE@pkgdata_DATA = keywords
all: all-recursive

#     (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):
	@fail= failcom='exit 1'; \
	for f in x $$MAKEFLAGS; do \
	  case $$f in \
	    *=* | --[!k]*);; \

	fi; test -z "$$fail"

$(RECURSIVE_CLEAN_TARGETS):
	@fail= failcom='exit 1'; \
	for f in x $$MAKEFLAGS; do \
	  case $$f in \
	    *=* | --[!k]*);; \




			{
				len = strlen( line );
				sql += "\n" + string( line, len );
				::free( line );

				if( sql[sql.size()-1] == ';' ) { break; }
			}

		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" ) );

		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 )




msgstr ""
"Project-Id-Version: opendbx 1.3.7\n"
"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
"POT-Creation-Date: 2012-06-10 23:58+0200\n"
"PO-Revision-Date: 2008-04-04 00:18+0200\n"
"Last-Translator:  <norbert@linuxnetworks.de>\n"
"Language-Team: German\n"

msgid "Password: "
msgstr "Passwort: "

#: utils/odbx-sql.cpp:245
msgid "Error: "
msgstr "Fehler: "

#: utils/odbx-sql.cpp:250
msgid "Error: Caught unknown exception"
msgstr "Fehler: Es ist eine unbekannte Ausnahme aufgetreten"





# English translations for opendbx package.
# Copyright (C) 2012 Free Software Foundation, Inc.
# This file is distributed under the same license as the opendbx package.
# Automatically generated, 2012.
#
# All this catalog "translates" are quotation characters.
# The msgids must be ASCII and therefore cannot contain real quotation

#
msgid ""
msgstr ""
"Project-Id-Version: opendbx 1.4.6\n"
"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\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"

msgid "Password: "
msgstr "Password: "

#: utils/odbx-sql.cpp:245
msgid "Error: "
msgstr "Error: "

#: utils/odbx-sql.cpp:250
msgid "Error: Caught unknown exception"
msgstr "Error: Caught unknown exception"




#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: opendbx 1.4.6\n"
"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

msgid "Password: "
msgstr ""

#: utils/odbx-sql.cpp:245
msgid "Error: "
msgstr ""

#: utils/odbx-sql.cpp:250
msgid "Error: Caught unknown exception"
msgstr ""

Return to bug 46314

Lines 2445-2451 Link Here

(-)opendbx.orig/m4/libtool.m4 (-6 / +7 lines)
2445	;;	2445	;;
2446		2446
2447	# This must be Linux ELF.	2447	# This must be Linux ELF.
2448	linux* \| kbsd-gnu)	2448	linux* \| kbsd-gnu \| kopensolaris*-gnu)
2449	version_type=linux	2449	version_type=linux
2450	need_lib_prefix=no	2450	need_lib_prefix=no
2451	need_version=no	2451	need_version=no
Lines 3084-3090 Link Here
3084	;;	3084	;;
3085		3085
3086	# This must be Linux ELF.	3086	# This must be Linux ELF.
3087	linux* \| kbsd-gnu)	3087	linux* \| kbsd-gnu \| kopensolaris*-gnu)
3088	lt_cv_deplibs_check_method=pass_all	3088	lt_cv_deplibs_check_method=pass_all
3089	;;	3089	;;
3090		3090
Lines 3705-3711 Link Here
3705	;;	3705	;;
3706	esac	3706	esac
3707	;;	3707	;;
3708	linux* \| kbsd-gnu)	3708	linux* \| kbsd-gnu \| kopensolaris*-gnu)
3709	case $cc_basename in	3709	case $cc_basename in
3710	KCC*)	3710	KCC*)
3711	# KAI C++ Compiler	3711	# KAI C++ Compiler
Lines 3989-3995 Link Here
3989	_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'	3989	_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
3990	;;	3990	;;
3991		3991
3992	linux* \| kbsd-gnu)	3992	linux* \| kbsd-gnu \| kopensolaris*-gnu)
3993	case $cc_basename in	3993	case $cc_basename in
3994	# old Intel for x86_64 which still supported -KPIC.	3994	# old Intel for x86_64 which still supported -KPIC.
3995	ecc*)	3995	ecc*)
Lines 4285-4290 Link Here
4285	fi	4285	fi
4286	supports_anon_versioning=no	4286	supports_anon_versioning=no
4287	case `$LD -v 2>&1` in	4287	case `$LD -v 2>&1` in
		4288	GNU\ gold) supports_anon_versioning=yes ;;
4288	\ [[01]]. \| \ 2.[[0-9]]. \| \ 2.10.) ;; # catch versions < 2.11	4289	\ [[01]]. \| \ 2.[[0-9]]. \| \ 2.10.) ;; # catch versions < 2.11
4289	\ 2.11.93.0.2\ ) supports_anon_versioning=yes ;; # RH7.3 ...	4290	\ 2.11.93.0.2\ ) supports_anon_versioning=yes ;; # RH7.3 ...
4290	\ 2.11.92.0.12\ ) supports_anon_versioning=yes ;; # Mandrake 8.2 ...	4291	\ 2.11.92.0.12\ ) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
Lines 4376-4382 Link Here
4376	_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'	4377	_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'
4377	;;	4378	;;
4378		4379
4379	gnu* \| linux* \| tpf* \| kbsd-gnu)	4380	gnu* \| linux* \| tpf* \| kbsd-gnu \| kopensolaris*-gnu)
4380	tmp_diet=no	4381	tmp_diet=no
4381	if test "$host_os" = linux-dietlibc; then	4382	if test "$host_os" = linux-dietlibc; then
4382	case $cc_basename in	4383	case $cc_basename in
Lines 5860-5866 Link Here
5860	_LT_TAGVAR(inherit_rpath, $1)=yes	5861	_LT_TAGVAR(inherit_rpath, $1)=yes
5861	;;	5862	;;
5862		5863
5863	linux* \| kbsd-gnu)	5864	linux* \| kbsd-gnu \| kopensolaris*-gnu)
5864	case $cc_basename in	5865	case $cc_basename in
5865	KCC*)	5866	KCC*)
5866	# Kuck and Associates, Inc. (KAI) C++ Compiler	5867	# Kuck and Associates, Inc. (KAI) C++ Compiler

Lines 1-4 Link Here

(-)opendbx.orig/aclocal.m4 (-5 / +5 lines)
1	# generated automatically by aclocal 1.11 -- Autoconf --	1	# generated automatically by aclocal 1.11.1 -- Autoconf --
2		2
3	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,	3	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4	# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.	4	# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
Lines 13-20 Link Here
13		13
14	m4_ifndef([AC_AUTOCONF_VERSION],	14	m4_ifndef([AC_AUTOCONF_VERSION],
15	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl	15	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
16	m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,	16	m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
17	[m4_warning([this file was generated for autoconf 2.64.	17	[m4_warning([this file was generated for autoconf 2.65.
18	You have another version of autoconf. It may work, but is not guaranteed to.	18	You have another version of autoconf. It may work, but is not guaranteed to.
19	If you have problems, you may need to regenerate the build system entirely.	19	If you have problems, you may need to regenerate the build system entirely.
20	To do so, use the procedure documented by the package, typically `autoreconf'.])])	20	To do so, use the procedure documented by the package, typically `autoreconf'.])])
Lines 86-92 Link Here
86	[am__api_version='1.11'	86	[am__api_version='1.11'
87	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to	87	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
88	dnl require some minimum version. Point them to the right macro.	88	dnl require some minimum version. Point them to the right macro.
89	m4_if([$1], [1.11], [],	89	m4_if([$1], [1.11.1], [],
90	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl	90	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
91	])	91	])
92		92
Lines 102-108 Link Here
102	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.	102	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
103	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.	103	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
104	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],	104	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
105	[AM_AUTOMAKE_VERSION([1.11])dnl	105	[AM_AUTOMAKE_VERSION([1.11.1])dnl
106	m4_ifndef([AC_AUTOCONF_VERSION],	106	m4_ifndef([AC_AUTOCONF_VERSION],
107	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl	107	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
108	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])	108	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

Lines 112-123 Link Here

(-)opendbx.orig/backends/odbc/odbc_basic.c (-3 / +4 lines)
112	return -ODBX_ERR_BACKEND;	112	return -ODBX_ERR_BACKEND;
113	}	113	}
114		114
115	gen->err = SQLSetConnectAttr( gen->conn, SQL_DEFAULT_TXN_ISOLATION, (SQLPOINTER) SQL_TXN_READ_COMMITTED, SQL_IS_UINTEGER );	115	gen->err = SQLSetConnectAttr( gen->conn, SQL_TXN_ISOLATION, (SQLPOINTER) SQL_TXN_READ_COMMITTED, SQL_IS_UINTEGER );
116	if( !SQL_SUCCEEDED( gen->err ) )	116	if( !SQL_SUCCEEDED( gen->err ) )
117	{	117	{
118	return -ODBX_ERR_BACKEND;	118	return -ODBX_ERR_BACKEND;
119	}	119	}
120		120
		121	/* Doesn't work with Windows ODBC
121	gen->err = SQLSetConnectAttr( gen->conn, SQL_ATTR_ASYNC_ENABLE, (SQLPOINTER) SQL_ASYNC_ENABLE_ON, SQL_IS_UINTEGER );	122	gen->err = SQLSetConnectAttr( gen->conn, SQL_ATTR_ASYNC_ENABLE, (SQLPOINTER) SQL_ASYNC_ENABLE_ON, SQL_IS_UINTEGER );
122	if( !SQL_SUCCEEDED( gen->err ) )	123	if( !SQL_SUCCEEDED( gen->err ) )
123	{	124	{
Lines 129-135 Link Here
129	{	130	{
130	return -ODBX_ERR_BACKEND;	131	return -ODBX_ERR_BACKEND;
131	}	132	}
132		133	*/
133	gen->err = SQLConnect( gen->conn, (SQLCHAR) gen->server, strlen( gen->server ), (SQLCHAR) who, wlen, (SQLCHAR*) cred, clen );	134	gen->err = SQLConnect( gen->conn, (SQLCHAR) gen->server, strlen( gen->server ), (SQLCHAR) who, wlen, (SQLCHAR*) cred, clen );
134	if( !SQL_SUCCEEDED( gen->err ) )	135	if( !SQL_SUCCEEDED( gen->err ) )
135	{	136	{
Lines 772-778 Link Here
772	return 9;	773	return 9;
773	case SQL_TIMESTAMP:	774	case SQL_TIMESTAMP:
774	case SQL_TYPE_TIMESTAMP:	775	case SQL_TYPE_TIMESTAMP:
775	return 20;	776	return 24;
776	}	777	}
777		778
778	SQLLEN len = 0;	779	SQLLEN len = 0;

Lines 1-3 Link Here

(-)opendbx.orig/ChangeLog (+35 lines)
		1	2012-06-10 Norbert Sendetzky <norbert@linuxnetworks.de>
		2
		3	* Bugfix: Fixed memory leak in mysql backend when connecting to the server failed (thanks to Stefan Meinecke)
		4	* Bugfix: Fixed handling of NULL indicator in MSSQL backend if NULL is returned in a row
		5	* Bugfix: Added workaround for PostgreSQL in case of an error (e.g. if the server is gone) to give back a correct error status
		6	* Bugfix: Return ODBX_ROW_DONE in sqlite3_odbx_row_fetch() when calling this function after no more rows are available (due to SQLite3 change)
		7	* Bugfix: Added -lintl if required for fixing build problems when using MinGW on Windows platforms
		8	* Bugfix: Added ENABLE_BROKEN to Oracle descriptor for enabling keep-alive
		9	* Bugfix: Added unbind() to Conn::finish() if it's not called before
		10	* Bugfix: Increased buffer for time stamps in ODBC backend to allow fractions of seconds to be stored without an error
		11	* Feature: Enhanced determination of column types in SQLite3 backend when SQLite returns a NULL value
		12	* Feature: Improved recovery from errors in odbx-sql utility
		13	* Change: Updated libtool to 2.2.6b
		14
		15	2010-04-19 Norbert Sendetzky <norbert@linuxnetworks.de>
		16
		17	* Change: Changed required autoconf version to 2.61
		18	* Change: Modified spec file to build firebird, mssql and sybase backends on supported plattforms by default
		19	* Bugfix: Fixed reference counting of objects in libopendbxplus (thanks to Rodolfo Lima)
		20	* Bugfix: Removed ODBC connection attributes which don't work with Windows ODBC
		21	* Bugfix: Fixed wrong error severity in mssql backend when connection couldn't be established
		22	* Bugfix: Fixed wild pointer in oracle backend that my lead to problems when error handling isn't implemented correctly
		23	* Bugfix: Fixed checking for highest error constant so last error message will be displayed correctly
		24	* Bugfix: Adapted spec file for OpenSUSE build service
		25
		26	2009-09-30 Norbert Sendetzky <norbert@linuxnetworks.de>
		27
		28	* Change: Changed mysql_real_connect options so odbx_rows_affected() is in line with other backends
		29	* Change: Don't set sql_mode in mysql backend if mode is an empty string (for MySQL < 4.1)
		30	* Bugfix: Fixed segmentation fault in mysql backend in threaded environments
		31	* Bugfix: Fixed mysql_real_connect options to keep options on reconnect
		32	* Bugfix: Fixed uninitialized variables in sqlite3 backend which may lead to a segfault
		33	* Bugfix: Cleanup connection in mysql backend if setting mode failed during odbx_bind()
		34	* Bugfix: Fixed several problems in RPM spec file
		35
1	2009-09-02 Norbert Sendetzky <norbert@linuxnetworks.de>	36	2009-09-02 Norbert Sendetzky <norbert@linuxnetworks.de>
2		37
3	* Bugfix: Fixed lost statements in sqlite3 backend if an error or a timeout occured	38	* Bugfix: Fixed lost statements in sqlite3 backend if an error or a timeout occured

Lines 1-3 Link Here

(-)opendbx.orig/debian/changelog (+27 lines)
		1	libopendbx (1.4.6-1) unstable; urgency=low
		2
		3	* New upstream version (stable version)
		4	* Fixed build requirements for Ubuntu
		5
		6	-- Norbert Sendetzky <norbert@linuxnetworks.de> Sat, 05 May 2012 00:00:00 +0100
		7
		8	libopendbx (1.4.5-1) unstable; urgency=medium
		9
		10	* New upstream version (stable version)
		11	* Fixed build requirements
		12	* Changed debhelper compatibility level to 7
		13
		14	-- Norbert Sendetzky <norbert@linuxnetworks.de> Fri, 25 Dec 2009 00:00:00 +0100
		15
		16	libopendbx (1.4.4-1) unstable; urgency=medium
		17
		18	* New upstream version (stable version)
		19
		20	-- Norbert Sendetzky <norbert@linuxnetworks.de> Fri, 07 Aug 2009 00:00:00 +0100
		21
		22	libopendbx (1.4.3-1) unstable; urgency=medium
		23
		24	* New upstream version (stable version)
		25
		26	-- Norbert Sendetzky <norbert@linuxnetworks.de> Fri, 07 Aug 2009 00:00:00 +0100
		27
1	libopendbx (1.4.2-1) unstable; urgency=medium	28	libopendbx (1.4.2-1) unstable; urgency=medium
2		29
3	* New upstream version (stable version)	30	* New upstream version (stable version)

Lines 54-61 Link Here

(-)opendbx.orig/lib/odbx.cpp (-76 / +91 lines)
54	* OpenDBX large object interface	54	* OpenDBX large object interface
55	*/	55	*/
56		56
57
58
59	Lob::Lob( Lob_Iface* impl ) throw( std::exception )	57	Lob::Lob( Lob_Iface* impl ) throw( std::exception )
60	{	58	{
61	m_impl = impl;	59	m_impl = impl;
Lines 68-100 Link Here
68		66
69	Lob::Lob( const Lob& ref ) throw()	67	Lob::Lob( const Lob& ref ) throw()
70	{	68	{
71	if( --(*m_ref) == 0 )	69	m_impl = ref.m_impl;
		70	m_ref = ref.m_ref;
		71
		72	if( m_ref == NULL )
72	{	73	{
73	try	74	m_ref = new int;
74	{	75	*m_ref = 0;
75	delete m_impl;
76	delete m_ref;
77	}
78	catch( std::exception& e ) {}
79	}	76	}
80		77
81	m_impl = ref.m_impl;
82	m_ref = ref.m_ref;
83	++(*m_ref);	78	++(*m_ref);
84	}	79	}
85		80
86		81
87
88	Lob::~Lob() throw()	82	Lob::~Lob() throw()
89	{	83	{
90	if( --(*m_ref) == 0 )	84	if( m_ref != NULL && --(*m_ref) == 0 )
91	{	85	{
92	try
93	{
94	delete m_impl;	86	delete m_impl;
95	delete m_ref;	87	delete m_ref;
96	}
97	catch( std::exception& e ) {}
98	}	88	}
99	}	89	}
100		90
Lines 102-108 Link Here
102		92
103	Lob& Lob::operator=( const Lob& ref ) throw()	93	Lob& Lob::operator=( const Lob& ref ) throw()
104	{	94	{
105	if( this != &ref ) { Lob( ref ); }	95	if( m_ref != NULL && --(*m_ref) == 0 )
		96	{
		97	delete m_impl;
		98	delete m_ref;
		99	}
		100
		101	m_impl = ref.m_impl;
		102	m_ref = ref.m_ref;
		103
		104	if( m_ref == NULL )
		105	{
		106	m_ref = new int;
		107	*m_ref = 0;
		108	}
		109
		110	++(*m_ref);
106		111
107	return *this;	112	return *this;
108	}	113	}
Lines 150-167 Link Here
150		155
151	Result::Result( const Result& ref ) throw()	156	Result::Result( const Result& ref ) throw()
152	{	157	{
153	if( --(*m_ref) == 0 )	158	m_impl = ref.m_impl;
		159	m_ref = ref.m_ref;
		160
		161	if( m_ref == NULL )
154	{	162	{
155	try	163	m_ref = new int;
156	{	164	*m_ref = 0;
157	delete m_impl;
158	delete m_ref;
159	}
160	catch( std::exception& e ) {}
161	}	165	}
162		166
163	m_impl = ref.m_impl;
164	m_ref = ref.m_ref;
165	++(*m_ref);	167	++(*m_ref);
166	}	168	}
167		169
Lines 169-182 Link Here
169		171
170	Result::~Result() throw()	172	Result::~Result() throw()
171	{	173	{
172	if( --(*m_ref) == 0 )	174	if( m_ref != NULL && --(*m_ref) == 0 )
173	{	175	{
174	try	176	delete m_impl;
175	{	177	delete m_ref;
176	delete m_impl;
177	delete m_ref;
178	}
179	catch( std::exception& e ) {}
180	}	178	}
181	}	179	}
182		180
Lines 184-190 Link Here
184		182
185	Result& Result::operator=( const Result& ref ) throw()	183	Result& Result::operator=( const Result& ref ) throw()
186	{	184	{
187	if( this != &ref ) { Result( ref ); }	185	if( m_ref != NULL && --(*m_ref) == 0 )
		186	{
		187	delete m_impl;
		188	delete m_ref;
		189	}
		190
		191	m_impl = ref.m_impl;
		192	m_ref = ref.m_ref;
		193
		194	if( m_ref == NULL )
		195	{
		196	m_ref = new int;
		197	*m_ref = 0;
		198	}
		199
		200	++(*m_ref);
188		201
189	return *this;	202	return *this;
190	}	203	}
Lines 287-304 Link Here
287		300
288	Stmt::Stmt( const Stmt& ref ) throw()	301	Stmt::Stmt( const Stmt& ref ) throw()
289	{	302	{
290	if( --(*m_ref) == 0 )	303	m_impl = ref.m_impl;
		304	m_ref = ref.m_ref;
		305
		306	if( m_ref == NULL )
291	{	307	{
292	try	308	m_ref = new int;
293	{	309	*m_ref = 0;
294	delete m_impl;
295	delete m_ref;
296	}
297	catch( std::exception& e ) {}
298	}	310	}
299		311
300	m_impl = ref.m_impl;
301	m_ref = ref.m_ref;
302	++(*m_ref);	312	++(*m_ref);
303	}	313	}
304		314
Lines 306-319 Link Here
306		316
307	Stmt::~Stmt() throw()	317	Stmt::~Stmt() throw()
308	{	318	{
309	if( --(*m_ref) == 0 )	319	if( m_ref != NULL && --(*m_ref) == 0 )
310	{	320	{
311	try	321	delete m_impl;
312	{	322	delete m_ref;
313	delete m_impl;
314	delete m_ref;
315	}
316	catch( std::exception& e ) {}
317	}	323	}
318	}	324	}
319		325
Lines 321-327 Link Here
321		327
322	Stmt& Stmt::operator=( const Stmt& ref ) throw()	328	Stmt& Stmt::operator=( const Stmt& ref ) throw()
323	{	329	{
324	if( this != &ref ) { Stmt( ref ); }	330	if( m_ref != NULL && --(*m_ref) == 0 )
		331	{
		332	delete m_impl;
		333	delete m_ref;
		334	}
		335
		336	m_impl = ref.m_impl;
		337	m_ref = ref.m_ref;
		338
		339	if( m_ref == NULL )
		340	{
		341	m_ref = new int;
		342	*m_ref = 0;
		343	}
		344
		345	++(*m_ref);
325		346
326	return *this;	347	return *this;
327	}	348	}
Lines 384-403 Link Here
384		405
385	Conn::Conn( const Conn& ref ) throw()	406	Conn::Conn( const Conn& ref ) throw()
386	{	407	{
387	if( m_ref != NULL && --(*m_ref) == 0 )
388	{
389	try
390	{
391	delete m_impl;
392	delete m_ref;
393	}
394	catch( std::exception& e ) {}
395	}
396
397	m_impl = ref.m_impl;	408	m_impl = ref.m_impl;
398	m_ref = ref.m_ref;	409	m_ref = ref.m_ref;
399		410
400	if( m_ref != NULL ) { ++(*m_ref); }	411	if( m_ref == NULL )
		412	{
		413	m_ref = new int;
		414	*m_ref = 0;
		415	}
		416
		417	++(*m_ref);
401	}	418	}
402		419
403		420
Lines 406-417 Link Here
406	{	423	{
407	if( m_ref != NULL && --(*m_ref) == 0 )	424	if( m_ref != NULL && --(*m_ref) == 0 )
408	{	425	{
409	try	426	delete m_impl;
410	{	427	delete m_ref;
411	delete m_impl;
412	delete m_ref;
413	}
414	catch( std::exception& e ) {}
415	}	428	}
416	}	429	}
417		430
Lines 421-438 Link Here
421	{	434	{
422	if( m_ref != NULL && --(*m_ref) == 0 )	435	if( m_ref != NULL && --(*m_ref) == 0 )
423	{	436	{
424	try	437	delete m_impl;
425	{	438	delete m_ref;
426	delete m_impl;
427	delete m_ref;
428	}
429	catch( std::exception& e ) {}
430	}	439	}
431		440
432	m_impl = ref.m_impl;	441	m_impl = ref.m_impl;
433	m_ref = ref.m_ref;	442	m_ref = ref.m_ref;
434		443
435	if( m_ref != NULL ) { ++(*m_ref); }	444	if( m_ref == NULL )
		445	{
		446	m_ref = new int;
		447	*m_ref = 0;
		448	}
		449
		450	++(*m_ref);
436		451
437	return *this;	452	return *this;
438	}	453	}

Lines 1-6 Link Here

(-)opendbx.orig/ltmain.sh (-4 / +4 lines)
1	# Generated from ltmain.m4sh.	1	# Generated from ltmain.m4sh.
2		2
3	# ltmain.sh (GNU libtool) 2.2.6	3	# ltmain.sh (GNU libtool) 2.2.6b
4	# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996	4	# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
5		5
6	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.	6	# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
Lines 65-71 Link Here
65	# compiler: $LTCC	65	# compiler: $LTCC
66	# compiler flags: $LTCFLAGS	66	# compiler flags: $LTCFLAGS
67	# linker: $LD (gnu? $with_gnu_ld)	67	# linker: $LD (gnu? $with_gnu_ld)
68	# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4	68	# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
69	# automake: $automake_version	69	# automake: $automake_version
70	# autoconf: $autoconf_version	70	# autoconf: $autoconf_version
71	#	71	#
Lines 73-81 Link Here
73		73
74	PROGRAM=ltmain.sh	74	PROGRAM=ltmain.sh
75	PACKAGE=libtool	75	PACKAGE=libtool
76	VERSION="2.2.6 Debian-2.2.6a-4"	76	VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
77	TIMESTAMP=""	77	TIMESTAMP=""
78	package_revision=1.3012	78	package_revision=1.3017
79		79
80	# Be Bourne compatible	80	# Be Bourne compatible
81	if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then	81	if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

Lines 9-23 Link Here

(-)opendbx.orig/m4/ltversion.m4 (-5 / +5 lines)
9		9
10	# Generated from ltversion.in.	10	# Generated from ltversion.in.
11		11
12	# serial 3012 ltversion.m4	12	# serial 3017 ltversion.m4
13	# This file is part of GNU Libtool	13	# This file is part of GNU Libtool
14		14
15	m4_define([LT_PACKAGE_VERSION], [2.2.6])	15	m4_define([LT_PACKAGE_VERSION], [2.2.6b])
16	m4_define([LT_PACKAGE_REVISION], [1.3012])	16	m4_define([LT_PACKAGE_REVISION], [1.3017])
17		17
18	AC_DEFUN([LTVERSION_VERSION],	18	AC_DEFUN([LTVERSION_VERSION],
19	[macro_version='2.2.6'	19	[macro_version='2.2.6b'
20	macro_revision='1.3012'	20	macro_revision='1.3017'
21	_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])	21	_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
22	_LT_DECL(, macro_revision, 0)	22	_LT_DECL(, macro_revision, 0)
23	])	23	])

Lines 1-4 Link Here

(-)opendbx.orig/Makefile.in (-10 / +12 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Lines 39-46 Link Here
39	$(srcdir)/Makefile.in $(srcdir)/config.h.in \	39	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
40	$(srcdir)/opendbx.pc.in $(srcdir)/opendbx.spec.in \	40	$(srcdir)/opendbx.pc.in $(srcdir)/opendbx.spec.in \
41	$(srcdir)/opendbxplus.pc.in $(top_srcdir)/configure ABOUT-NLS \	41	$(srcdir)/opendbxplus.pc.in $(top_srcdir)/configure ABOUT-NLS \
42	AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \	42	AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
43	config.rpath config.sub depcomp install-sh ltmain.sh missing	43	config.guess config.rpath config.sub depcomp install-sh \
		44	ltmain.sh missing
44	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4	45	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
45	am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \	46	am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
46	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \	47	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
Lines 407-413 Link Here
407	# (which will cause the Makefiles to be regenerated when you run `make');	408	# (which will cause the Makefiles to be regenerated when you run `make');
408	# (2) otherwise, pass the desired values on the `make' command line.	409	# (2) otherwise, pass the desired values on the `make' command line.
409	$(RECURSIVE_TARGETS):	410	$(RECURSIVE_TARGETS):
410	@failcom='exit 1'; \	411	@fail= failcom='exit 1'; \
411	for f in x $$MAKEFLAGS; do \	412	for f in x $$MAKEFLAGS; do \
412	case $$f in \	413	case $$f in \
413	= \| --[!k]*);; \	414	= \| --[!k]*);; \
Lines 432-438 Link Here
432	fi; test -z "$$fail"	433	fi; test -z "$$fail"
433		434
434	$(RECURSIVE_CLEAN_TARGETS):	435	$(RECURSIVE_CLEAN_TARGETS):
435	@failcom='exit 1'; \	436	@fail= failcom='exit 1'; \
436	for f in x $$MAKEFLAGS; do \	437	for f in x $$MAKEFLAGS; do \
437	case $$f in \	438	case $$f in \
438	= \| --[!k]*);; \	439	= \| --[!k]*);; \
Lines 596-602 Link Here
596	fi; \	597	fi; \
597	done	598	done
598	-test -n "$(am__skip_mode_fix)" \	599	-test -n "$(am__skip_mode_fix)" \
599	\|\| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \	600	\|\| find "$(distdir)" -type d ! -perm -755 \
		601	-exec chmod u+rwx,go+rx {} \; -o \
600	! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \	602	! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
601	! -type d ! -perm -400 -exec chmod a+r {} \; -o \	603	! -type d ! -perm -400 -exec chmod a+r {} \; -o \
602	! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \	604	! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
Lines 640-656 Link Here
640	distcheck: dist	642	distcheck: dist
641	case '$(DIST_ARCHIVES)' in \	643	case '$(DIST_ARCHIVES)' in \
642	.tar.gz) \	644	.tar.gz) \
643	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz \| $(am__untar) ;;\	645	GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz \| $(am__untar) ;;\
644	.tar.bz2) \	646	.tar.bz2) \
645	bunzip2 -c $(distdir).tar.bz2 \| $(am__untar) ;;\	647	bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
646	.tar.lzma) \	648	.tar.lzma) \
647	unlzma -c $(distdir).tar.lzma \| $(am__untar) ;;\	649	lzma -dc $(distdir).tar.lzma \| $(am__untar) ;;\
648	.tar.xz) \	650	.tar.xz) \
649	xz -dc $(distdir).tar.xz \| $(am__untar) ;;\	651	xz -dc $(distdir).tar.xz \| $(am__untar) ;;\
650	.tar.Z) \	652	.tar.Z) \
651	uncompress -c $(distdir).tar.Z \| $(am__untar) ;;\	653	uncompress -c $(distdir).tar.Z \| $(am__untar) ;;\
652	.shar.gz) \	654	.shar.gz) \
653	GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz \| unshar ;;\	655	GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz \| unshar ;;\
654	.zip) \	656	.zip) \
655	unzip $(distdir).zip ;;\	657	unzip $(distdir).zip ;;\
656	esac	658	esac

Lines 3-26 Link Here

(-)opendbx.orig/opendbx.spec (-157 / +221 lines)
3	#	3	#
4	# By default OpenDBX is build with this backends:	4	# By default OpenDBX is build with this backends:
5	# - mysql	5	# - mysql
6	# - pgsql
7	# - odbc	6	# - odbc
		7	# - pgsql
8	# - sqlite3	8	# - sqlite3
9	# to disable use --without [module-name]	9	# to disable use --without [module-name]
10	#	10	#
11	# Optional supported backends are:	11	# Optional supported backends are:
12	# - firebird	12	# - firebird
13	# - mssql	13	# - mssql
14	# - sqlite
15	# - oracle	14	# - oracle
		15	# - sqlite
16	# - sybase	16	# - sybase
17	# to enable use --with [module-name]	17	# to enable use --with [module-name]
18	#	18	#
19		19
		20	%if 0%{?_with_firebird:1}
		21	%define build_firebird 1
		22	%endif
		23	%if 0%{!?_without_firebird:1} && 0%{?fedora} >= 12
		24	%define build_firebird 1
		25	%endif
		26	%if 0%{!?_without_firebird:1} && 0%{?suse_version} >= 1120
		27	%define build_firebird 1
		28	%endif
		29
		30	%if 0%{?_with_mssql:1}
		31	%define build_mssql 1
		32	%endif
		33	%if 0%{!?_without_mssql:1} && 0%{?fedora} >= 9
		34	%define build_mssql 1
		35	%endif
		36	%if 0%{!?_without_mssql:1} && 0%{?mdkversion} >= 200910
		37	%define build_mssql 1
		38	%endif
		39
		40	%if 0%{!?_without_mysql:1}
		41	%define build_mysql 1
		42	%endif
		43
		44	%if 0%{!?_without_odbc:1}
		45	%define build_odbc 1
		46	%endif
		47
		48	%if 0%{?_with_oracle:1}
		49	%define build_oracle 1
		50	%endif
		51
		52	%if 0%{!?_without_pgsql:1}
		53	%define build_pgsql 1
		54	%endif
		55
		56	%if 0%{?_with_sqlite:1}
		57	%define build_sqlite 1
		58	%endif
		59
		60	%if 0%{!?_without_sqlite3:1}
		61	%define build_sqlite3 1
		62	%endif
		63
		64	%if 0%{?_with_sybase:1}
		65	%define build_sybase 1
		66	%endif
		67	%if 0%{!?_without_sybase:1} && 0%{?fedora} >= 9
		68	%define build_mssql 1
		69	%endif
		70	%if 0%{!?_without_sybase:1} && 0%{?mdkversion} >= 200910
		71	%define build_mssql 1
		72	%endif
		73
20		74
21	Name: opendbx	75	Name: opendbx
22	Version: 1.4.3	76	Version: 1.4.6
23	Release: 1%{?dist}	77	Release: 1
24	Summary: Unified database layer with a clean and lightweight interface	78	Summary: Unified database layer with a clean and lightweight interface
25	Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle	79	Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle
26	Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych	80	Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych
Lines 28-34 Link Here
28	License: LGPL	82	License: LGPL
29	URL: http://www.linuxnetworks.de/opendbx/download/	83	URL: http://www.linuxnetworks.de/opendbx/download/
30	Source0: %{name}-%{version}.tar.gz	84	Source0: %{name}-%{version}.tar.gz
31	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	85	BuildRoot: %{_tmppath}/%{name}-%{version}-build
32	BuildRequires: gcc-c++, gettext	86	BuildRequires: gcc-c++, gettext
33		87
34	%description	88	%description
Lines 56-62 Link Here
56	Group: Applications/Databases	110	Group: Applications/Databases
57	Requires: %{name} >= %{version}	111	Requires: %{name} >= %{version}
58	Requires: readline, ncurses	112	Requires: readline, ncurses
59	BuildRequires: gcc-c++, readline, readline-devel, ncurses, ncurses-devel	113	BuildRequires: gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel
60		114
61	%description utils	115	%description utils
62	Utility application for manipulating database content either interactively by	116	Utility application for manipulating database content either interactively by
Lines 86-92 Link Here
86	Pliki nagłówkowe biblioteki opendbx.	140	Pliki nagłówkowe biblioteki opendbx.
87		141
88		142
89	%if %{!?_without_mysql:1}%{?_without_mysql:0}	143	%if 0%{?build_firebird:1}
		144
		145	%package firebird
		146	Summary: Firebird/Interbase backend for OpenDBX
		147	Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX
		148	Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX
		149	Group: Development/Libraries
		150	Requires: %{name} = %{version}-%{release}
		151	Requires: firebird
		152	BuildRequires: firebird-devel
		153
		154	%description firebird
		155	Firebird/Interbase backend for the OpenDBX database abstraction library
		156
		157	%description firebird -l de.UTF-8
		158	Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek
		159
		160	%description firebird -l pl.UTF-8
		161	Backend bazy danych Firebird dla biblioteki opendbx.
		162
		163	%endif
		164
		165
		166	%if 0%{?build_mssql:1}
		167
		168	%package mssql
		169	Summary: MS SQL Server backend for OpenDBX
		170	Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX
		171	Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX
		172	Group: Development/Libraries
		173	Requires: %{name} = %{version}-%{release}
		174	Requires: freetds
		175	BuildRequires: freetds-devel
		176
		177	%description mssql
		178	MS SQL Server backend for the OpenDBX database abstraction library
		179
		180	%description mssql -l de.UTF-8
		181	MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek
		182
		183	%description mssql -l pl.UTF-8
		184	Backend bazy danych MS SQL dla biblioteki opendbx.
		185
		186	%endif
		187
		188
		189	%if 0%{?build_mysql:1}
90		190
91	%package mysql	191	%package mysql
92	Summary: MySQL backend for OpenDBX	192	Summary: MySQL backend for OpenDBX
Lines 109-115 Link Here
109	%endif	209	%endif
110		210
111		211
112	%if %{!?_without_pgsql:1}%{?_without_pgsql:0}	212	%if 0%{?build_odbc:1}
		213
		214	%package odbc
		215	Summary: ODBC backend for OpenDBX
		216	Summary(de.UTF-8): ODBC Unterstützung für OpenDBX
		217	Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX
		218	Group: Development/Libraries
		219	Requires: %{name} = %{version}-%{release}
		220	Requires: unixODBC
		221	BuildRequires: unixODBC-devel
		222
		223	%description odbc
		224	ODBC backend for the OpenDBX database abstraction library
		225
		226	%description odbc -l de.UTF-8
		227	ODBC Unterstützung für die OpenDBX Datenbankbibliothek
		228
		229	%description odbc -l pl.UTF-8
		230	Backend bazy danych ODBC dla biblioteki opendbx.
		231
		232	%endif
		233
		234
		235	%if 0%{?build_oracle:1}
		236
		237	%package oracle
		238	Summary: Oracle backend for OpenDBX
		239	Summary(de.UTF-8): Oracle Unterstützung für OpenDBX
		240	Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX
		241	Group: Development/Libraries
		242	Requires: %{name} = %{version}-%{release}
		243
		244	%description oracle
		245	Oracle ctlib backend for the OpenDBX database abstraction library
		246
		247	%description oracle -l de.UTF-8
		248	Oracle Unterstützung für die OpenDBX Datenbankbibliothek
		249
		250	%description oracle -l pl.UTF-8
		251	Backend bazy danych Oracle dla biblioteki OpenDBX.
		252
		253	%endif
		254
		255
		256	%if 0%{?build_pgsql:1}
113		257
114	%package pgsql	258	%package pgsql
115	Summary: PostgreSQL backend for OpenDBX	259	Summary: PostgreSQL backend for OpenDBX
Lines 132-161 Link Here
132	%endif	276	%endif
133		277
134		278
135	%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0}	279	%if 0%{?build_sqlite:1}
136
137	%package sqlite3
138	Summary: SQLite3 backend for OpenDBX
139	Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX
140	Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX
141	Group: Development/Libraries
142	Requires: %{name} = %{version}-%{release}
143	Requires: sqlite >= 3.0
144	BuildRequires: sqlite-devel >= 3.0
145
146	%description sqlite3
147	SQLite3 backend for the OpenDBX database abstraction library
148
149	%description sqlite3 -l de.UTF-8
150	Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
151
152	%description sqlite3 -l pl.UTF-8
153	Backend bazy danych sqlite3 dla biblioteki opendbx.
154
155	%endif
156
157
158	%if %{?_with_sqlite:1}%{!?_with_sqlite:0}
159		280
160	%package sqlite	281	%package sqlite
161	Summary: SQLite backend for OpenDBX	282	Summary: SQLite backend for OpenDBX
Lines 178-251 Link Here
178	%endif	299	%endif
179		300
180		301
181	%if %{?_with_firebird:1}%{!?_with_firebird:0}	302	%if 0%{?build_sqlite3:1}
182
183	%package firebird
184	Summary: Firebird/Interbase backend for OpenDBX
185	Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX
186	Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX
187	Group: Development/Libraries
188	Requires: %{name} = %{version}-%{release}
189	Requires: firebird
190	BuildRequires: firebird-devel
191
192	%description firebird
193	Firebird/Interbase backend for the OpenDBX database abstraction library
194		303
195	%description firebird -l de.UTF-8	304	%package sqlite3
196	Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek	305	Summary: SQLite3 backend for OpenDBX
197		306	Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX
198	%description firebird -l pl.UTF-8	307	Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX
199	Backend bazy danych Firebird dla biblioteki opendbx.
200
201	%endif
202
203
204	%if %{?_with_mssql:1}%{!?_with_mssql:0}
205
206	%package mssql
207	Summary: MS SQL Server backend for OpenDBX
208	Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX
209	Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX
210	Group: Development/Libraries	308	Group: Development/Libraries
211	Requires: %{name} = %{version}-%{release}	309	Requires: %{name} = %{version}-%{release}
212	Requires: freetds	310	%if 0%{?mandriva_version}
213	BuildRequires: freetds-devel	311	Requires: sqlite3
214		312	BuildRequires: sqlite3-devel
215	%description mssql	313	%else
216	MS SQL Server backend for the OpenDBX database abstraction library	314	Requires: sqlite >= 3.0
217		315	BuildRequires: sqlite-devel >= 3.0
218	%description mssql -l de.UTF-8
219	MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek
220
221	%description mssql -l pl.UTF-8
222	Backend bazy danych MS SQL dla biblioteki opendbx.
223
224	%endif	316	%endif
225		317
		318	%description sqlite3
		319	SQLite3 backend for the OpenDBX database abstraction library
226		320
227	%if %{?_with_oracle:1}%{!?_with_oracle:0}	321	%description sqlite3 -l de.UTF-8
228		322	Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
229	%package oracle
230	Summary: Oracle backend for OpenDBX
231	Summary(de.UTF-8): Oracle Unterstützung für OpenDBX
232	Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX
233	Group: Development/Libraries
234	Requires: %{name} = %{version}-%{release}
235
236	%description oracle
237	Oracle ctlib backend for the OpenDBX database abstraction library
238
239	%description oracle -l de.UTF-8
240	Oracle Unterstützung für die OpenDBX Datenbankbibliothek
241		323
242	%description oracle -l pl.UTF-8	324	%description sqlite3 -l pl.UTF-8
243	Backend bazy danych Oracle dla biblioteki OpenDBX.	325	Backend bazy danych sqlite3 dla biblioteki opendbx.
244		326
245	%endif	327	%endif
246		328
247		329
248	%if %{?_with_sybase:1}%{!?_with_sybase:0}	330	%if 0%{?build_sybase:1}
249		331
250	%package sybase	332	%package sybase
251	Summary: Sybase backend for OpenDBX	333	Summary: Sybase backend for OpenDBX
Lines 268-329 Link Here
268	%endif	350	%endif
269		351
270		352
271	%if %{!?_without_odbc:1}%{?_without_odbc:0}
272
273	%package odbc
274	Summary: ODBC backend for OpenDBX
275	Summary(de.UTF-8): ODBC Unterstützung für OpenDBX
276	Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX
277	Group: Development/Libraries
278	Requires: %{name} = %{version}-%{release}
279	Requires: unixODBC
280	BuildRequires: unixODBC-devel
281
282	%description odbc
283	ODBC backend for the OpenDBX database abstraction library
284
285	%description odbc -l de.UTF-8
286	ODBC Unterstützung für die OpenDBX Datenbankbibliothek
287
288	%description odbc -l pl.UTF-8
289	Backend bazy danych ODBC dla biblioteki opendbx.
290
291	%endif
292
293
294	%prep	353	%prep
295		354
296		355
297	%setup -q	356	%setup -q -n opendbx-%{version}
298		357
299		358
300	%build	359	%build
301	CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;	360	CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;
302	LDFLAGS="%{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;	361	LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;
303	%configure \	362	%configure \
304	--disable-rpath \	363	--disable-rpath \
305	--disable-static \	364	--disable-static \
306	--with-backends="\	365	--with-backends="\
307	%{?_with_firebird:firebird }\	366	%{?build_firebird:firebird }\
308	%{?_with_mssql:mssql }\	367	%{?build_mssql:mssql }\
309	%{!?_without_mysql:mysql }\	368	%{?build_mysql:mysql }\
310	%{!?_without_odbc:odbc }\	369	%{?build_odbc:odbc }\
311	%{?_with_oracle:oracle }\	370	%{?build_oracle:oracle }\
312	%{!?_without_pgsql:pgsql }\	371	%{?build_pgsql:pgsql }\
313	%{?_with_sqlite:sqlite }\	372	%{?build_sqlite:sqlite }\
314	%{!?_without_sqlite3:sqlite3 }\	373	%{?build_sqlite3:sqlite3 }\
315	%{?_with_sybase:sybase }\	374	%{?build_sybase:sybase }\
316	" \|\| cat config.log	375	" \|\| cat config.log
317		376
318	%{__make} %{?_smp_mflags}	377	%{__make} %{?_smp_mflags}
319		378
320		379
321	%install	380	%install
322	if test "%{buildroot}" != "/"; then rm -rf %{buildroot}; fi
323	%{__make} DESTDIR=%{buildroot} install	381	%{__make} DESTDIR=%{buildroot} install
		382	rm %{buildroot}%{_libdir}/lib.a
324	rm %{buildroot}%{_libdir}/opendbx/lib.a	383	rm %{buildroot}%{_libdir}/opendbx/lib.a
325	rm %{buildroot}%{_libdir}/libopendbx.*a
326	rm %{buildroot}%{_libdir}/libopendbxplus.*a
327	%find_lang %{name}	384	%find_lang %{name}
328	%find_lang %{name}-utils	385	%find_lang %{name}-utils
329		386
Lines 340-348 Link Here
340		397
341	%files -f %{name}.lang	398	%files -f %{name}.lang
342	%defattr(-,root,root,-)	399	%defattr(-,root,root,-)
343	%{_libdir}/opendbx
344	%{_libdir}/libopendbx.so.*	400	%{_libdir}/libopendbx.so.*
345	%{_libdir}/libopendbxplus.so.*	401	%{_libdir}/libopendbxplus.so.*
		402	%dir %{_libdir}/opendbx
346	%doc AUTHORS COPYING ChangeLog NEWS README TODO	403	%doc AUTHORS COPYING ChangeLog NEWS README TODO
347		404
348		405
Lines 366-439 Link Here
366	#%{_mandir}/man3/*	423	#%{_mandir}/man3/*
367		424
368		425
369	%if %{!?_without_mysql:1}%{?_without_mysql:0}	426	%if 0%{?build_firebird:1}
370	%files mysql	427	%files firebird
371	%defattr(-,root,root,-)	428	%defattr(-,root,root,-)
372	%{_libdir}/opendbx/libmysqlbackend.so*	429	%{_libdir}/opendbx/libfirebirdbackend.so*
373	%endif	430	%endif
374		431
375		432
376	%if %{!?_without_pgsql:1}%{?_without_pgsql:0}	433	%if 0%{?build_mssql:1}
377	%files pgsql	434	%files mssql
378	%defattr(-,root,root,-)	435	%defattr(-,root,root,-)
379	%{_libdir}/opendbx/libpgsqlbackend.so*	436	%{_libdir}/opendbx/libmssqlbackend.so*
380	%endif	437	%endif
381		438
382		439
383	%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0}	440	%if 0%{?build_mysql:1}
384	%files sqlite3	441	%files mysql
385	%defattr(-,root,root,-)	442	%defattr(-,root,root,-)
386	%{_libdir}/opendbx/libsqlite3backend.so*	443	%{_libdir}/opendbx/libmysqlbackend.so*
387	%endif	444	%endif
388		445
389		446
390	%if %{?_with_sqlite:1}%{!?_with_sqlite:0}	447	%if 0%{?build_odbc:1}
391	%files sqlite	448	%files odbc
392	%defattr(-,root,root,-)	449	%defattr(-,root,root,-)
393	%{_libdir}/opendbx/libsqlitebackend.so*	450	%{_libdir}/opendbx/libodbcbackend.so*
394	%endif	451	%endif
395		452
396		453
397	%if %{?_with_firebird:1}%{!?_with_firebird:0}	454	%if 0%{?build_oracle:1}
398	%files firebird	455	%files oracle
399	%defattr(-,root,root,-)	456	%defattr(-,root,root,-)
400	%{_libdir}/opendbx/libfirebirdbackend.so*	457	%{_libdir}/opendbx/liboraclebackend.so*
401	%endif	458	%endif
402		459
403		460
404	%if %{?_with_mssql:1}%{!?_with_mssql:0}	461	%if 0%{?build_pgsql:1}
405	%files mssql	462	%files pgsql
406	%defattr(-,root,root,-)	463	%defattr(-,root,root,-)
407	%{_libdir}/opendbx/libmssqlbackend.so*	464	%{_libdir}/opendbx/libpgsqlbackend.so*
408	%endif	465	%endif
409		466
410		467
411	%if %{?_with_oracle:1}%{!?_with_oracle:0}	468	%if 0%{?build_sqlite:1}
412	%files oracle	469	%files sqlite
413	%defattr(-,root,root,-)	470	%defattr(-,root,root,-)
414	%{_libdir}/opendbx/liboraclebackend.so*	471	%{_libdir}/opendbx/libsqlitebackend.so*
415	%endif	472	%endif
416		473
417		474
418	%if %{?_with_sybase:1}%{!?_with_sybase:0}	475	%if 0%{?build_sqlite3:1}
419	%files sybase	476	%files sqlite3
420	%defattr(-,root,root,-)	477	%defattr(-,root,root,-)
421	%{_libdir}/opendbx/libsybasebackend.so*	478	%{_libdir}/opendbx/libsqlite3backend.so*
422	%endif	479	%endif
423		480
424		481
425	%if %{?_with_odbc:1}%{!?_with_odbc:0}	482	%if 0%{?build_sybase:1}
426	%files odbc	483	%files sybase
427	%defattr(-,root,root,-)	484	%defattr(-,root,root,-)
428	%{_libdir}/opendbx/libodbcbackend.so*	485	%{_libdir}/opendbx/libsybasebackend.so*
429	%endif	486	%endif
430		487
431		488
432	%changelog	489	%changelog
433	* Wed Sep 02 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.3-1	490	* Mon Apr 19 2010 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.5-1
434	- Added workarounds for RHEL, CentOS and Mandriva regarding readline	491	- Centralized decisions which backends to build
435	- Fixed odbc package in spec file	492	- Build firebird, mssql and sybase backends for supported distributions
		493	- Reordered backends
		494
		495	* Wed Sep 30 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.4-1
		496	- Fixed included backends in main package
		497	- Fixed odbx package
436	- Fixed builds on x86_64 platforms	498	- Fixed builds on x86_64 platforms
		499	- Compatible with OpenSUSE build service
		500	- Added workarounds for RHEL, CentOS and Mandriva regarding readline
437		501
438	* Sun Apr 19 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.1-1	502	* Sun Apr 19 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.1-1
439	- Added opendbxplus.pc	503	- Added opendbxplus.pc

Lines 3-26 Link Here

(-)opendbx.orig/opendbx.spec.in (-156 / +220 lines)
3	#	3	#
4	# By default OpenDBX is build with this backends:	4	# By default OpenDBX is build with this backends:
5	# - mysql	5	# - mysql
6	# - pgsql
7	# - odbc	6	# - odbc
		7	# - pgsql
8	# - sqlite3	8	# - sqlite3
9	# to disable use --without [module-name]	9	# to disable use --without [module-name]
10	#	10	#
11	# Optional supported backends are:	11	# Optional supported backends are:
12	# - firebird	12	# - firebird
13	# - mssql	13	# - mssql
14	# - sqlite
15	# - oracle	14	# - oracle
		15	# - sqlite
16	# - sybase	16	# - sybase
17	# to enable use --with [module-name]	17	# to enable use --with [module-name]
18	#	18	#
19		19
		20	%if 0%{?_with_firebird:1}
		21	%define build_firebird 1
		22	%endif
		23	%if 0%{!?_without_firebird:1} && 0%{?fedora} >= 12
		24	%define build_firebird 1
		25	%endif
		26	%if 0%{!?_without_firebird:1} && 0%{?suse_version} >= 1120
		27	%define build_firebird 1
		28	%endif
		29
		30	%if 0%{?_with_mssql:1}
		31	%define build_mssql 1
		32	%endif
		33	%if 0%{!?_without_mssql:1} && 0%{?fedora} >= 9
		34	%define build_mssql 1
		35	%endif
		36	%if 0%{!?_without_mssql:1} && 0%{?mdkversion} >= 200910
		37	%define build_mssql 1
		38	%endif
		39
		40	%if 0%{!?_without_mysql:1}
		41	%define build_mysql 1
		42	%endif
		43
		44	%if 0%{!?_without_odbc:1}
		45	%define build_odbc 1
		46	%endif
		47
		48	%if 0%{?_with_oracle:1}
		49	%define build_oracle 1
		50	%endif
		51
		52	%if 0%{!?_without_pgsql:1}
		53	%define build_pgsql 1
		54	%endif
		55
		56	%if 0%{?_with_sqlite:1}
		57	%define build_sqlite 1
		58	%endif
		59
		60	%if 0%{!?_without_sqlite3:1}
		61	%define build_sqlite3 1
		62	%endif
		63
		64	%if 0%{?_with_sybase:1}
		65	%define build_sybase 1
		66	%endif
		67	%if 0%{!?_without_sybase:1} && 0%{?fedora} >= 9
		68	%define build_mssql 1
		69	%endif
		70	%if 0%{!?_without_sybase:1} && 0%{?mdkversion} >= 200910
		71	%define build_mssql 1
		72	%endif
		73
20		74
21	Name: @PACKAGE@	75	Name: @PACKAGE@
22	Version: @VERSION@	76	Version: @VERSION@
23	Release: 1%{?dist}	77	Release: 1
24	Summary: Unified database layer with a clean and lightweight interface	78	Summary: Unified database layer with a clean and lightweight interface
25	Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle	79	Summary(de.UTF-8): Bibliothek zum Zugriff auf Datenbanken über eine einheitliche Schnittstelle
26	Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych	80	Summary(pl.UTF-8): Rozszerzana biblioteka dostępu do baz danych
Lines 28-34 Link Here
28	License: LGPL	82	License: LGPL
29	URL: http://www.linuxnetworks.de/opendbx/download/	83	URL: http://www.linuxnetworks.de/opendbx/download/
30	Source0: %{name}-%{version}.tar.gz	84	Source0: %{name}-%{version}.tar.gz
31	BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)	85	BuildRoot: %{_tmppath}/%{name}-%{version}-build
32	BuildRequires: gcc-c++, gettext	86	BuildRequires: gcc-c++, gettext
33		87
34	%description	88	%description
Lines 56-62 Link Here
56	Group: Applications/Databases	110	Group: Applications/Databases
57	Requires: %{name} >= %{version}	111	Requires: %{name} >= %{version}
58	Requires: readline, ncurses	112	Requires: readline, ncurses
59	BuildRequires: gcc-c++, readline, readline-devel, ncurses, ncurses-devel	113	BuildRequires: gcc-c++, gettext, readline, readline-devel, ncurses, ncurses-devel
60		114
61	%description utils	115	%description utils
62	Utility application for manipulating database content either interactively by	116	Utility application for manipulating database content either interactively by
Lines 86-92 Link Here
86	Pliki nagłówkowe biblioteki opendbx.	140	Pliki nagłówkowe biblioteki opendbx.
87		141
88		142
89	%if %{!?_without_mysql:1}%{?_without_mysql:0}	143	%if 0%{?build_firebird:1}
		144
		145	%package firebird
		146	Summary: Firebird/Interbase backend for OpenDBX
		147	Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX
		148	Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX
		149	Group: Development/Libraries
		150	Requires: %{name} = %{version}-%{release}
		151	Requires: firebird
		152	BuildRequires: firebird-devel
		153
		154	%description firebird
		155	Firebird/Interbase backend for the OpenDBX database abstraction library
		156
		157	%description firebird -l de.UTF-8
		158	Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek
		159
		160	%description firebird -l pl.UTF-8
		161	Backend bazy danych Firebird dla biblioteki opendbx.
		162
		163	%endif
		164
		165
		166	%if 0%{?build_mssql:1}
		167
		168	%package mssql
		169	Summary: MS SQL Server backend for OpenDBX
		170	Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX
		171	Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX
		172	Group: Development/Libraries
		173	Requires: %{name} = %{version}-%{release}
		174	Requires: freetds
		175	BuildRequires: freetds-devel
		176
		177	%description mssql
		178	MS SQL Server backend for the OpenDBX database abstraction library
		179
		180	%description mssql -l de.UTF-8
		181	MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek
		182
		183	%description mssql -l pl.UTF-8
		184	Backend bazy danych MS SQL dla biblioteki opendbx.
		185
		186	%endif
		187
		188
		189	%if 0%{?build_mysql:1}
90		190
91	%package mysql	191	%package mysql
92	Summary: MySQL backend for OpenDBX	192	Summary: MySQL backend for OpenDBX
Lines 109-115 Link Here
109	%endif	209	%endif
110		210
111		211
112	%if %{!?_without_pgsql:1}%{?_without_pgsql:0}	212	%if 0%{?build_odbc:1}
		213
		214	%package odbc
		215	Summary: ODBC backend for OpenDBX
		216	Summary(de.UTF-8): ODBC Unterstützung für OpenDBX
		217	Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX
		218	Group: Development/Libraries
		219	Requires: %{name} = %{version}-%{release}
		220	Requires: unixODBC
		221	BuildRequires: unixODBC-devel
		222
		223	%description odbc
		224	ODBC backend for the OpenDBX database abstraction library
		225
		226	%description odbc -l de.UTF-8
		227	ODBC Unterstützung für die OpenDBX Datenbankbibliothek
		228
		229	%description odbc -l pl.UTF-8
		230	Backend bazy danych ODBC dla biblioteki opendbx.
		231
		232	%endif
		233
		234
		235	%if 0%{?build_oracle:1}
		236
		237	%package oracle
		238	Summary: Oracle backend for OpenDBX
		239	Summary(de.UTF-8): Oracle Unterstützung für OpenDBX
		240	Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX
		241	Group: Development/Libraries
		242	Requires: %{name} = %{version}-%{release}
		243
		244	%description oracle
		245	Oracle ctlib backend for the OpenDBX database abstraction library
		246
		247	%description oracle -l de.UTF-8
		248	Oracle Unterstützung für die OpenDBX Datenbankbibliothek
		249
		250	%description oracle -l pl.UTF-8
		251	Backend bazy danych Oracle dla biblioteki OpenDBX.
		252
		253	%endif
		254
		255
		256	%if 0%{?build_pgsql:1}
113		257
114	%package pgsql	258	%package pgsql
115	Summary: PostgreSQL backend for OpenDBX	259	Summary: PostgreSQL backend for OpenDBX
Lines 132-161 Link Here
132	%endif	276	%endif
133		277
134		278
135	%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0}	279	%if 0%{?build_sqlite:1}
136
137	%package sqlite3
138	Summary: SQLite3 backend for OpenDBX
139	Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX
140	Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX
141	Group: Development/Libraries
142	Requires: %{name} = %{version}-%{release}
143	Requires: sqlite >= 3.0
144	BuildRequires: sqlite-devel >= 3.0
145
146	%description sqlite3
147	SQLite3 backend for the OpenDBX database abstraction library
148
149	%description sqlite3 -l de.UTF-8
150	Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
151
152	%description sqlite3 -l pl.UTF-8
153	Backend bazy danych sqlite3 dla biblioteki opendbx.
154
155	%endif
156
157
158	%if %{?_with_sqlite:1}%{!?_with_sqlite:0}
159		280
160	%package sqlite	281	%package sqlite
161	Summary: SQLite backend for OpenDBX	282	Summary: SQLite backend for OpenDBX
Lines 178-251 Link Here
178	%endif	299	%endif
179		300
180		301
181	%if %{?_with_firebird:1}%{!?_with_firebird:0}	302	%if 0%{?build_sqlite3:1}
182
183	%package firebird
184	Summary: Firebird/Interbase backend for OpenDBX
185	Summary(de.UTF-8): Firebird/Interbase Unterstützung für OpenDBX
186	Summary(pl.UTF-8): Backend bazy danych Firebird dla biblioteki OpenDBX
187	Group: Development/Libraries
188	Requires: %{name} = %{version}-%{release}
189	Requires: firebird
190	BuildRequires: firebird-devel
191
192	%description firebird
193	Firebird/Interbase backend for the OpenDBX database abstraction library
194		303
195	%description firebird -l de.UTF-8	304	%package sqlite3
196	Firebird/Interbase Unterstützung für die OpenDBX Datenbankbibliothek	305	Summary: SQLite3 backend for OpenDBX
197		306	Summary(de.UTF-8): SQLite3 Unterstützung für OpenDBX
198	%description firebird -l pl.UTF-8	307	Summary(pl.UTF-8): Backend bazy danych SQLite3 dla biblioteki OpenDBX
199	Backend bazy danych Firebird dla biblioteki opendbx.
200
201	%endif
202
203
204	%if %{?_with_mssql:1}%{!?_with_mssql:0}
205
206	%package mssql
207	Summary: MS SQL Server backend for OpenDBX
208	Summary(de.UTF-8): MS SQL Server Unterstützung für OpenDBX
209	Summary(pl.UTF-8): Backend bazy danych MS SQL dla biblioteki OpenDBX
210	Group: Development/Libraries	308	Group: Development/Libraries
211	Requires: %{name} = %{version}-%{release}	309	Requires: %{name} = %{version}-%{release}
212	Requires: freetds	310	%if 0%{?mandriva_version}
213	BuildRequires: freetds-devel	311	Requires: sqlite3
214		312	BuildRequires: sqlite3-devel
215	%description mssql	313	%else
216	MS SQL Server backend for the OpenDBX database abstraction library	314	Requires: sqlite >= 3.0
217		315	BuildRequires: sqlite-devel >= 3.0
218	%description mssql -l de.UTF-8
219	MS SQL Server Unterstützung für die OpenDBX Datenbankbibliothek
220
221	%description mssql -l pl.UTF-8
222	Backend bazy danych MS SQL dla biblioteki opendbx.
223
224	%endif	316	%endif
225		317
		318	%description sqlite3
		319	SQLite3 backend for the OpenDBX database abstraction library
226		320
227	%if %{?_with_oracle:1}%{!?_with_oracle:0}	321	%description sqlite3 -l de.UTF-8
228		322	Sqlite3 Unterstützung für die OpenDBX Datenbankbibliothek
229	%package oracle
230	Summary: Oracle backend for OpenDBX
231	Summary(de.UTF-8): Oracle Unterstützung für OpenDBX
232	Summary(pl.UTF-8): Backend bazy danych Oracle dla biblioteki OpenDBX
233	Group: Development/Libraries
234	Requires: %{name} = %{version}-%{release}
235
236	%description oracle
237	Oracle ctlib backend for the OpenDBX database abstraction library
238
239	%description oracle -l de.UTF-8
240	Oracle Unterstützung für die OpenDBX Datenbankbibliothek
241		323
242	%description oracle -l pl.UTF-8	324	%description sqlite3 -l pl.UTF-8
243	Backend bazy danych Oracle dla biblioteki OpenDBX.	325	Backend bazy danych sqlite3 dla biblioteki opendbx.
244		326
245	%endif	327	%endif
246		328
247		329
248	%if %{?_with_sybase:1}%{!?_with_sybase:0}	330	%if 0%{?build_sybase:1}
249		331
250	%package sybase	332	%package sybase
251	Summary: Sybase backend for OpenDBX	333	Summary: Sybase backend for OpenDBX
Lines 268-329 Link Here
268	%endif	350	%endif
269		351
270		352
271	%if %{!?_without_odbc:1}%{?_without_odbc:0}
272
273	%package odbc
274	Summary: ODBC backend for OpenDBX
275	Summary(de.UTF-8): ODBC Unterstützung für OpenDBX
276	Summary(pl.UTF-8): Backend bazy danych ODBC dla biblioteki OpenDBX
277	Group: Development/Libraries
278	Requires: %{name} = %{version}-%{release}
279	Requires: unixODBC
280	BuildRequires: unixODBC-devel
281
282	%description odbc
283	ODBC backend for the OpenDBX database abstraction library
284
285	%description odbc -l de.UTF-8
286	ODBC Unterstützung für die OpenDBX Datenbankbibliothek
287
288	%description odbc -l pl.UTF-8
289	Backend bazy danych ODBC dla biblioteki opendbx.
290
291	%endif
292
293
294	%prep	353	%prep
295		354
296		355
297	%setup -q	356	%setup -q -n opendbx-%{version}
298		357
299		358
300	%build	359	%build
301	CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;	360	CPPFLAGS="%{!?_without_mysql:-I/usr/include/mysql} %{!?_without_pgsql:-I/usr/include/pgsql}"; export CPPFLAGS;
302	LDFLAGS="%{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;	361	LDFLAGS="-L/lib64 %{!?_without_mysql:-L/usr/lib/mysql -L/usr/lib64/mysql}"; export LDFLAGS;
303	%configure \	362	%configure \
304	--disable-rpath \	363	--disable-rpath \
305	--disable-static \	364	--disable-static \
306	--with-backends="\	365	--with-backends="\
307	%{?_with_firebird:firebird }\	366	%{?build_firebird:firebird }\
308	%{?_with_mssql:mssql }\	367	%{?build_mssql:mssql }\
309	%{!?_without_mysql:mysql }\	368	%{?build_mysql:mysql }\
310	%{!?_without_odbc:odbc }\	369	%{?build_odbc:odbc }\
311	%{?_with_oracle:oracle }\	370	%{?build_oracle:oracle }\
312	%{!?_without_pgsql:pgsql }\	371	%{?build_pgsql:pgsql }\
313	%{?_with_sqlite:sqlite }\	372	%{?build_sqlite:sqlite }\
314	%{!?_without_sqlite3:sqlite3 }\	373	%{?build_sqlite3:sqlite3 }\
315	%{?_with_sybase:sybase }\	374	%{?build_sybase:sybase }\
316	" \|\| cat config.log	375	" \|\| cat config.log
317		376
318	%{__make} %{?_smp_mflags}	377	%{__make} %{?_smp_mflags}
319		378
320		379
321	%install	380	%install
322	if test "%{buildroot}" != "/"; then rm -rf %{buildroot}; fi
323	%{__make} DESTDIR=%{buildroot} install	381	%{__make} DESTDIR=%{buildroot} install
		382	rm %{buildroot}%{_libdir}/lib.a
324	rm %{buildroot}%{_libdir}/opendbx/lib.a	383	rm %{buildroot}%{_libdir}/opendbx/lib.a
325	rm %{buildroot}%{_libdir}/libopendbx.*a
326	rm %{buildroot}%{_libdir}/libopendbxplus.*a
327	%find_lang %{name}	384	%find_lang %{name}
328	%find_lang %{name}-utils	385	%find_lang %{name}-utils
329		386
Lines 340-348 Link Here
340		397
341	%files -f %{name}.lang	398	%files -f %{name}.lang
342	%defattr(-,root,root,-)	399	%defattr(-,root,root,-)
343	%{_libdir}/opendbx
344	%{_libdir}/libopendbx.so.*	400	%{_libdir}/libopendbx.so.*
345	%{_libdir}/libopendbxplus.so.*	401	%{_libdir}/libopendbxplus.so.*
		402	%dir %{_libdir}/opendbx
346	%doc AUTHORS COPYING ChangeLog NEWS README TODO	403	%doc AUTHORS COPYING ChangeLog NEWS README TODO
347		404
348		405
Lines 366-439 Link Here
366	#%{_mandir}/man3/*	423	#%{_mandir}/man3/*
367		424
368		425
369	%if %{!?_without_mysql:1}%{?_without_mysql:0}	426	%if 0%{?build_firebird:1}
370	%files mysql	427	%files firebird
371	%defattr(-,root,root,-)	428	%defattr(-,root,root,-)
372	%{_libdir}/opendbx/libmysqlbackend.so*	429	%{_libdir}/opendbx/libfirebirdbackend.so*
373	%endif	430	%endif
374		431
375		432
376	%if %{!?_without_pgsql:1}%{?_without_pgsql:0}	433	%if 0%{?build_mssql:1}
377	%files pgsql	434	%files mssql
378	%defattr(-,root,root,-)	435	%defattr(-,root,root,-)
379	%{_libdir}/opendbx/libpgsqlbackend.so*	436	%{_libdir}/opendbx/libmssqlbackend.so*
380	%endif	437	%endif
381		438
382		439
383	%if %{!?_without_sqlite3:1}%{?_without_sqlite3:0}	440	%if 0%{?build_mysql:1}
384	%files sqlite3	441	%files mysql
385	%defattr(-,root,root,-)	442	%defattr(-,root,root,-)
386	%{_libdir}/opendbx/libsqlite3backend.so*	443	%{_libdir}/opendbx/libmysqlbackend.so*
387	%endif	444	%endif
388		445
389		446
390	%if %{?_with_sqlite:1}%{!?_with_sqlite:0}	447	%if 0%{?build_odbc:1}
391	%files sqlite	448	%files odbc
392	%defattr(-,root,root,-)	449	%defattr(-,root,root,-)
393	%{_libdir}/opendbx/libsqlitebackend.so*	450	%{_libdir}/opendbx/libodbcbackend.so*
394	%endif	451	%endif
395		452
396		453
397	%if %{?_with_firebird:1}%{!?_with_firebird:0}	454	%if 0%{?build_oracle:1}
398	%files firebird	455	%files oracle
399	%defattr(-,root,root,-)	456	%defattr(-,root,root,-)
400	%{_libdir}/opendbx/libfirebirdbackend.so*	457	%{_libdir}/opendbx/liboraclebackend.so*
401	%endif	458	%endif
402		459
403		460
404	%if %{?_with_mssql:1}%{!?_with_mssql:0}	461	%if 0%{?build_pgsql:1}
405	%files mssql	462	%files pgsql
406	%defattr(-,root,root,-)	463	%defattr(-,root,root,-)
407	%{_libdir}/opendbx/libmssqlbackend.so*	464	%{_libdir}/opendbx/libpgsqlbackend.so*
408	%endif	465	%endif
409		466
410		467
411	%if %{?_with_oracle:1}%{!?_with_oracle:0}	468	%if 0%{?build_sqlite:1}
412	%files oracle	469	%files sqlite
413	%defattr(-,root,root,-)	470	%defattr(-,root,root,-)
414	%{_libdir}/opendbx/liboraclebackend.so*	471	%{_libdir}/opendbx/libsqlitebackend.so*
415	%endif	472	%endif
416		473
417		474
418	%if %{?_with_sybase:1}%{!?_with_sybase:0}	475	%if 0%{?build_sqlite3:1}
419	%files sybase	476	%files sqlite3
420	%defattr(-,root,root,-)	477	%defattr(-,root,root,-)
421	%{_libdir}/opendbx/libsybasebackend.so*	478	%{_libdir}/opendbx/libsqlite3backend.so*
422	%endif	479	%endif
423		480
424		481
425	%if %{?_with_odbc:1}%{!?_with_odbc:0}	482	%if 0%{?build_sybase:1}
426	%files odbc	483	%files sybase
427	%defattr(-,root,root,-)	484	%defattr(-,root,root,-)
428	%{_libdir}/opendbx/libodbcbackend.so*	485	%{_libdir}/opendbx/libsybasebackend.so*
429	%endif	486	%endif
430		487
431		488
432	%changelog	489	%changelog
433	* Wed Sep 02 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.3-1	490	* Mon Apr 19 2010 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.5-1
434	- Added workarounds for RHEL, CentOS and Mandriva regarding readline	491	- Centralized decisions which backends to build
435	- Fixed odbc package in spec file	492	- Build firebird, mssql and sybase backends for supported distributions
		493	- Reordered backends
		494
		495	* Wed Sep 30 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.4-1
		496	- Fixed included backends in main package
		497	- Fixed odbx package
436	- Fixed builds on x86_64 platforms	498	- Fixed builds on x86_64 platforms
		499	- Compatible with OpenSUSE build service
		500	- Added workarounds for RHEL, CentOS and Mandriva regarding readline
437		501
438	* Sun Apr 19 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.1-1	502	* Sun Apr 19 2009 Norbert Sendetzky <norbert@linuxnetworks.de> 1.4.1-1
439	- Added opendbxplus.pc	503	- Added opendbxplus.pc

Lines 1-7 Link Here

(-)opendbx.orig/po/en@quot.po (-5 / +5 lines)
1	# English translations for opendbx package.	1	# English translations for opendbx package.
2	# Copyright (C) 2009 Free Software Foundation, Inc.	2	# Copyright (C) 2012 Free Software Foundation, Inc.
3	# This file is distributed under the same license as the opendbx package.	3	# This file is distributed under the same license as the opendbx package.
4	# Automatically generated, 2009.	4	# Automatically generated, 2012.
5	#	5	#
6	# All this catalog "translates" are quotation characters.	6	# All this catalog "translates" are quotation characters.
7	# The msgids must be ASCII and therefore cannot contain real quotation	7	# The msgids must be ASCII and therefore cannot contain real quotation
Lines 27-36 Link Here
27	#	27	#
28	msgid ""	28	msgid ""
29	msgstr ""	29	msgstr ""
30	"Project-Id-Version: opendbx 1.4.3\n"	30	"Project-Id-Version: opendbx 1.4.6\n"
31	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	31	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
32	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	32	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
33	"PO-Revision-Date: 2009-08-30 14:05+0200\n"	33	"PO-Revision-Date: 2012-06-10 23:58+0200\n"
34	"Last-Translator: Automatically generated\n"	34	"Last-Translator: Automatically generated\n"
35	"Language-Team: none\n"	35	"Language-Team: none\n"
36	"MIME-Version: 1.0\n"	36	"MIME-Version: 1.0\n"

Lines 12-24 Link Here

(-)opendbx.orig/test/odbxtest.sh (-3 / +3 lines)
12	ODBXAPP="./odbxtest ./odbxplustest"	12	ODBXAPP="./odbxtest ./odbxplustest"
13		13
14	# Import database parameter	14	# Import database parameter
15	. odbxtest.site	15	. ./odbxtest.site
16		16
17		17
18	# compare results	18	# compare results
19	function odbxcompare ()	19	odbxcompare ()
20	{	20	{
21	diff test.out ref/$1.ref > /dev/null	21	diff -b test.out ref/$1.ref > /dev/null
22		22
23	if test $? -eq 1	23	if test $? -eq 1
24	then	24	then

Lines 1-21 Link Here

(-)opendbx.orig/test/ref/sqlite3.ref (-16 / +16 lines)
1	ODBX_CAP_BASIC: 1	1	ODBX_CAP_BASIC: 1
2	ODBX_CAP_LO: 0	2	ODBX_CAP_LO: 0
3	ODBX_OPT_API_VERSION: 10200	3	ODBX_OPT_API_VERSION: 10200
4	ODBX_OPT_THREAD_SAFE: 1	4	ODBX_OPT_THREAD_SAFE: 1
5	ODBX_OPT_TLS: 0	5	ODBX_OPT_TLS: 0
6	ODBX_OPT_CONNECT_TIMEOUT: 0	6	ODBX_OPT_CONNECT_TIMEOUT: 0
7	ODBX_OPT_MULTI_STATEMENTS: 1 (using)	7	ODBX_OPT_MULTI_STATEMENTS: 1 (using)
8	ODBX_OPT_PAGED_RESULTS: 0	8	ODBX_OPT_PAGED_RESULTS: 0
9	ODBX_OPT_COMPRESS: 0	9	ODBX_OPT_COMPRESS: 0
10	ODBX_CAP_BASIC: 1	10	ODBX_CAP_BASIC: 1
11	ODBX_CAP_LO: 0	11	ODBX_CAP_LO: 0
12	ODBX_OPT_API_VERSION: 10200	12	ODBX_OPT_API_VERSION: 10200
13	ODBX_OPT_THREAD_SAFE: 1	13	ODBX_OPT_THREAD_SAFE: 1
14	ODBX_OPT_TLS: 0	14	ODBX_OPT_TLS: 0
15	ODBX_OPT_CONNECT_TIMEOUT: 0	15	ODBX_OPT_CONNECT_TIMEOUT: 0
16	ODBX_OPT_MULTI_STATEMENTS: 1 (using)	16	ODBX_OPT_MULTI_STATEMENTS: 1 (using)
17	ODBX_OPT_PAGED_RESULTS: 0	17	ODBX_OPT_PAGED_RESULTS: 0
18	ODBX_OPT_COMPRESS: 0	18	ODBX_OPT_COMPRESS: 0
19	Affected rows: 0	19	Affected rows: 0
20	Affected rows: 1	20	Affected rows: 1
21	Affected rows: 1	21	Affected rows: 1
Lines 39-45 Link Here
39	column 16 (type 32): timestmp = '1999-01-01 00:00:00'	39	column 16 (type 32): timestmp = '1999-01-01 00:00:00'
40	column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06'	40	column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06'
41	column 18 (type 32): dateval = '1999-01-01'	41	column 18 (type 32): dateval = '1999-01-01'
42	column 0 (type 255): i1 = NULL	42	column 0 (type 3): i1 = NULL
43	column 1 (type 3): i16 = '2'	43	column 1 (type 3): i16 = '2'
44	column 2 (type 3): i32 = '4'	44	column 2 (type 3): i32 = '4'
45	column 3 (type 3): i64 = '8'	45	column 3 (type 3): i64 = '8'
Lines 49-55 Link Here
49	column 7 (type 9): f8 = '8.5'	49	column 7 (type 9): f8 = '8.5'
50	column 8 (type 32): c2 = 'FR'	50	column 8 (type 32): c2 = 'FR'
51	column 9 (type 32): nc12 = 'éçèéçè'	51	column 9 (type 32): nc12 = 'éçèéçè'
52	column 10 (type 255): str20 = NULL	52	column 10 (type 32): str20 = NULL
53	column 11 (type 32): nstr24 = 'éçèéçèéçèéçè'	53	column 11 (type 32): nstr24 = 'éçèéçèéçèéçè'
54	column 12 (type 32): clob64k = 'text'	54	column 12 (type 32): clob64k = 'text'
55	column 13 (type 32): nclob64k = 'éçè very long national text éçè'	55	column 13 (type 32): nclob64k = 'éçè very long national text éçè'
Lines 101-107 Link Here
101	column 16 (type 32): timestmp = '1999-01-01 00:00:00'	101	column 16 (type 32): timestmp = '1999-01-01 00:00:00'
102	column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06'	102	column 17 (type 32): timestmptz = '1999-01-01 00:00:00+06'
103	column 18 (type 32): dateval = '1999-01-01'	103	column 18 (type 32): dateval = '1999-01-01'
104	column 0 (type 255): i1 = NULL	104	column 0 (type 3): i1 = NULL
105	column 1 (type 3): i16 = '2'	105	column 1 (type 3): i16 = '2'
106	column 2 (type 3): i32 = '4'	106	column 2 (type 3): i32 = '4'
107	column 3 (type 3): i64 = '8'	107	column 3 (type 3): i64 = '8'
Lines 111-117 Link Here
111	column 7 (type 9): f8 = '8.5'	111	column 7 (type 9): f8 = '8.5'
112	column 8 (type 32): c2 = 'FR'	112	column 8 (type 32): c2 = 'FR'
113	column 9 (type 32): nc12 = 'éçèéçè'	113	column 9 (type 32): nc12 = 'éçèéçè'
114	column 10 (type 255): str20 = NULL	114	column 10 (type 32): str20 = NULL
115	column 11 (type 32): nstr24 = 'éçèéçèéçèéçè'	115	column 11 (type 32): nstr24 = 'éçèéçèéçèéçè'
116	column 12 (type 32): clob64k = 'text'	116	column 12 (type 32): clob64k = 'text'
117	column 13 (type 32): nclob64k = 'éçè very long national text éçè'	117	column 13 (type 32): nclob64k = 'éçè very long national text éçè'

Lines 3-21 Link Here

(-)opendbx.orig/utils/argmap.cpp (-13 / +2 lines)
3	* (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>	3	* (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>
4	* Inspired by PowerDNS ArgvMap code	4	* Inspired by PowerDNS ArgvMap code
5	*	5	*
6	* This program is free software; you can redistribute it and/or modify	6	* Distributed under the terms of the GNU Library General Public Licence
7	* it under the terms of the GNU General Public License as published by	7	* version 2 or (at your option) any later version.
8	* the Free Software Foundation; either version 2 of the License, or
9	* (at your option) any later version.
10	*
11	* This program is distributed in the hope that it will be useful,
12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	* GNU General Public License for more details.
15	*
16	* You should have received a copy of the GNU General Public License
17	* along with this program; if not, write to the Free Software
18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19	*/	8	*/
20		9
21		10

Lines 3-21 Link Here

(-)opendbx.orig/utils/argmap.hpp (-13 / +2 lines)
3	* (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>	3	* (c) 2006-2008, Norbert Sendetzky <norbert@linuxnetworks.de>
4	* Inspired by PowerDNS ArgvMap code	4	* Inspired by PowerDNS ArgvMap code
5	*	5	*
6	* This program is free software; you can redistribute it and/or modify	6	* Distributed under the terms of the GNU Library General Public Licence
7	* it under the terms of the GNU General Public License as published by	7	* version 2 or (at your option) any later version.
8	* the Free Software Foundation; either version 2 of the License, or
9	* (at your option) any later version.
10	*
11	* This program is distributed in the hope that it will be useful,
12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	* GNU General Public License for more details.
15	*
16	* You should have received a copy of the GNU General Public License
17	* along with this program; if not, write to the Free Software
18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19	*/	8	*/
20		9
21		10

Lines 1-4 Link Here

(-)opendbx.orig/utils/Makefile.in (-5 / +7 lines)
1	# Makefile.in generated by automake 1.11 from Makefile.am.	1	# Makefile.in generated by automake 1.11.1 from Makefile.am.
2	# @configure_input@	2	# @configure_input@
3		3
4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,	4	# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
Lines 63-70 Link Here
63	@ENABLEUTILS_TRUE@ odbx_sql-completion.$(OBJEXT) \	63	@ENABLEUTILS_TRUE@ odbx_sql-completion.$(OBJEXT) \
64	@ENABLEUTILS_TRUE@ odbx_sql-odbx-sql.$(OBJEXT)	64	@ENABLEUTILS_TRUE@ odbx_sql-odbx-sql.$(OBJEXT)
65	odbx_sql_OBJECTS = $(am_odbx_sql_OBJECTS)	65	odbx_sql_OBJECTS = $(am_odbx_sql_OBJECTS)
		66	am__DEPENDENCIES_1 =
66	@ENABLEUTILS_TRUE@odbx_sql_DEPENDENCIES = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) \	67	@ENABLEUTILS_TRUE@odbx_sql_DEPENDENCIES = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) \
67	@ENABLEUTILS_TRUE@ ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX)	68	@ENABLEUTILS_TRUE@ ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) \
		69	@ENABLEUTILS_TRUE@ $(am__DEPENDENCIES_1)
68	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)	70	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
69	depcomp = $(SHELL) $(top_srcdir)/depcomp	71	depcomp = $(SHELL) $(top_srcdir)/depcomp
70	am__depfiles_maybe = depfiles	72	am__depfiles_maybe = depfiles
Lines 313-319 Link Here
313	@ENABLEUTILS_TRUE@INCLUDES = -I../lib	315	@ENABLEUTILS_TRUE@INCLUDES = -I../lib
314	@ENABLEUTILS_TRUE@odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp	316	@ENABLEUTILS_TRUE@odbx_sql_SOURCES = argmap.cpp argmap.hpp commands.cpp commands.hpp completion.cpp completion.hpp odbx-sql.hpp odbx-sql.cpp
315	@ENABLEUTILS_TRUE@odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\"	317	@ENABLEUTILS_TRUE@odbx_sql_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DKEYWORDFILE=\"$(pkgdatadir)/keywords\"
316	@ENABLEUTILS_TRUE@odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) -lreadline -lncurses	318	@ENABLEUTILS_TRUE@odbx_sql_LDADD = ../lib/.libs/$(LIBPREFIX)opendbx$(LIBSUFFIX) ../lib/.libs/$(LIBPREFIX)opendbxplus$(LIBSUFFIX) $(LTLIBINTL) -lreadline -lncurses
317	@ENABLEUTILS_TRUE@EXTRA_DIST = keywords	319	@ENABLEUTILS_TRUE@EXTRA_DIST = keywords
318	@ENABLEUTILS_TRUE@pkgdata_DATA = keywords	320	@ENABLEUTILS_TRUE@pkgdata_DATA = keywords
319	all: all-recursive	321	all: all-recursive
Lines 518-524 Link Here
518	# (which will cause the Makefiles to be regenerated when you run `make');	520	# (which will cause the Makefiles to be regenerated when you run `make');
519	# (2) otherwise, pass the desired values on the `make' command line.	521	# (2) otherwise, pass the desired values on the `make' command line.
520	$(RECURSIVE_TARGETS):	522	$(RECURSIVE_TARGETS):
521	@failcom='exit 1'; \	523	@fail= failcom='exit 1'; \
522	for f in x $$MAKEFLAGS; do \	524	for f in x $$MAKEFLAGS; do \
523	case $$f in \	525	case $$f in \
524	= \| --[!k]*);; \	526	= \| --[!k]*);; \
Lines 543-549 Link Here
543	fi; test -z "$$fail"	545	fi; test -z "$$fail"
544		546
545	$(RECURSIVE_CLEAN_TARGETS):	547	$(RECURSIVE_CLEAN_TARGETS):
546	@failcom='exit 1'; \	548	@fail= failcom='exit 1'; \
547	for f in x $$MAKEFLAGS; do \	549	for f in x $$MAKEFLAGS; do \
548	case $$f in \	550	case $$f in \
549	= \| --[!k]*);; \	551	= \| --[!k]*);; \

Lines 146-152 Link Here

(-)opendbx.orig/utils/odbx-sql.cpp (-4 / +9 lines)
146	{	146	{
147	len = strlen( line );	147	len = strlen( line );
148	sql += "\n" + string( line, len );	148	sql += "\n" + string( line, len );
149	free( line );	149	::free( line );
150		150
151	if( sql[sql.size()-1] == ';' ) { break; }	151	if( sql[sql.size()-1] == ';' ) { break; }
152	}	152	}
Lines 228-238 Link Here
228	rl_completion_entry_function = &complete;	228	rl_completion_entry_function = &complete;
229		229
230	Conn conn( A.asString( "backend" ), A.asString( "host" ), A.asString( "port" ) );	230	Conn conn( A.asString( "backend" ), A.asString( "host" ), A.asString( "port" ) );
231	conn.bind( A.asString( "database" ), A.asString( "username" ), A.asString( "password" ) );
232		231
233	loopstmts( conn, &fparam, A.mustDo( "interactive" ) );	232	while( 1 )
		233	{
		234	conn.bind( A.asString( "database" ), A.asString( "username" ), A.asString( "password" ) );
		235
		236	loopstmts( conn, &fparam, A.mustDo( "interactive" ) );
		237
		238	conn.unbind();
		239	}
234		240
235	conn.finish();
236	delete g_comp;	241	delete g_comp;
237	}	242	}
238	catch( std::runtime_error &e )	243	catch( std::runtime_error &e )

Lines 7-13 Link Here

(-)opendbx.orig/utils/po/de.po (-3 / +3 lines)
7	msgstr ""	7	msgstr ""
8	"Project-Id-Version: opendbx 1.3.7\n"	8	"Project-Id-Version: opendbx 1.3.7\n"
9	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	9	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
10	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	10	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
11	"PO-Revision-Date: 2008-04-04 00:18+0200\n"	11	"PO-Revision-Date: 2008-04-04 00:18+0200\n"
12	"Last-Translator: <norbert@linuxnetworks.de>\n"	12	"Last-Translator: <norbert@linuxnetworks.de>\n"
13	"Language-Team: German\n"	13	"Language-Team: German\n"
Lines 108-118 Link Here
108	msgid "Password: "	108	msgid "Password: "
109	msgstr "Passwort: "	109	msgstr "Passwort: "
110		110
111	#: utils/odbx-sql.cpp:240	111	#: utils/odbx-sql.cpp:245
112	msgid "Error: "	112	msgid "Error: "
113	msgstr "Fehler: "	113	msgstr "Fehler: "
114		114
115	#: utils/odbx-sql.cpp:245	115	#: utils/odbx-sql.cpp:250
116	msgid "Error: Caught unknown exception"	116	msgid "Error: Caught unknown exception"
117	msgstr "Fehler: Es ist eine unbekannte Ausnahme aufgetreten"	117	msgstr "Fehler: Es ist eine unbekannte Ausnahme aufgetreten"
118		118

Lines 1-7 Link Here

(-)opendbx.orig/utils/po/en@quot.po (-7 / +7 lines)
1	# English translations for opendbx package.	1	# English translations for opendbx package.
2	# Copyright (C) 2009 Free Software Foundation, Inc.	2	# Copyright (C) 2012 Free Software Foundation, Inc.
3	# This file is distributed under the same license as the opendbx package.	3	# This file is distributed under the same license as the opendbx package.
4	# Automatically generated, 2009.	4	# Automatically generated, 2012.
5	#	5	#
6	# All this catalog "translates" are quotation characters.	6	# All this catalog "translates" are quotation characters.
7	# The msgids must be ASCII and therefore cannot contain real quotation	7	# The msgids must be ASCII and therefore cannot contain real quotation
Lines 27-36 Link Here
27	#	27	#
28	msgid ""	28	msgid ""
29	msgstr ""	29	msgstr ""
30	"Project-Id-Version: opendbx 1.4.3\n"	30	"Project-Id-Version: opendbx 1.4.6\n"
31	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	31	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
32	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	32	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
33	"PO-Revision-Date: 2009-08-30 14:05+0200\n"	33	"PO-Revision-Date: 2012-06-10 23:58+0200\n"
34	"Last-Translator: Automatically generated\n"	34	"Last-Translator: Automatically generated\n"
35	"Language-Team: none\n"	35	"Language-Team: none\n"
36	"MIME-Version: 1.0\n"	36	"MIME-Version: 1.0\n"
Lines 126-135 Link Here
126	msgid "Password: "	126	msgid "Password: "
127	msgstr "Password: "	127	msgstr "Password: "
128		128
129	#: utils/odbx-sql.cpp:240	129	#: utils/odbx-sql.cpp:245
130	msgid "Error: "	130	msgid "Error: "
131	msgstr "Error: "	131	msgstr "Error: "
132		132
133	#: utils/odbx-sql.cpp:245	133	#: utils/odbx-sql.cpp:250
134	msgid "Error: Caught unknown exception"	134	msgid "Error: Caught unknown exception"
135	msgstr "Error: Caught unknown exception"	135	msgstr "Error: Caught unknown exception"

Lines 6-14 Link Here

(-)opendbx.orig/utils/po/opendbx-utils.pot (-4 / +4 lines)
6	#, fuzzy	6	#, fuzzy
7	msgid ""	7	msgid ""
8	msgstr ""	8	msgstr ""
9	"Project-Id-Version: opendbx 1.4.3\n"	9	"Project-Id-Version: opendbx 1.4.6\n"
10	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"	10	"Report-Msgid-Bugs-To: norbert@linuxnetworks.de\n"
11	"POT-Creation-Date: 2009-08-30 14:05+0200\n"	11	"POT-Creation-Date: 2012-06-10 23:58+0200\n"
12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"	12	"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"	13	"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14	"Language-Team: LANGUAGE <LL@li.org>\n"	14	"Language-Team: LANGUAGE <LL@li.org>\n"
Lines 104-113 Link Here
104	msgid "Password: "	104	msgid "Password: "
105	msgstr ""	105	msgstr ""
106		106
107	#: utils/odbx-sql.cpp:240	107	#: utils/odbx-sql.cpp:245
108	msgid "Error: "	108	msgid "Error: "
109	msgstr ""	109	msgstr ""
110		110
111	#: utils/odbx-sql.cpp:245	111	#: utils/odbx-sql.cpp:250
112	msgid "Error: Caught unknown exception"	112	msgid "Error: Caught unknown exception"
113	msgstr ""	113	msgstr ""