Hello community, here is the log from the commit of package unixODBC for openSUSE:Factory checked in at 2013-03-13 07:33:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unixODBC (Old) and /work/SRC/openSUSE:Factory/.unixODBC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unixODBC", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/unixODBC/unixODBC.changes 2011-11-28 12:58:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.unixODBC.new/unixODBC.changes 2013-03-13 07:33:32.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Jan 4 15:04:52 CET 2013 - [email protected] + +- Adding missing includes + +------------------------------------------------------------------- +Fri Jan 4 13:02:10 CET 2013 - [email protected] + +- fixed compilation issues with bison + +------------------------------------------------------------------- +Tue Nov 27 09:04:52 UTC 2012 - [email protected] + +- license update: GPL-2.0+ and LGPL-2.1+ + Semicolon is ambigous. Use ^and^ or ^or^ depending on the nature of the + interaction of the license code componentes + +------------------------------------------------------------------- +Wed Nov 7 11:46:34 CET 2012 - [email protected] + +- Including some basic drivers + +------------------------------------------------------------------- +Tue Nov 6 10:35:00 CET 2012 - [email protected] + +- updated to versio 2.3.1 + * reduced unixODBC, after the GUI and additional driver parts have + been split off to their own project. + * change to the new default SQLLEN size for 64 bit platforms + * number of bug fixes and changes, see http://www.unixodbc.org/ + +------------------------------------------------------------------- Old: ---- unixODBC-2.2.12-CVE-2011-1145.patch unixODBC-2.2.12-ctracing.patch unixODBC-2.2.12-dm.patch unixODBC-2.2.12-flex.patch unixODBC-2.2.12-libodbcinst-exports.patch unixODBC-2.2.12-locking_fix.patch unixODBC-2.2.12-sqp.patch unixODBC-2.2.12-uninitialized.patch unixODBC-2.2.12.tar.bz2 unixODBC-gui-qt.changes unixODBC-gui-qt.spec unixODBC-odbctest.patch New: ---- unixODBC-2.3.1-bison.patch unixODBC-2.3.1-declarations.patch unixODBC-2.3.1-libodbcinst-exports.patch unixODBC-2.3.1-uninitialized.patch unixODBC-2.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ unixODBC.spec ++++++ --- /var/tmp/diff_new_pack.iN6iw3/_old 2013-03-13 07:33:38.000000000 +0100 +++ /var/tmp/diff_new_pack.iN6iw3/_new 2013-03-13 07:33:38.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package unixODBC # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: unixODBC -BuildRequires: gcc-c++ libtool -Version: 2.2.12 +BuildRequires: bison gcc-c++ libtool +Version: 2.3.1 Release: 0 Summary: ODBC driver manager with some drivers included -License: GPL-2.0+ ; LGPL-2.1+ +License: GPL-2.0+ and LGPL-2.1+ Url: http://www.unixodbc.org/ Group: Productivity/Databases/Tools # bug437293 @@ -39,22 +39,18 @@ Source1: README.SuSE Source2: baselibs.conf Patch1: unixODBC-paths.patch -Patch4: unixODBC-odbctest.patch Patch5: unixODBC-iaddr.patch Patch6: unixODBC-nonvoid.patch Patch7: unixODBC-gccwarnings.patch -Patch8: unixODBC-%{version}-dm.patch -Patch10: %{name}-%{version}-libodbcinst-exports.patch -Patch11: %{name}-%{version}-flex.patch -Patch12: %{name}-%{version}-sqp.patch -Patch13: %{name}-%{version}-uninitialized.patch -Patch14: unixODBC-2.2.12-CVE-2011-1145.patch -Patch15: unixODBC-2.2.12-locking_fix.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %package devel -License: GPL-2.0+ ; LGPL-2.1+ -Summary: Includes and Static Libraries for ODBC Development +License: GPL-2.0+ and LGPL-2.1+ +Summary: Includes for ODBC Development Group: Development/Libraries/C and C++ AutoReqProv: on # bug437293 @@ -77,7 +73,7 @@ Nick Gorham <[email protected]> %description devel -Includes and static libraries for ODBC development (based on unixODBC). +Includes for ODBC development (based on unixODBC). @@ -89,24 +85,22 @@ %prep %setup -q %patch1 -%patch4 %patch5 %patch6 %patch7 -#patch8 -p1 %patch10 -%patch11 -%patch12 %patch13 -%patch14 -p1 -%patch15 -p1 +%patch15 +%patch16 install -m 644 %{S:1} . %build export -n LANG LINGUAS LC_ALL rm -rf libltdl -LIBTOOLIZE="libtoolize --ltdl" autoreconf --force --install -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +libtoolize --ltdl +autoreconf --force --install +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ @@ -114,8 +108,10 @@ --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir}/%{name} \ --enable-gui=no \ - --disable-stats -make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" + --disable-stats \ + --enable-drivers \ + --enable-driver-conf +make %install install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name} @@ -124,6 +120,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/libtool # packaged in gui-gtk rm -f $RPM_BUILD_ROOT/%{_libdir}/libmimerS.* +rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/*.la %clean rm -rf "$RPM_BUILD_ROOT" @@ -134,7 +131,7 @@ %files %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README README.GTK README.SuSE doc/*.html doc/*.gif +%doc AUTHORS COPYING ChangeLog NEWS README README.SuSE doc/*.html doc/*.gif %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/ODBCDataSources %dir %{_libdir}/%{name} @@ -145,29 +142,19 @@ %{_prefix}/bin/iusql %{_prefix}/bin/odbcinst %{_prefix}/bin/odbc_config -%{_libdir}/libodbc.so %{_libdir}/libodbc.so.* -#%{_libdir}/libodbcextras.so.* -%{_libdir}/libodbcinst.so %{_libdir}/libodbcinst.so.* -%{_libdir}/libboundparam.so.* -%{_libdir}/libgtrtst.so.* %{_libdir}/libodbccr.so.* -%{_libdir}/unixODBC/*.so* +%{_libdir}/%{name} %files devel %defattr(-, root, root) %{_includedir}/* -%{_libdir}/libboundparam.la -%{_libdir}/libgtrtst.la +%{_libdir}/libodbc.so +%{_libdir}/libodbcinst.so %{_libdir}/libodbc.la %{_libdir}/libodbccr.la -#%{_libdir}/libodbcextras.la %{_libdir}/libodbcinst.la -%{_libdir}/libboundparam.so -%{_libdir}/libgtrtst.so %{_libdir}/libodbccr.so -#%{_libdir}/libodbcextras.so -%{_libdir}/unixODBC/*.la %changelog ++++++ unixODBC-2.3.1-bison.patch ++++++ Index: Drivers/nn/yyparse.y =================================================================== --- Drivers/nn/yyparse.y.orig +++ Drivers/nn/yyparse.y @@ -36,7 +36,7 @@ static char sccsid[] # define yylex() nnsql_yylex(&yylval, pyyenv) #endif -#define yyparse(x) nnsql_yyparse (pyyenv) +#define yyparse(x) nnsql_yyparse (yyenv_t* pyyenv) #define yyerror(msg) nnsql_yyerror (pyyenv, msg) #define SETYYERROR(env, code) { env->pstmt->errcode = code; \ env->pstmt->errpos = env->errpos;} @@ -1197,7 +1197,7 @@ static int add_ins_value( yystmt_t* pstm { if( !idx ) { - MEM_FREE(pstmt->ins_values) + MEM_FREE(pstmt->ins_values); pstmt->ins_values = (node_t*)MEM_ALLOC( FILTER_CHUNK_SIZE * sizeof(node_t)); } else if( ! idx%FILTER_CHUNK_SIZE ) ++++++ unixODBC-2.3.1-declarations.patch ++++++ Index: Drivers/nn/SQLBindCol.c =================================================================== --- Drivers/nn/SQLBindCol.c.orig +++ Drivers/nn/SQLBindCol.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLBindCol( HSTMT hstmt, Index: Drivers/nn/SQLBindParameter.c =================================================================== --- Drivers/nn/SQLBindParameter.c.orig +++ Drivers/nn/SQLBindParameter.c @@ -13,6 +13,7 @@ GNU General Public License for more details. **/ #include <config.h> +#include <string.h> #include "driver.h" RETCODE SQL_API SQLBindParameter( Index: Drivers/nn/SQLDescribeCol.c =================================================================== --- Drivers/nn/SQLDescribeCol.c.orig +++ Drivers/nn/SQLDescribeCol.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLDescribeCol( HSTMT hstmt, Index: Drivers/nn/SQLError.c =================================================================== --- Drivers/nn/SQLError.c.orig +++ Drivers/nn/SQLError.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLError( HENV henv, Index: Drivers/nn/SQLFetch.c =================================================================== --- Drivers/nn/SQLFetch.c.orig +++ Drivers/nn/SQLFetch.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLFetch( HSTMT hstmt ) { Index: Drivers/nn/SQLGetData.c =================================================================== --- Drivers/nn/SQLGetData.c.orig +++ Drivers/nn/SQLGetData.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLGetData( HSTMT hstmt, Index: Drivers/nn/SQLPutData.c =================================================================== --- Drivers/nn/SQLPutData.c.orig +++ Drivers/nn/SQLPutData.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> RETCODE SQL_API SQLPutData( HSTMT hstmt, Index: Drivers/nn/convert.c =================================================================== --- Drivers/nn/convert.c.orig +++ Drivers/nn/convert.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> /* It looks silly to use a MEM_ALLOC() in function char2str(), etc, * for converting C data type into STRING SQL data type. Esspecially Index: Drivers/nn/nndate.c =================================================================== --- Drivers/nn/nndate.c.orig +++ Drivers/nn/nndate.c @@ -16,6 +16,7 @@ #include <nnconfig.h> #include <nndate.h> +#include <string.h> #include "misc.h" static char* month_name[] = Index: Drivers/nn/prepare.c =================================================================== --- Drivers/nn/prepare.c.orig +++ Drivers/nn/prepare.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> void* nnodbc_getstmterrstack(void* hstmt) { Index: Drivers/nn/yyevl.c =================================================================== --- Drivers/nn/yyevl.c.orig +++ Drivers/nn/yyevl.c @@ -16,6 +16,7 @@ #include <nnconfig.h> #include <yystmt.h> #include <yylex.h> +#include <string.h> #include <nncol.h> #include <nndate.h> Index: Drivers/nn/yyparse.y =================================================================== --- Drivers/nn/yyparse.y.orig +++ Drivers/nn/yyparse.y @@ -25,6 +25,7 @@ static char sccsid[] #include <yylex.h> #include <yyerr.h> #include <nndate.h> +#include <stdio.h> # ifdef YYLSP_NEEDED # undef YYLSP_NEEDED Index: Drivers/nn/yystmt.c =================================================================== --- Drivers/nn/yystmt.c.orig +++ Drivers/nn/yystmt.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include "driver.h" +#include <string.h> static char sccsid[] = "@(#)NNSQL(NetNews SQL) v0.5, Copyright(c) 1995, 1996 by Ke Jin"; Index: Drivers/nn/connect.c =================================================================== --- Drivers/nn/connect.c.orig +++ Drivers/nn/connect.c @@ -14,6 +14,7 @@ **/ #include <config.h> #include <unistd.h> +#include <string.h> #include <sys/types.h> #include "driver.h" #include "misc.h" Index: Drivers/nn/yylex.c =================================================================== --- Drivers/nn/yylex.c.orig +++ Drivers/nn/yylex.c @@ -26,6 +26,7 @@ #include <stdio.h> #include <string.h> +#include <ctype.h> static int getcmpopidxbyname(char* name) { ++++++ unixODBC-2.2.12-libodbcinst-exports.patch -> unixODBC-2.3.1-libodbcinst-exports.patch ++++++ --- /work/SRC/openSUSE:Factory/unixODBC/unixODBC-2.2.12-libodbcinst-exports.patch 2011-09-23 12:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unixODBC.new/unixODBC-2.3.1-libodbcinst-exports.patch 2013-03-13 07:33:32.000000000 +0100 @@ -1,10 +1,10 @@ Index: odbcinst/odbcinst.exp -================================================================================ ---- odbcinst/odbcinst.exp +=================================================================== +--- odbcinst/odbcinst.exp.orig +++ odbcinst/odbcinst.exp -@@ -60,3 +60,50 @@ - _odbcinst_SystemINI - _odbcinst_UserINI +@@ -64,3 +64,50 @@ _odbcinst_UserINI + _odbcinst_FileINI + _SQLDriverConnectPrompt inst_logPushMsg +iniAllTrim +iniAppend ++++++ unixODBC-2.2.12-uninitialized.patch -> unixODBC-2.3.1-uninitialized.patch ++++++ --- /work/SRC/openSUSE:Factory/unixODBC/unixODBC-2.2.12-uninitialized.patch 2011-09-23 12:49:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unixODBC.new/unixODBC-2.3.1-uninitialized.patch 2013-03-13 07:33:32.000000000 +0100 @@ -1,27 +1,23 @@ htbl_stmt hasn't yet been allocated in both cases ---- Drivers/PostgreSQL/info.c -+++ Drivers/PostgreSQL/info.c -@@ -2043,7 +2043,6 @@ - stmt->errormsg = "No Table specified to SQLPrimaryKeys."; - stmt->errornumber = STMT_INTERNAL_ERROR; - SC_log_error(func, "", stmt); -- PG__SQLFreeStmt(htbl_stmt, SQL_DROP); - return SQL_ERROR; - } - -@@ -2228,7 +2227,6 @@ - stmt->errormsg = "Couldn't allocate memory for SQLForeignKeys result."; - stmt->errornumber = STMT_NO_MEMORY_ERROR; - SC_log_error(func, "", stmt); -- PG__SQLFreeStmt(htbl_stmt, SQL_DROP); - return SQL_ERROR; +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; } ---- Drivers/PostgreSQL/convert.c -+++ Drivers/PostgreSQL/convert.c -@@ -178,6 +178,7 @@ +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); ++++++ unixODBC-2.2.12.tar.bz2 -> unixODBC-2.3.1.tar.bz2 ++++++ ++++ 380206 lines of diff (skipped) ++++++ unixODBC-gccwarnings.patch ++++++ --- /var/tmp/diff_new_pack.iN6iw3/_old 2013-03-13 07:33:40.000000000 +0100 +++ /var/tmp/diff_new_pack.iN6iw3/_new 2013-03-13 07:33:40.000000000 +0100 @@ -1,42 +1,31 @@ ---- Drivers/PostgreSQL/info.c -+++ Drivers/PostgreSQL/info.c -@@ -1667,7 +1667,7 @@ - StatementClass *col_stmt, *indx_stmt; - char column_name[MAX_INFO_STRING]; - char **column_names = 0; --Int4 column_name_len; -+SQLLEN column_name_len; - int total_columns = 0; - char error = TRUE; - ConnInfo *ci; ---- exe/odbc-config.c +Index: exe/odbc-config.c +=================================================================== +--- exe/odbc-config.c.orig +++ exe/odbc-config.c -@@ -22,6 +22,8 @@ - **********************************************************************/ +@@ -23,6 +23,8 @@ + #include <config.h> #include <stdio.h> +#include <stdlib.h> +#include <string.h> - static void usage( void ) - { -@@ -169,4 +171,5 @@ - exit( -1 ); - } - } -+ return 0; - } ---- Drivers/nn/nndate.c + #ifdef HAVE_STDLIB_H + #include <stdlib.h> +Index: Drivers/nn/nndate.c +=================================================================== +--- Drivers/nn/nndate.c.orig +++ Drivers/nn/nndate.c -@@ -15,6 +15,7 @@ - #include <config.h> +@@ -16,6 +16,7 @@ + #include <nnconfig.h> #include <nndate.h> +#include "misc.h" static char* month_name[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", ---- Drivers/nn/misc.h +Index: Drivers/nn/misc.h +=================================================================== +--- /dev/null +++ Drivers/nn/misc.h @@ -0,0 +1,7 @@ +#ifndef _MISC_H @@ -46,30 +35,37 @@ + + +#endif ---- Drivers/nn/connect.c +Index: Drivers/nn/connect.c +=================================================================== +--- Drivers/nn/connect.c.orig +++ Drivers/nn/connect.c -@@ -13,6 +13,7 @@ +@@ -13,7 +13,10 @@ GNU General Public License for more details. **/ + #include <config.h> ++#include <unistd.h> ++#include <sys/types.h> #include "driver.h" +#include "misc.h" void* nnodbc_getenverrstack(void* henv) { ---- Drivers/nn/config.h -+++ Drivers/nn/config.h -@@ -21,6 +21,8 @@ - # include <stdlib.h> - # include <errno.h> - # include <sys/types.h> -+# include <string.h> -+# include <unistd.h> - - # define MEM_ALLOC(size) (malloc((size_t)(size))) - # define MEM_FREE(ptr) {if(ptr) free(ptr);} ---- Drivers/nn/nntp.c +Index: Drivers/nn/nntp.c +=================================================================== +--- Drivers/nn/nntp.c.orig +++ Drivers/nn/nntp.c -@@ -35,6 +35,7 @@ +@@ -19,6 +19,10 @@ + #include <string.h> + #include <errno.h> + #include <nntp.h> ++#include <sys/socket.h> ++#include <netinet/in.h> ++#include <arpa/inet.h> ++#include <unistd.h> + + # include "nntp.ci" + +@@ -36,6 +37,7 @@ #endif #include <nntp.h> @@ -77,9 +73,11 @@ typedef struct { long article_num; ---- Drivers/nn/nncol.c +Index: Drivers/nn/nncol.c +=================================================================== +--- Drivers/nn/nncol.c.orig +++ Drivers/nn/nncol.c -@@ -17,6 +17,7 @@ +@@ -18,6 +18,7 @@ #include <nncol.h> #include "nncol.ci" @@ -87,17 +85,53 @@ int nnsql_getcolidxbyname( char* col_name ) { ---- Drivers/Postgre7.1/dlg_specific.c +Index: Drivers/Postgre7.1/dlg_specific.c +=================================================================== +--- Drivers/Postgre7.1/dlg_specific.c.orig +++ Drivers/Postgre7.1/dlg_specific.c -@@ -21,10 +21,10 @@ +@@ -21,11 +21,11 @@ #endif #ifndef WIN32 -+# include <string.h> +-# include <string.h> + # include <ctype.h> # ifdef UNIXODBC # include <odbcinst.h> # else --# include <string.h> ++# include <string.h> # include "gpps.h" # define SQLGetPrivateProfileString(a,b,c,d,e,f) GetPrivateProfileString(a,b,c,d,e,f) # define SQLWritePrivateProfileString(a,b,c,d) WritePrivateProfileString(a,b,c,d) +@@ -38,6 +38,7 @@ + + #include "dlg_specific.h" + #include "convert.h" ++#include <string.h> + + #ifndef BOOL + #define BOOL int +Index: Drivers/nn/yylex.c +=================================================================== +--- Drivers/nn/yylex.c.orig ++++ Drivers/nn/yylex.c +@@ -25,6 +25,7 @@ + # define YYERRCODE 256 + + #include <stdio.h> ++#include <string.h> + + static int getcmpopidxbyname(char* name) + { +Index: exe/iusql.c +=================================================================== +--- exe/iusql.c.orig ++++ exe/iusql.c +@@ -29,6 +29,8 @@ + static int OpenDatabase( SQLHENV *phEnv, SQLHDBC *phDbc, char *szDSN, char *szUID, char *szPWD ); + static int ExecuteSQL( SQLHDBC hDbc, char *szSQL, char cDelimiter, int bColumnNames, int bHTMLTable ); + static int ExecuteHelp( SQLHDBC hDbc, char *szSQL, char cDelimiter, int bColumnNames, int bHTMLTable ); ++static int CloseDatabase( SQLHENV hEnv, SQLHDBC hDbc ); ++ + + static void WriteHeaderHTMLTable( SQLHSTMT hStmt ); + static void WriteHeaderNormal( SQLHSTMT hStmt, SQLCHAR *szSepLine ); ++++++ unixODBC-iaddr.patch ++++++ --- /var/tmp/diff_new_pack.iN6iw3/_old 2013-03-13 07:33:40.000000000 +0100 +++ /var/tmp/diff_new_pack.iN6iw3/_new 2013-03-13 07:33:40.000000000 +0100 @@ -1,6 +1,8 @@ ---- Drivers/Postgre7.1/socket.c +Index: Drivers/Postgre7.1/socket.c +=================================================================== +--- Drivers/Postgre7.1/socket.c.orig +++ Drivers/Postgre7.1/socket.c -@@ -100,7 +100,7 @@ +@@ -100,7 +100,7 @@ SOCK_connect_to_ip(SocketClass *self, un { struct hostent *host; struct sockaddr_in sadr; @@ -9,29 +11,7 @@ if (self->socket != -1) { self->errornumber = SOCKET_ALREADY_CONNECTED; -@@ -113,8 +113,8 @@ - /* If it is a valid IP address, use it. - Otherwise use hostname lookup. - */ -- iaddr = inet_addr(hostname); -- if (iaddr == INADDR_NONE) { -+ iaddr.s_addr = inet_addr(hostname); -+ if (iaddr.s_addr == INADDR_NONE) { - host = gethostbyname(hostname); - if (host == NULL) { - self->errornumber = SOCKET_HOST_NOT_FOUND; ---- Drivers/PostgreSQL/socket.c -+++ Drivers/PostgreSQL/socket.c -@@ -102,7 +102,7 @@ - { - struct hostent *host; - struct sockaddr_in sadr; --unsigned long iaddr; -+struct in_addr iaddr; - - if (self->socket != -1) { - self->errornumber = SOCKET_ALREADY_CONNECTED; -@@ -115,8 +115,8 @@ +@@ -113,8 +113,8 @@ unsigned long iaddr; /* If it is a valid IP address, use it. Otherwise use hostname lookup. */ ++++++ unixODBC-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.iN6iw3/_old 2013-03-13 07:33:40.000000000 +0100 +++ /var/tmp/diff_new_pack.iN6iw3/_new 2013-03-13 07:33:40.000000000 +0100 @@ -1,16 +1,8 @@ ---- DriverManager/SQLAllocHandle.c -+++ DriverManager/SQLAllocHandle.c -@@ -224,6 +224,7 @@ - * - **********************************************************************/ - -+ - #include "drivermanager.h" - #if defined ( COLLECT_STATS ) && defined( HAVE_SYS_SEM_H ) - #include "__stats.h" ---- DriverManager/SQLConnect.c +Index: DriverManager/SQLConnect.c +=================================================================== +--- DriverManager/SQLConnect.c.orig +++ DriverManager/SQLConnect.c -@@ -764,6 +764,7 @@ +@@ -919,6 +919,7 @@ static void odbc_dlclose( void *handle ) } mutex_lib_exit(); @@ -18,46 +10,25 @@ } /* ---- cur/SQLAllocHandle.c -+++ cur/SQLAllocHandle.c -@@ -139,4 +139,5 @@ - } - break; - } -+ return 0; - } ---- cur/SQLEndTran.c +Index: cur/SQLEndTran.c +=================================================================== +--- cur/SQLEndTran.c.orig +++ cur/SQLEndTran.c -@@ -70,4 +70,5 @@ +@@ -78,4 +78,5 @@ SQLRETURN CLEndTran( SQLSMALLINT handle_ default: return SQL_ERROR; } + return 0; } ---- cur/SQLError.c -+++ cur/SQLError.c -@@ -149,4 +149,5 @@ - - return SQL_NO_DATA; - } -+ return 0; - } ---- cur/SQLFreeHandle.c -+++ cur/SQLFreeHandle.c -@@ -102,5 +102,6 @@ - */ - return SQL_ERROR; - } -+ return 0; - } - ---- odbcinst/SQLSetConfigMode.c +Index: odbcinst/SQLSetConfigMode.c +=================================================================== +--- odbcinst/SQLSetConfigMode.c.orig +++ odbcinst/SQLSetConfigMode.c -@@ -23,6 +23,7 @@ - __set_config_mode( int mode ) +@@ -24,6 +24,7 @@ static int __config_mode = ODBC_BOTH_DSN + void __set_config_mode( int mode ) { __config_mode = mode; + return 0; } - __get_config_mode() + int __get_config_mode( void ) ++++++ unixODBC-paths.patch ++++++ --- /var/tmp/diff_new_pack.iN6iw3/_old 2013-03-13 07:33:40.000000000 +0100 +++ /var/tmp/diff_new_pack.iN6iw3/_new 2013-03-13 07:33:40.000000000 +0100 @@ -1,130 +1,156 @@ ---- DRVConfig/MiniSQL/Makefile.am +Index: DRVConfig/MiniSQL/Makefile.am +=================================================================== +--- DRVConfig/MiniSQL/Makefile.am.orig +++ DRVConfig/MiniSQL/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcminiS_la_LDFLAGS = -no-undefined libodbcminiS_la_SOURCES = odbcminiS.c +libdir = @libdir@/unixODBC ---- DRVConfig/MySQL/Makefile.am +Index: DRVConfig/MySQL/Makefile.am +=================================================================== +--- DRVConfig/MySQL/Makefile.am.orig +++ DRVConfig/MySQL/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcmyS_la_LDFLAGS = -no-undefined - libodbcmyS_la_SOURCES = odbcmyS.c +libdir = @libdir@/unixODBC ---- DRVConfig/Oracle/Makefile.am +Index: DRVConfig/Oracle/Makefile.am +=================================================================== +--- DRVConfig/Oracle/Makefile.am.orig +++ DRVConfig/Oracle/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ liboraodbcS_la_LDFLAGS = -no-undefined liboraodbcS_la_SOURCES = oraodbcS.c +libdir = @libdir@/unixODBC ---- DRVConfig/PostgreSQL/Makefile.am +Index: DRVConfig/PostgreSQL/Makefile.am +=================================================================== +--- DRVConfig/PostgreSQL/Makefile.am.orig +++ DRVConfig/PostgreSQL/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcpsqlS_la_LDFLAGS = -no-undefined libodbcpsqlS_la_SOURCES = odbcpsqlS.c +libdir = @libdir@/unixODBC ---- DRVConfig/drvcfg1/Makefile.am +Index: DRVConfig/drvcfg1/Makefile.am +=================================================================== +--- DRVConfig/drvcfg1/Makefile.am.orig +++ DRVConfig/drvcfg1/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcdrvcfg1S_la_LDFLAGS = -no-undefin libodbcdrvcfg1S_la_SOURCES = drvcfg1.c +libdir = @libdir@/unixODBC ---- DRVConfig/drvcfg2/Makefile.am +Index: DRVConfig/drvcfg2/Makefile.am +=================================================================== +--- DRVConfig/drvcfg2/Makefile.am.orig +++ DRVConfig/drvcfg2/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcdrvcfg2S_la_LDFLAGS = -no-undefin libodbcdrvcfg2S_la_SOURCES = drvcfg2.c +libdir = @libdir@/unixODBC ---- DRVConfig/esoob/Makefile.am +Index: DRVConfig/esoob/Makefile.am +=================================================================== +--- DRVConfig/esoob/Makefile.am.orig +++ DRVConfig/esoob/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libesoobS_la_LDFLAGS = -no-undefined -v libesoobS_la_SOURCES = esoobS.c +libdir = @libdir@/unixODBC ---- DRVConfig/nn/Makefile.am +Index: DRVConfig/nn/Makefile.am +=================================================================== +--- DRVConfig/nn/Makefile.am.orig +++ DRVConfig/nn/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbcnnS_la_LDFLAGS = -no-undefined - libodbcnnS_la_SOURCES = drvcfg.c +libdir = @libdir@/unixODBC ---- DRVConfig/oplodbc/Makefile.am +Index: DRVConfig/oplodbc/Makefile.am +=================================================================== +--- DRVConfig/oplodbc/Makefile.am.orig +++ DRVConfig/oplodbc/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ liboplodbcS_la_LDFLAGS = -no-undefined liboplodbcS_la_SOURCES = oplodbc.c +libdir = @libdir@/unixODBC ---- DRVConfig/sapdb/Makefile.am +Index: DRVConfig/sapdb/Makefile.am +=================================================================== +--- DRVConfig/sapdb/Makefile.am.orig +++ DRVConfig/sapdb/Makefile.am -@@ -9,3 +9,5 @@ +@@ -7,3 +7,5 @@ libsapdbS_la_LDFLAGS = -no-undefined -v libsapdbS_la_SOURCES = sapdb.c EXTRA_DIST = README + +libdir = @libdir@/unixODBC ---- DRVConfig/tds/Makefile.am +Index: DRVConfig/tds/Makefile.am +=================================================================== +--- DRVConfig/tds/Makefile.am.orig +++ DRVConfig/tds/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libtdsS_la_LDFLAGS = -no-undefined -ver libtdsS_la_SOURCES = tdsS.c +libdir = @libdir@/unixODBC ---- DRVConfig/txt/Makefile.am +Index: DRVConfig/txt/Makefile.am +=================================================================== +--- DRVConfig/txt/Makefile.am.orig +++ DRVConfig/txt/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libodbctxtS_la_LDFLAGS = -no-undefined libodbctxtS_la_SOURCES = drvcfg.c +libdir = @libdir@/unixODBC ---- Drivers/Postgre7.1/Makefile.am +Index: Drivers/Postgre7.1/Makefile.am +=================================================================== +--- Drivers/Postgre7.1/Makefile.am.orig +++ Drivers/Postgre7.1/Makefile.am -@@ -69,3 +69,5 @@ +@@ -72,3 +72,5 @@ libodbcpsql_la_SOURCES = \ statement.c \ tuple.c \ tuplelist.c + +libdir = @libdir@/unixODBC ---- Drivers/PostgreSQL/Makefile.am -+++ Drivers/PostgreSQL/Makefile.am -@@ -64,3 +64,5 @@ - statement.c \ - tuple.c \ - tuplelist.c -+ -+libdir = @libdir@/unixODBC ---- Drivers/nn/Makefile.am +Index: Drivers/nn/Makefile.am +=================================================================== +--- Drivers/nn/Makefile.am.orig +++ Drivers/nn/Makefile.am -@@ -76,3 +76,4 @@ +@@ -74,3 +74,4 @@ libnn_la_SOURCES = \ nndate.c \ nntp.c +libdir = @libdir@/unixODBC ---- Drivers/txt/Makefile.am -+++ Drivers/txt/Makefile.am -@@ -112,3 +112,4 @@ - driver.h \ - driverextras.h - -+libdir = @libdir@/unixODBC ---- DRVConfig/Mimer/Makefile.am +Index: DRVConfig/Mimer/Makefile.am +=================================================================== +--- DRVConfig/Mimer/Makefile.am.orig +++ DRVConfig/Mimer/Makefile.am -@@ -8,3 +8,4 @@ +@@ -6,3 +6,4 @@ libmimerS_la_LDFLAGS = -no-undefined -ve libmimerS_la_SOURCES = mimerS.c +libdir = @libdir@/unixODBC ---- Drivers/template/Makefile.am +Index: Drivers/template/Makefile.am +=================================================================== +--- Drivers/template/Makefile.am.orig +++ Drivers/template/Makefile.am -@@ -101,3 +101,5 @@ +@@ -99,3 +99,5 @@ libtemplate_la_SOURCES = \ _NativeTypeDesc.c \ _NativeTypeLength.c \ _NativeTypePrecision.c + +libdir = @libdir@/unixODBC +Index: Drivers/MiniSQL/Makefile.am +=================================================================== +--- Drivers/MiniSQL/Makefile.am.orig ++++ Drivers/MiniSQL/Makefile.am +@@ -196,3 +196,4 @@ EXTRA_DIST = \ + libodbcmini_la_LDFLAGS = -no-undefined -version-info 1:0:0 \ + -L@msql_libraries@ -lmsql -module + ++libdir = @libdir@/unixODBC -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
