diff --git a/SOURCES/README.dist b/SOURCES/README.dist new file mode 100644 index 00000000..e71be30c --- /dev/null +++ b/SOURCES/README.dist @@ -0,0 +1,33 @@ +About unixODBC in this distribution +----------------------------------- + +In addition to the unixODBC package itself, you will want to install some +or all of these related packages: + +mysql-connector-odbc MySQL driver, needed to connect to MySQL databases +postgresql-odbc PostgreSQL driver, needed to connect to PostgreSQL +unixODBC-gui-qt Optional configuration management and test programs + + +The recommended driver definition for MySQL is: + +[MySQL] +Description = ODBC for MySQL +Driver = /usr/lib/libmyodbc5.so +Setup = /usr/lib/libodbcmyS.so +Driver64 = /usr/lib64/libmyodbc5.so +Setup64 = /usr/lib64/libodbcmyS.so +FileUsage = 1 + +You can adjust the name (in square brackets) and the description, but +the other items should usually be used verbatim. + +The recommended driver definition for PostgreSQL is: + +[PostgreSQL] +Description = ODBC for PostgreSQL +Driver = /usr/lib/psqlodbcw.so +Setup = /usr/lib/libodbcpsqlS.so +Driver64 = /usr/lib64/psqlodbcw.so +Setup64 = /usr/lib64/libodbcpsqlS.so +FileUsage = 1 diff --git a/SOURCES/conffile.h b/SOURCES/conffile.h new file mode 100644 index 00000000..0996b35b --- /dev/null +++ b/SOURCES/conffile.h @@ -0,0 +1,31 @@ +/* + * Kluge to support multilib installation of both 32- and 64-bit RPMS: + * we need to arrange that header files that appear in both RPMs are + * identical. Hence, this file is architecture-independent and calls + * in an arch-dependent file that will appear in just one RPM. + * + * To avoid breaking arches not explicitly supported by Red Hat, we + * use this indirection file *only* on known multilib arches. + * + * Note: this may well fail if user tries to use gcc's -I- option. + * But that option is deprecated anyway. + */ +#if defined(__x86_64__) +#include "CONFFILE_x86_64.h" +#elif defined(__ia64__) +#include "CONFFILE_ia64.h" +#elif defined(__i386__) +#include "CONFFILE_i386.h" +#elif defined(__ppc64__) || defined(__powerpc64__) +#include "CONFFILE_ppc64.h" +#elif defined(__ppc__) || defined(__powerpc__) +#include "CONFFILE_ppc.h" +#elif defined(__s390x__) +#include "CONFFILE_s390x.h" +#elif defined(__s390__) +#include "CONFFILE_s390.h" +#elif defined(__sparc__) && defined(__arch64__) +#include "CONFFILE_sparc64.h" +#elif defined(__sparc__) +#include "CONFFILE_sparc.h" +#endif diff --git a/SOURCES/coverity-fixes.patch b/SOURCES/coverity-fixes.patch new file mode 100644 index 00000000..abf2623c --- /dev/null +++ b/SOURCES/coverity-fixes.patch @@ -0,0 +1,125 @@ +Fix assorted small errors detected by a Coverity scan, per bug #760877. + + +diff -Naur unixODBC-2.3.1.orig/DriverManager/SQLGetCursorName.c unixODBC-2.3.1/DriverManager/SQLGetCursorName.c +--- unixODBC-2.3.1.orig/DriverManager/SQLGetCursorName.c 2011-08-04 09:06:56.000000000 -0400 ++++ unixODBC-2.3.1/DriverManager/SQLGetCursorName.c 2013-03-19 13:12:19.022156796 -0400 +@@ -189,7 +189,7 @@ + + thread_protect( SQL_HANDLE_STMT, statement ); + +- if ( !buffer_length < 0 ) ++ if ( buffer_length < 0 ) + { + dm_log_write( __FILE__, + __LINE__, +diff -Naur unixODBC-2.3.1.orig/DriverManager/SQLGetCursorNameW.c unixODBC-2.3.1/DriverManager/SQLGetCursorNameW.c +--- unixODBC-2.3.1.orig/DriverManager/SQLGetCursorNameW.c 2011-08-04 09:07:01.000000000 -0400 ++++ unixODBC-2.3.1/DriverManager/SQLGetCursorNameW.c 2013-03-19 13:12:19.023156773 -0400 +@@ -172,7 +172,7 @@ + + thread_protect( SQL_HANDLE_STMT, statement ); + +- if ( !buffer_length < 0 ) ++ if ( buffer_length < 0 ) + { + dm_log_write( __FILE__, + __LINE__, +diff -Naur unixODBC-2.3.1.orig/DriverManager/__info.c unixODBC-2.3.1/DriverManager/__info.c +--- unixODBC-2.3.1.orig/DriverManager/__info.c 2011-11-15 06:43:15.000000000 -0500 ++++ unixODBC-2.3.1/DriverManager/__info.c 2013-03-19 13:12:19.022156796 -0400 +@@ -3997,7 +3997,7 @@ + + void setup_error_head( EHEAD *error_header, void *handle, int type ) + { +- memset( error_header, 0, sizeof( error_header )); ++ memset( error_header, 0, sizeof( *error_header )); + + error_header -> owning_handle = handle; + error_header -> handle_type = type; +diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/info.c unixODBC-2.3.1/Drivers/Postgre7.1/info.c +--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/info.c 2009-12-11 11:54:08.000000000 -0500 ++++ unixODBC-2.3.1/Drivers/Postgre7.1/info.c 2013-03-19 13:12:19.025156733 -0400 +@@ -1007,7 +1007,7 @@ + strcpy(prefixes, globals.extra_systable_prefixes); + i = 0; + prefix[i] = strtok(prefixes, ";"); +- while (prefix[i] && i<32) { ++ while (prefix[i] && i local_buffer ); ++ if ( bcol -> local_buffer ) + { + free( bcol -> local_buffer ); + } +diff -Naur unixODBC-2.3.1.orig/cur/SQLGetInfo.c unixODBC-2.3.1/cur/SQLGetInfo.c +--- unixODBC-2.3.1.orig/cur/SQLGetInfo.c 2011-08-04 09:13:48.000000000 -0400 ++++ unixODBC-2.3.1/cur/SQLGetInfo.c 2013-03-19 13:12:19.020156848 -0400 +@@ -140,6 +140,7 @@ + value = SQL_PS_POSITIONED_DELETE | + SQL_PS_POSITIONED_UPDATE | + SQL_PS_SELECT_FOR_UPDATE; ++ break; + + case SQL_ROW_UPDATES: + cval = "Y"; +diff -Naur unixODBC-2.3.1.orig/exe/isql.c unixODBC-2.3.1/exe/isql.c +--- unixODBC-2.3.1.orig/exe/isql.c 2011-09-15 12:57:14.000000000 -0400 ++++ unixODBC-2.3.1/exe/isql.c 2013-03-19 13:27:09.907545641 -0400 +@@ -121,6 +121,7 @@ + break; + case '3': + version3 = 1; ++ break; + case 'v': + bVerbose = 1; + break; +@@ -611,8 +612,7 @@ + { + if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt ); + fprintf( stderr, "[ISQL]ERROR: Could not SQLNumResultCols\n" ); +- SQLFreeStmt( hStmt, SQL_DROP ); +- free(szSepLine); ++ break; + } + + if ( cols > 0 ) diff --git a/SOURCES/depcomp.patch b/SOURCES/depcomp.patch new file mode 100644 index 00000000..bc40d223 --- /dev/null +++ b/SOURCES/depcomp.patch @@ -0,0 +1,330 @@ +--- unixODBC-2.2.8/depcomp 2001-10-28 16:26:53.000000000 -0500 ++++ unixODBC-2.2.8-rh/depcomp 2003-07-02 11:40:03.000000000 -0400 +@@ -31,7 +31,16 @@ + fi + # `libtool' can also be set to `yes' or `no'. + +-depfile=${depfile-`echo "$object" | sed 's,\([^/]*\)$,.deps/\1,;s/\.\([^.]*\)$/.P\1/'`} ++if test -z "$depfile"; then ++ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'` ++ dir=`echo "$object" | sed 's,/.*$,/,'` ++ if test "$dir" = "$object"; then ++ dir= ++ fi ++ # FIXME: should be _deps on DOS. ++ depfile="$dir.deps/$base" ++fi ++ + tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} + + rm -f "$tmpdepfile" +@@ -197,18 +206,53 @@ + rm -f "$tmpdepfile" + ;; + ++icc) ++ # Must come before tru64. ++ ++ # Intel's C compiler understands `-MD -MF file'. However ++ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c ++ # will fill foo.d with something like ++ # foo.o: sub/foo.c ++ # foo.o: sub/foo.h ++ # which is wrong. We want: ++ # sub/foo.o: sub/foo.c ++ # sub/foo.o: sub/foo.h ++ # sub/foo.c: ++ # sub/foo.h: ++ ++ "$@" -MD -MF "$tmpdepfile" ++ stat=$? ++ if test $stat -eq 0; then : ++ else ++ rm -f "$tmpdepfile" ++ exit $stat ++ fi ++ rm -f "$depfile" ++ # Each line is of the form `foo.o: dependent.h'. ++ # Do two passes, one to just change these to ++ # `$object: dependent.h' and one to simply `dependent.h:'. ++ sed -e "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" ++ sed -e "s,^[^:]*: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" ++ rm -f "$tmpdepfile" ++ ;; ++ + tru64) +- # The Tru64 AIX compiler uses -MD to generate dependencies as a side ++ # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. +- # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put ++ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in `foo.d' instead, so we check for that too. + # Subdirectories are respected. ++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` ++ test "x$dir" = "x$object" && dir= ++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + +- tmpdepfile1="$object.d" +- tmpdepfile2=`echo "$object" | sed -e 's/.o$/.d/'` + if test "$libtool" = yes; then ++ tmpdepfile1="$dir.libs/$base.lo.d" ++ tmpdepfile2="$dir.libs/$base.d" + "$@" -Wc,-MD + else ++ tmpdepfile1="$dir$base.o.d" ++ tmpdepfile2="$dir$base.d" + "$@" -MD + fi + +@@ -240,34 +284,42 @@ + + dashmstdout) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. +- test -z "$dashmflag" && dashmflag=-M +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) # this is libtool, let us make it quiet +- for arg +- do # cycle over the arguments +- case "$arg" in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac +- set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done ++ # always write the proprocessed file to stdout, regardless of -o. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg + ;; + esac +- "$@" $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ done ++ ++ test -z "$dashmflag" && dashmflag=-M ++ # Require at least two characters before searching for `:' ++ # in the target name. This is to cope with DOS-style filenames: ++ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. ++ "$@" $dashmflag | ++ sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" + tr ' ' ' +@@ -285,36 +337,40 @@ + ;; + + makedepend) +- # X makedepend +- ( +- shift +- cleared=no +- for arg in "$@"; do +- case $cleared in no) +- set ""; shift +- cleared=yes +- esac +- case "$arg" in +- -D*|-I*) +- set fnord "$@" "$arg"; shift;; +- -*) +- ;; +- *) +- set fnord "$@" "$arg"; shift;; +- esac ++ "$@" || exit $? ++ # Remove any Libtool call ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift + done +- obj_suffix="`echo $object | sed 's/^.*\././'`" +- touch "$tmpdepfile" +- ${MAKEDEPEND-makedepend} 2>/dev/null -o"$obj_suffix" -f"$tmpdepfile" "$@" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ shift ++ fi ++ # X makedepend ++ shift ++ cleared=no ++ for arg in "$@"; do ++ case $cleared in ++ no) ++ set ""; shift ++ cleared=yes ;; ++ esac ++ case "$arg" in ++ -D*|-I*) ++ set fnord "$@" "$arg"; shift ;; ++ # Strip any option that makedepend may not understand. Remove ++ # the object too, otherwise makedepend will parse it as a source file. ++ -*|$object) ++ ;; ++ *) ++ set fnord "$@" "$arg"; shift ;; ++ esac ++ done ++ obj_suffix="`echo $object | sed 's/^.*\././'`" ++ touch "$tmpdepfile" ++ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" + rm -f "$depfile" + cat < "$tmpdepfile" > "$depfile" +- tail +3 "$tmpdepfile" | tr ' ' ' ++ sed '1,2d' "$tmpdepfile" | tr ' ' ' + ' | \ + ## Some versions of the HPUX 10.20 sed can't process this invocation + ## correctly. Breaking it into two sed invocations is a workaround. +@@ -324,35 +380,39 @@ + + cpp) + # Important note: in order to support this mode, a compiler *must* +- # always write the proprocessed file to stdout, regardless of -o, +- # because we must use -o when running libtool. +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) +- for arg +- do # cycle over the arguments +- case $arg in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac +- set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done ++ # always write the proprocessed file to stdout. ++ "$@" || exit $? ++ ++ # Remove the call to Libtool. ++ if test "$libtool" = yes; then ++ while test $1 != '--mode=compile'; do ++ shift ++ done ++ shift ++ fi ++ ++ # Remove `-o $object'. ++ IFS=" " ++ for arg ++ do ++ case $arg in ++ -o) ++ shift ++ ;; ++ $object) ++ shift ++ ;; ++ *) ++ set fnord "$@" "$arg" ++ shift # fnord ++ shift # $arg + ;; + esac +- "$@" -E | ++ done ++ ++ "$@" -E | + sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed '$ s: \\$::' > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + cat < "$tmpdepfile" >> "$depfile" +@@ -364,32 +424,25 @@ + # Important note: in order to support this mode, a compiler *must* + # always write the proprocessed file to stdout, regardless of -o, + # because we must use -o when running libtool. +- ( IFS=" " +- case " $* " in +- *" --mode=compile "*) +- for arg +- do # cycle over the arguments +- case $arg in +- "--mode=compile") +- # insert --quiet before "--mode=compile" +- set fnord "$@" --quiet +- shift # fnord +- ;; +- esac ++ "$@" || exit $? ++ IFS=" " ++ for arg ++ do ++ case "$arg" in ++ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") ++ set fnord "$@" ++ shift ++ shift ++ ;; ++ *) + set fnord "$@" "$arg" +- shift # fnord +- shift # "$arg" +- done +- ;; ++ shift ++ shift ++ ;; + esac +- "$@" -E | +- sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" +- ) & +- proc=$! +- "$@" +- stat=$? +- wait "$proc" +- if test "$stat" != 0; then exit $stat; fi ++ done ++ "$@" -E | ++ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + rm -f "$depfile" + echo "$object : \\" > "$depfile" + . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" diff --git a/SOURCES/dltest.1 b/SOURCES/dltest.1 new file mode 100644 index 00000000..2619f2e5 --- /dev/null +++ b/SOURCES/dltest.1 @@ -0,0 +1,52 @@ +.TH dltest 1 "Thu 13 Feb 2014" "version 2.3.1" "UnixODBC manual pages" +.SH NAME +dltest \- A simple library symbol test + +.SH SYNOPSIS +.B dltest +.R [ +.I library symbol +.R ] + +.SH DESCRIPTION +.B dltest +is simple test of occurence of the +.I symbol +in the +.IR library . +The +.I library +must be a full (with path) file name of the shared object, in which the search for +.I symbol +should be performed. + +Without any parameters, dltest print short help message. + +.SH EXAMPLES +To determine if the symbol +.B printf +is found in the +.IR libc-2\.18\.so : + +.RS +$ dltest /usr/lib/libc-2.18.so printf +.RE + +.SH AUTHORS +The authors of unixODBC are +.MT pharvey@codebydesign.com +Peter Harvey +.ME +and +.MT nick@easysoft.com +Nick Gorham +.ME . +For the full list of contributors see the +.I AUTHORS +file. + +.SH COPYRIGHT +unixODBC is licensed under the GNU Lesser General Public License. For details +about the license, see the +.I COPYING +file. diff --git a/SOURCES/export-symbols.patch b/SOURCES/export-symbols.patch new file mode 100644 index 00000000..9ea9d068 --- /dev/null +++ b/SOURCES/export-symbols.patch @@ -0,0 +1,40 @@ +Fix some unknown symbols. (This patch was originally for 2.2.11, +do we still need it?) + + +diff -Naur unixODBC-2.2.14.orig/DriverManager/DriverManager.exp unixODBC-2.2.14/DriverManager/DriverManager.exp +--- unixODBC-2.2.14.orig/DriverManager/DriverManager.exp 2008-05-22 05:10:54.000000000 -0400 ++++ unixODBC-2.2.14/DriverManager/DriverManager.exp 2009-02-15 18:44:46.000000000 -0500 +@@ -153,6 +153,8 @@ + SQLTablesA + SQLTransact + ODBCSharedTraceFlag ++dm_log_write ++__post_internal_error + uodbc_open_stats + uodbc_close_stats + uodbc_get_stats +diff -Naur unixODBC-2.2.14.orig/cur/Makefile.am unixODBC-2.2.14/cur/Makefile.am +--- unixODBC-2.2.14.orig/cur/Makefile.am 2008-06-17 06:18:39.000000000 -0400 ++++ unixODBC-2.2.14/cur/Makefile.am 2009-02-15 18:44:46.000000000 -0500 +@@ -10,7 +10,7 @@ + libodbccr_la_LDFLAGS = \ + -no-undefined \ + -version-info @LIB_VERSION@ \ +- -export-symbols @srcdir@/cur.exp -export-dynamic ++ -export-symbols @srcdir@/cur.exp -export-dynamic ../DriverManager/libodbc.la + + libodbccr_la_SOURCES = \ + SQLAllocHandle.c \ +diff -Naur unixODBC-2.2.14.orig/cur/Makefile.in unixODBC-2.2.14/cur/Makefile.in +--- unixODBC-2.2.14.orig/cur/Makefile.in 2008-11-19 11:11:15.000000000 -0500 ++++ unixODBC-2.2.14/cur/Makefile.in 2009-02-15 18:44:46.000000000 -0500 +@@ -272,7 +272,7 @@ + libodbccr_la_LDFLAGS = \ + -no-undefined \ + -version-info @LIB_VERSION@ \ +- -export-symbols @srcdir@/cur.exp -export-dynamic ++ -export-symbols @srcdir@/cur.exp -export-dynamic ../DriverManager/libodbc.la + + libodbccr_la_SOURCES = \ + SQLAllocHandle.c \ diff --git a/SOURCES/keep-typedefs.patch b/SOURCES/keep-typedefs.patch new file mode 100644 index 00000000..7f577f28 --- /dev/null +++ b/SOURCES/keep-typedefs.patch @@ -0,0 +1,18 @@ +Upstream has decided to deprecate these typedefs, but experience so far +says that removing them just breaks code to little purpose. + + +diff -Naur unixODBC-2.2.14.orig/include/sqltypes.h unixODBC-2.2.14/include/sqltypes.h +--- unixODBC-2.2.14.orig/include/sqltypes.h 2008-10-31 12:21:53.000000000 -0400 ++++ unixODBC-2.2.14/include/sqltypes.h 2009-02-16 13:28:50.000000000 -0500 +@@ -170,6 +170,10 @@ + typedef SQLUINTEGER SQLROWSETSIZE; + typedef SQLLEN SQLROWOFFSET; + */ ++typedef SQLULEN SQLROWCOUNT; ++typedef SQLULEN SQLROWSETSIZE; ++typedef SQLULEN SQLTRANSID; ++typedef SQLLEN SQLROWOFFSET; + #endif + #else + typedef long SQLINTEGER; diff --git a/SOURCES/so-version-bump.patch b/SOURCES/so-version-bump.patch new file mode 100644 index 00000000..4b3249ae --- /dev/null +++ b/SOURCES/so-version-bump.patch @@ -0,0 +1,207 @@ +Set the major .so version to 2 for all unixODBC shared libraries, to reflect +the incompatible ABI changes in 2.2.14. + + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am 2011-12-02 14:01:00.153970964 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libmimerS_la_SOURCES = mimerS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am 2011-12-02 14:00:40.257679498 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcminiS_la_SOURCES = odbcminiS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am 2011-12-02 14:00:46.656773720 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcmyS_la_SOURCES = odbcmyS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am 2011-12-02 14:00:49.946821471 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + liboraodbcS_la_SOURCES = oraodbcS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am 2011-12-02 14:00:29.193516374 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcpsqlS_la_SOURCES = odbcpsqlS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am 2011-12-02 14:00:53.361871162 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcdrvcfg1S_la_SOURCES = drvcfg1.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am 2011-12-02 14:00:25.249459261 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcdrvcfg2S_la_SOURCES = drvcfg2.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am unixODBC-2.3.1/DRVConfig/esoob/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/esoob/Makefile.am 2011-12-02 14:00:36.802629045 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libesoobS_la_SOURCES = esoobS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am unixODBC-2.3.1/DRVConfig/nn/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/nn/Makefile.am 2011-12-02 14:00:16.113323779 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbcnnS_la_SOURCES = drvcfg.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am 2011-12-02 14:00:20.992397039 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + liboplodbcS_la_SOURCES = oplodbc.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am 2011-12-02 14:00:43.360724987 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libsapdbS_la_SOURCES = sapdb.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am unixODBC-2.3.1/DRVConfig/tds/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/tds/Makefile.am 2011-12-02 14:00:56.753921152 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libtdsS_la_SOURCES = tdsS.c + +diff -Naur unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am unixODBC-2.3.1/DRVConfig/txt/Makefile.am +--- unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am 2009-12-11 11:54:07.000000000 -0500 ++++ unixODBC-2.3.1/DRVConfig/txt/Makefile.am 2011-12-02 14:00:32.929572613 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + +-libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + libodbctxtS_la_SOURCES = drvcfg.c + +diff -Naur unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am +--- unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am 2009-12-11 11:54:09.000000000 -0500 ++++ unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am 2011-12-02 14:01:30.797419661 -0500 +@@ -193,6 +193,6 @@ + sqlFreeEnv.c \ + sqlFreeStmt.c + +-libodbcmini_la_LDFLAGS = -no-undefined -version-info 1:0:0 \ ++libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \ + -L@msql_libraries@ -lmsql -module + +diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am +--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am 2009-12-11 11:54:08.000000000 -0500 ++++ unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am 2011-12-02 14:01:24.860333250 -0500 +@@ -3,7 +3,7 @@ + INCLUDES = -I@top_srcdir@/include $(LTDLINCL) + + libodbcpsql_la_LDFLAGS = \ +- -version-info 2:0:0 \ ++ -version-info $(LIB_VERSION) \ + -no-undefined \ + $(LIBSOCKET) $(LIBNSL) \ + -export-dynamic \ +diff -Naur unixODBC-2.3.1.orig/Drivers/nn/Makefile.am unixODBC-2.3.1/Drivers/nn/Makefile.am +--- unixODBC-2.3.1.orig/Drivers/nn/Makefile.am 2009-12-11 11:54:09.000000000 -0500 ++++ unixODBC-2.3.1/Drivers/nn/Makefile.am 2011-12-02 14:01:07.828083493 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include -I. + +-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module ++libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module + + EXTRA_DIST = \ + nnconfig.h \ +diff -Naur unixODBC-2.3.1.orig/Drivers/template/Makefile.am unixODBC-2.3.1/Drivers/template/Makefile.am +--- unixODBC-2.3.1.orig/Drivers/template/Makefile.am 2009-12-11 11:54:09.000000000 -0500 ++++ unixODBC-2.3.1/Drivers/template/Makefile.am 2011-12-02 14:01:12.828156445 -0500 +@@ -2,7 +2,7 @@ + + INCLUDES = -I@top_srcdir@/include -I. $(LTDLINCL) + +-libtemplate_la_LDFLAGS = -no-undefined -version-info 1:0:0 ++libtemplate_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) + + EXTRA_DIST = \ + driver.h \ diff --git a/SPECS/unixODBC.spec b/SPECS/unixODBC.spec new file mode 100644 index 00000000..61f420b9 --- /dev/null +++ b/SPECS/unixODBC.spec @@ -0,0 +1,575 @@ +Summary: A complete ODBC driver manager for Linux +Name: unixODBC +Version: 2.3.1 +Release: 11%{?dist} +Group: System Environment/Libraries +URL: http://www.unixODBC.org/ +# Programs are GPL, libraries are LGPL, except News Server library is GPL. +License: GPLv2+ and LGPLv2+ + +Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz +Source1: odbcinst.ini +Source4: conffile.h +Source5: README.dist +Source6: isql.1 +Source7: odbc.ini.5 +Source8: odbcinst.1 +Source9: odbcinst.ini.5 +Source10: iusql.1 +Source11: dltest.1 +Source12: odbc_config.1 + +Patch1: depcomp.patch +Patch6: export-symbols.patch +Patch8: so-version-bump.patch +Patch9: keep-typedefs.patch +Patch10: coverity-fixes.patch + +Conflicts: iodbc + +BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex +BuildRequires: readline-devel + +%description +Install unixODBC if you want to access databases through ODBC. +You will also need the mysql-connector-odbc package if you want to access +a MySQL database, and/or the postgresql-odbc package for PostgreSQL. + +%package devel +Summary: Development files for programs which will use the unixODBC library +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The unixODBC package can be used to access databases through ODBC +drivers. If you want to develop programs that will access data through +ODBC, you need to install this package. + +%prep +%setup -q +%patch1 -p1 +%patch6 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 + +chmod 0644 Drivers/MiniSQL/*.c +chmod 0644 Drivers/nn/*.c +chmod 0644 Drivers/template/*.c +chmod 0644 doc/ProgrammerManual/Tutorial/*.html +chmod 0644 doc/lst/* +chmod 0644 include/odbcinst.h + +# Blow away the embedded libtool and replace with build system's libtool. +# (We will use the installed libtool anyway, but this makes sure they match.) +rm -rf config.guess config.sub install-sh ltmain.sh libltdl +# this hack is so we can build with either libtool 2.2 or 1.5 +libtoolize --install || libtoolize + +%build + +aclocal +automake --add-missing +autoconf + +# unixODBC 2.2.14 is not aliasing-safe +CFLAGS="%{optflags} -fno-strict-aliasing -DDEFINE_CURSOR_LIB_VER" +CXXFLAGS="$CFLAGS" +export CFLAGS CXXFLAGS + +%configure --with-gnu-ld=yes --enable-threads=yes \ + --enable-drivers=yes --enable-driverc=yes --enable-ltdllib +make all + +%install +make DESTDIR=$RPM_BUILD_ROOT install +install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir} + +# multilib header hacks +# we only apply this to known Red Hat multilib arches, per bug #181335 +case `uname -i` in + i386 | x86_64 | ia64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 ) + mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h + rm -f unixodbc_conf.h + sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h + install -m 644 unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir} + ;; + *) + ;; +esac + +# add some explanatory documentation +# remove reference to nonexistent packages +sed '/^unixODBC-gui-qt/d' "%{SOURCE5}" >README.dist + +# remove obsolete Postgres drivers from the package (but not the setup code) +rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so* + +# copy text driver documentation into main doc directory +# currently disabled because upstream no longer includes text driver +# mkdir -p doc/Drivers/txt +# cp -pr Drivers/txt/doc/* doc/Drivers/txt + +# don't want to install doc Makefiles as docs +find doc -name 'Makefile*' | xargs rm + +# we do not want to ship static libraries +rm -f $RPM_BUILD_ROOT%{_libdir}/*.a + +# remove unpackaged files from the buildroot +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.* +rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool + +# initialize lists of .so files +find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list +find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list + +# move these to main package, they're often dlopened... +for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so +do + echo "%{_libdir}/$lib" >> base-so-list + grep -v "/$lib$" devel-so-list > devel-so-list.x + mv -f devel-so-list.x devel-so-list +done + +# install man pages that are not part of upstream yet +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5} +install -m644 %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man1/isql.1 +install -m644 %{SOURCE7} $RPM_BUILD_ROOT%{_mandir}/man5/odbc.ini.5 +install -m644 %{SOURCE8} $RPM_BUILD_ROOT%{_mandir}/man1/odbcinst.1 +install -m644 %{SOURCE9} $RPM_BUILD_ROOT%{_mandir}/man5/odbcinst.ini.5 +install -m644 %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1/iusql.1 +install -m644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/dltest.1 +install -m644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1/odbc_config.1 + +%files -f base-so-list +%doc README COPYING AUTHORS ChangeLog NEWS doc +%doc README.dist +%config(noreplace) %{_sysconfdir}/odbc* +%{_bindir}/odbcinst +%{_bindir}/isql +%{_bindir}/dltest +%{_bindir}/iusql +%{_bindir}/odbc_config +%{_mandir}/man*/* + +%files devel -f devel-so-list +%{_includedir}/* + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%changelog +* Wed Jul 15 2015 Jan Stanek - 2.3.1-11 +- Turn on versioning of cursor library. + Resolves: rhbz#1194065 + +* Tue Feb 25 2014 Jan Stanek - 2.3.1-10 +- Added missing man pages + Resolves: rhbz#948935 + +* Fri Jan 24 2014 Daniel Mach - 2.3.1-9 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 2.3.1-8 +- Mass rebuild 2013-12-27 + +* Fri Dec 06 2013 Jan Stanek - 2.3.1-7 +- Renamed README.fedora to README.dist + +* Thu Jul 4 2013 Honza Horak 2.3.1-6 +- Spec file clean-up +- Provide man pages created by Jan Stanek + +* Thu Jul 4 2013 Honza Horak 2.3.1-5 +- Fix Coverity patch + Resolves: #981060 + +* Tue Mar 19 2013 Tom Lane 2.3.1-4 +- Fix assorted small bugs found by Coverity +Related: #760877 + +* Fri Feb 15 2013 Fedora Release Engineering - 2.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 2.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jan 10 2012 Tom Lane 2.3.1-1 +- Update to version 2.3.1. The main externally-visible change is that the + GUI programs are not part of the unixODBC tarball anymore, so they are no + longer in this package, and the unixODBC-kde sub-RPM has disappeared. + There is a separate package unixODBC-gui-qt that now provides those programs. + +* Mon Feb 07 2011 Fedora Release Engineering - 2.2.14-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Aug 31 2010 Tom Lane 2.2.14-12 +- Fix isql crash at EOF with -b option +Resolves: #628909 + +* Mon May 3 2010 Tom Lane 2.2.14-11 +- Re-add accidentally-removed desktop icon for ODBCConfig +Related: #587933 + +* Sat Mar 13 2010 Kevin Kofler 2.2.14-10 +- BR qt-assistant-adp-devel + +* Sat Dec 19 2009 Tom Lane 2.2.14-9 +- Fix bug preventing drivers from being selected in ODBCConfig +Resolves: #544852 + +* Wed Nov 25 2009 Kevin Kofler 2.2.14-8 +- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI) + +* Thu Oct 15 2009 Tom Lane 2.2.14-7 +- Clean up bogosity in multilib stub header support: ia64 should not be + listed (it's not multilib), sparcv9 isn't a possible uname -i output + +* Fri Aug 21 2009 Tom Lane 2.2.14-6 +- Switch to building against qt4, not qt3. This means the DataManager, + DataManagerII, and odbctest applications are gone. +Resolves: #514064 +- Use Driver64/Setup64 to eliminate need for hand-adjustment of odbcinst.ini +Resolves: #514688 +- Fix misdeclaration of SQLBIGINT and SQLUBIGINT in generated header files +Resolves: #518623 + +* Sun Jul 26 2009 Fedora Release Engineering - 2.2.14-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Jun 9 2009 Peter Lemenkov - 2.2.14-4 +- Properly install *.desktop files +- No need to ship INSTALL in docs +- Use macros instead of hardcoded /usr/share and /usr/include +- fixed permissions on some doc- and src-files +- Almost all rpmlint messages are gone now + +* Sat Jun 06 2009 Dennis Gilmore - 2.2.14-3 +- add sparc support to the multilib includes header + +* Wed Feb 25 2009 Fedora Release Engineering - 2.2.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 20 2009 Tom Lane 2.2.14-1 +- Update to unixODBC 2.2.14. Note this involves an ABI break and a consequent + soname version bump, because upstream fixed some mistakes in the widths of + some API datatypes for 64-bit platforms. Also, the formerly embedded + mysql, postgresql, and text drivers have been removed. (For mysql and + postgresql, use the separate mysql-connector-odbc and postgresql-odbc + packages, which are far more up to date. The text driver is not currently + shipped by upstream at all, but might get revived as a separate SRPM later.) +- Stop shipping .a library files, per distro policy. +- Fixes for libtool 2.2. + +* Mon Jul 28 2008 Tom Lane 2.2.12-9 +- Fix build failure caused by new default patch fuzz = 0 policy in rawhide. + +* Fri Jun 13 2008 Tom Lane 2.2.12-8 +- Install icons in /usr/share/pixmaps, not /usr/share/icons as this package + has historically done; the former is considered correct. + +* Fri Apr 4 2008 Tom Lane 2.2.12-7 +- Must BuildRequire qt3 now that Fedora has renamed qt4 to qt +Resolves: #440798 + +* Mon Feb 11 2008 Tom Lane 2.2.12-6 +- Move libodbcinst.so symlink into main package, since it's often dlopen'd +Related: #204882 +- Clean up specfile's ugly coding for making base-vs-devel decisions + +* Sun Dec 30 2007 Tom Lane 2.2.12-5 +- Add missing BuildRequires for flex. +Resolves: #427063 + +* Thu Aug 2 2007 Tom Lane 2.2.12-4 +- Update License tag to match code. + +* Fri Apr 20 2007 Tom Lane 2.2.12-3 +- Make configure find correct Qt libraries when building on a multilib machine + +* Mon Apr 16 2007 Tom Lane 2.2.12-2 +- Drop BuildRequires for kdelibs-devel +Resolves: #152717 +- Clean up a few rpmlint complaints + +* Wed Dec 6 2006 Tom Lane 2.2.12-1 +- Update to unixODBC 2.2.12. +- Add missing BuildPrereq for bison. +Resolves: #190427 + +* Wed Jul 12 2006 Jesse Keating - 2.2.11-7.1 +- rebuild + +* Mon Mar 27 2006 Tom Lane 2.2.11-7 +- Fix minor problems in desktop files (bug #185764) + +* Fri Feb 10 2006 Jesse Keating - 2.2.11-6.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 2.2.11-6.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Mon Nov 21 2005 Tom Lane 2.2.11-6 +- Patch NO-vs-no discrepancy between aclocal/acinclude and recent autoconf + versions (not sure if this has been broken for a long time, or was just + exposed by modular X changeover). +- Apparently need to require libXt-devel too for modular X. + +* Mon Nov 7 2005 Tom Lane 2.2.11-5 +- Adjust BuildPrereq for modular X. + +* Sun Oct 16 2005 Florian La Roche 2.2.11-4 +- link against dependent libs +- fix some bugs to resolve unknown symbols ;-( + +* Thu Sep 29 2005 Tom Lane 2.2.11-3 +- Force update of yac.h because the copy in the distributed tarball does not + match bison 2.0's numbering of symbols (bz #162676) +- Include documentation of text-file driver +- Use private libltdl so we can omit RTLD_GLOBAL from dlopen flags (bz #161399) + +* Sat Sep 24 2005 Tom Lane 2.2.11-2 +- Remove Makefiles accidentally included in docs installation (bz #168819) +- Updates to keep newer libtool code from installing itself as part of package + +* Fri Apr 8 2005 Tom Lane 2.2.11-1 +- Update to unixODBC 2.2.11 + +* Mon Mar 7 2005 Tom Lane 2.2.10-3 +- Rebuild with gcc4. + +* Wed Jan 12 2005 Tim Waugh 2.2.10-2 +- Rebuilt for new readline. + +* Thu Oct 28 2004 Tom Lane 2.2.10-1 +- Update to unixODBC 2.2.10 + +* Wed Sep 22 2004 Tom Lane 2.2.9-1 +- Update to unixODBC 2.2.9 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sat May 8 2004 Tom Lane 2.2.8-5 +- Backpatch fix for double-free error from upstream devel sources. +- rebuilt + +* Wed May 5 2004 Tom Lane 2.2.8-4 +- Add dependency to ensure kde subpackage stays in sync with main + (needed because we moved odbctest from one pkg to the other, + cf bug #122478) +- rebuilt + +* Wed Mar 10 2004 Tom Lane 2.2.8-3 +- Use installed libltdl +- rebuilt for Fedora Core 2 + +* Tue Mar 9 2004 Tom Lane 2.2.8-2 +- Rename lo_xxx() to odbc_lo_xxx() (bug #117211) (temporary until 2.2.9) +- rebuilt + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Mar 1 2004 Tom Lane +- Update to 2.2.8 +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Thu Dec 4 2003 Joe Orton 2.2.5-10 +- rebuild to restore sqltypes.h after #111195 + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add XFree86-devel to the list of BuildPrereq. Did not bump + release as there is no need to rebuild. + +* Thu Oct 16 2003 Fernando Nasser 2.2.5-9 +- Add comments to the /etc/odbcinst.ini file regarding the proper + setup for MySQL and the origin of each library needed. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-8 +- Move libodbcmyS.so to the main package as well. It is used the + same way as libodbcpsqlS.so. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-7 +- Bumped the version so it rebuilds. + +* Tue Oct 14 2003 Fernando Nasser 2.2.5-4 +- Revert previous change and special case libodbcpsql.so and + libodbcpsqlS.so instead. Here is the explanation (from Elliot + Lee): + ".so files are only used at link time for normal dynamic libraries. + The libraries referred to here are being used as dynamically loaded + modules, so I guess moving those particular .so files back to the + main package would make sense, but the other .so files should stay + in the devel subpackage." + +* Fri Oct 10 2003 Fernando Nasser 2.2.5-3 +- Moved all the shared library symlinks to the main package. + They were deliberatedly being added to the devel package for + unknown reasons but this was forcing users to install the + devel package always. +- No need to special-case libodbc.so anymore + +* Fri Sep 05 2003 Elliot Lee 2.2.5-2 +- Run auto* so it rebuilds. + +* Mon Jul 07 2003 Fernando Nasser 2.2.5-1 +- Moved odbctest to the kde package to remove require on Qt stuff + from the main package. +- Removed stray "\" from doc/Makefile.am +- Applied libtool fix (provided by Alex Oliva) so that it build + with cross-compilers (which are used by 64 bit systems) +- Updated sources to the 2.2.5 community release +- Changed the included libtool to the 1.5-3 one so that + it properly link the libraries with the newly generated ones + and not with the ones installed on the build system (or give + an error if an old version is not installed (# 91110) +- Added new files for executable DataManagerII and icons LinuxODBC.xpm + and odbc.xpm + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Jan 9 2003 Bill Nottingham 2.2.3-5 +- debloat + +* Tue Dec 17 2002 Elliot Lee 2.2.3-4 +- Run libtoolize etc. + +* Thu Dec 12 2002 Elliot Lee 2.2.3-3 +- Rebuild to fix filelist errors...? + +* Fri Nov 29 2002 Tim Powers 2.2.3-2 +- remove unpackaged files from the buildroot + +* Tue Nov 19 2002 Elliot Lee 2.2.3-1 +- Rebuild, update to 2.2.3 + +* Mon Aug 26 2002 Trond Eivind Glomsrd 2.2.2-3 +- Move libodbc.so to the main package, so programs dlopening + it don't break (#72653) + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Trond Eivind Glomsrd 2.2.2-1 +- 2.2.2 +- desktop file changes (# 69371) + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Mon May 20 2002 Trond Eivind Glomsrd 2.2.1-1 +- 2.2.1 +- Reenable other archs, as this should now build on 64 bit archs + +* Sun May 19 2002 Florian La Roche +- add at least mainframe; should this really be a i386-only rpm? + +* Wed Apr 17 2002 Bernhard Rosenkraenzer 2.2.0-5 +- rebuild + +* Fri Apr 5 2002 Trond Eivind Glomsrd 2.2.0-4 +- Avoid having files in more than one package (#62755) + +* Tue Mar 26 2002 Trond Eivind Glomsrd 2.2.0-3 +- Don't include kde plugin .so as a devel symlink (#61039) + +* Fri Mar 8 2002 Bernhard Rosenkraenzer 2.2.0-2 +- Rebuild with KDE 3.x + +* Tue Feb 26 2002 Trond Eivind Glomsrd 2.2.0-1 +- Just build on i386 now, there are 64 bit oddities +- 2.2.0 + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-2 +- move libodbcinstQ* to the kde subpackage + +* Fri Jan 11 2002 Trond Eivind Glomsrd 2.1.1-1 +- 2.1.1 +- minor cleanups + +* Fri Dec 14 2001 Trond Eivind Glomsrd 2.0.7-5 +- Rebuild + +* Wed Sep 12 2001 Tim Powers +- rebuild with new gcc and binutils + +* Sun Jun 24 2001 Than Ngo +- rebuild against qt-2.3.1, kde-2.1.x + +* Fri Jun 15 2001 Trond Eivind Glomsrd +- Better default odbcinst.ini +- Minor cleanups + +* Wed Jun 6 2001 Trond Eivind Glomsrd +- 2.0.7 + +* Wed Apr 25 2001 Trond Eivind Glomsrd +- Fix for isql segfault on EOF/ctrl-d exit + +* Fri Apr 20 2001 Trond Eivind Glomsrd +- 2.0.6 +- add patch for 64 bit archs (dword shouldn't be "long int") + +* Wed Feb 28 2001 Trond Eivind Glomsrd +- rebuild + +* Tue Nov 28 2000 Trond Eivind Glomsrd +- 1.8.13 + +* Tue Oct 10 2000 Trond Eivind Glomsrd +- enable GUI now that we have KDE compiled with the standard + compiler +- move the applnk entries to the KDE package + +* Thu Aug 24 2000 Nalin Dahyabhai +- add the missing shared libs to the non-devel package + +* Wed Aug 23 2000 Preston Brown +- 1.8.12 fixes problems with the postgresql driver + +* Mon Jul 31 2000 Trond Eivind Glomsrd +- disable KDE subpackage to avoid the mess that is C++ binary + compatibility + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Fri Jun 30 2000 Florian La Roche +- improved QTDIR detection + +* Wed Jun 28 2000 Trond Eivind Glomsrd +- 1.8.10 +- use %%{_tmppath} +- update URL +- including two missing libraries + +* Tue Jun 13 2000 Preston Brown +- 1.8.9 + +* Fri Jun 09 2000 Preston Brown +- adopted for Winston, changed to Red Hat packaging standards + +* Tue Apr 18 2000 Murray Todd Williams +- added a unixODBC-devel RPM to the group, added KDE links and icons to system +- all of which came from recommendations from Fredrick Meunier +- + +* Mon Apr 17 2000 Murray Todd Williams +- unixODBC-1.8.7 +- moved install to $RPM_BUILD_ROOT so it didn't overrun existing files.