pool/unixODBC
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 356755 from home:markusbeth:branches:server:database

Browse Source 
removed some obsolete patches

OBS-URL: https://build.opensuse.org/request/show/356755
OBS-URL: https://build.opensuse.org/package/show/server:database/unixODBC?expand=0&rev=41
This commit is contained in:
Martin Pluskal 2016-02-02 21:53:17 +00:00 committed by Git OBS Bridge
parent 9e6e20a522
commit a2883776b4
4 changed files with 7 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
unixODBC-2.3.1-uninitialized.patch
View File

@ -1,25 +0,0 @@
htbl_stmt hasn't yet been allocated in both cases
Index: Drivers/Postgre7.1/info.c
===================================================================
--- Drivers/Postgre7.1/info.c.orig
+++ Drivers/Postgre7.1/info.c
@@ -2345,6 +2345,7 @@ Int2 result_cols;
if(!stmt->result) {
SC_set_error(stmt, STMT_NO_MEMORY_ERROR, "Couldn't allocate memory for SQLForeignKeys result.");
SC_log_error(func, "", stmt);
+ PG__SQLFreeStmt(htbl_stmt, SQL_DROP);
return SQL_ERROR;
}
Index: Drivers/Postgre7.1/convert.c
===================================================================
--- Drivers/Postgre7.1/convert.c.orig
+++ Drivers/Postgre7.1/convert.c
@@ -223,6 +223,7 @@ struct tm tp;
memset(&st, 0, sizeof(SIMPLE_TIME));
+ memset(&st, 0, sizeof(SIMPLE_TIME));
mylog("copy_and_convert: field_type = %d, fctype = %d, value = '%s', cbValueMax=%d\n", field_type, fCType, (value==NULL)?"<NULL>":value, cbValueMax);
if ( ! value) {

34
unixODBC-nonvoid.patch
View File

@ -1,34 +0,0 @@
Index: DriverManager/SQLConnect.c
===================================================================
--- DriverManager/SQLConnect.c.orig
+++ DriverManager/SQLConnect.c
@@ -919,6 +919,7 @@ static void odbc_dlclose( void *handle )
}
mutex_lib_exit();
+ return 0;
}
/*
Index: cur/SQLEndTran.c
===================================================================
--- cur/SQLEndTran.c.orig
+++ cur/SQLEndTran.c
@@ -78,4 +78,5 @@ SQLRETURN CLEndTran( SQLSMALLINT handle_
default:
return SQL_ERROR;
}
+ return 0;
}
Index: odbcinst/SQLSetConfigMode.c
===================================================================
--- odbcinst/SQLSetConfigMode.c.orig
+++ odbcinst/SQLSetConfigMode.c
@@ -24,6 +24,7 @@ static int __config_mode = ODBC_BOTH_DSN
void __set_config_mode( int mode )
{
__config_mode = mode;
+ return 0;
}
int __get_config_mode( void )

6
unixODBC.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jan 28 00:16:53 UTC 2016 - markus.beth@web.de
- dropped obsolete unixODBC-2.3.1-uninitialized.patch and
unixODBC-nonvoid.patch
-------------------------------------------------------------------
Tue Sep 1 11:42:38 UTC 2015 - tchvatal@suse.com

6
unixODBC.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package unixODBC
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,10 +27,8 @@ Source: ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-%{version}.tar.gz
Source2: baselibs.conf
Patch1: unixODBC-paths.patch
Patch5: unixODBC-iaddr.patch
Patch6: unixODBC-nonvoid.patch
Patch7: unixODBC-gccwarnings.patch
Patch10: %{name}-2.3.1-libodbcinst-exports.patch
Patch13: %{name}-2.3.1-uninitialized.patch
Patch15: %{name}-2.3.1-bison.patch
Patch16: %{name}-2.3.1-declarations.patch
BuildRequires: automake
@ -58,10 +56,8 @@ Includes for ODBC development (based on unixODBC).
%setup -q
%patch1
%patch5
%patch6
%patch7
%patch10
%patch13
%patch15
%patch16