head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.3 OPENPKG_E1_MP:1.3 OPENPKG_E1_MP_2_STABLE:1.3.2.2 OPENPKG_E1_FP:1.3.2.2 OPENPKG_2_STABLE_MP:1.3 OPENPKG_2_STABLE_20061018:1.3.2.2 OPENPKG_2_STABLE:1.3.0.2 OPENPKG_CW_FP:1.2; locks; strict; comment @# @; 1.6 date 2008.04.17.06.25.56; author rse; state Exp; branches; next 1.5; commitid VrOuDdk2JSgHzqZs; 1.5 date 2007.07.18.05.14.33; author cs; state Exp; branches; next 1.4; commitid IGpwPa9QF7mgZcqs; 1.4 date 2007.05.08.07.37.59; author rse; state Exp; branches; next 1.3; commitid DGphV2coOcuY36hs; 1.3 date 2006.06.14.19.24.40; author rse; state Exp; branches 1.3.2.1; next 1.2; commitid 3qtjG8ZM5dZ3w0Br; 1.2 date 2005.02.10.15.27.01; author rse; state Exp; branches; next 1.1; 1.1 date 2005.01.13.14.05.36; author ms; state Exp; branches; next ; 1.3.2.1 date 2006.06.14.19.24.40; author rse; state dead; branches; next 1.3.2.2; commitid iZxwRSmmWscPXUQr; 1.3.2.2 date 2006.10.16.14.53.04; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.6 log @upgrading package: myodbc 3.51.24r1071 -> 5.1.4r1107 @ text @Index: configure --- configure.orig 2008-04-15 18:20:29 +0200 +++ configure 2008-04-17 08:08:03 +0200 @@@@ -20226,7 +20226,7 @@@@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbcinst $LIBS" +LIBS="-lodbcinst -lodbc $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF Index: util/Makefile.in --- util/Makefile.in.orig 2008-04-15 18:20:26 +0200 +++ util/Makefile.in 2008-04-17 08:09:36 +0200 @@@@ -49,7 +49,8 @@@@ @@ODBCINSTLINK_TRUE@@ MYODBCUtilReadDriver.c \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDataSource.c \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDataSourceStr.c \ -@@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDriver.c +@@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDriver.c \ +@@ODBCINSTLINK_TRUE@@ strndup.c subdir = util DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in @@@@ -74,7 +75,7 @@@@ MYODBCUtilDSNExists.c MYODBCUtilReadDataSource.c \ MYODBCUtilReadDataSourceStr.c MYODBCUtilReadDriver.c \ MYODBCUtilWriteDataSource.c MYODBCUtilWriteDataSourceStr.c \ - MYODBCUtilWriteDriver.c + MYODBCUtilWriteDriver.c strndup.c @@ODBCINSTLINK_TRUE@@am__objects_1 = MYODBCUtilGetDataSourceNames.lo \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilGetDriverNames.lo \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilGetIniFileName.lo \ @@@@ -84,7 +85,8 @@@@ @@ODBCINSTLINK_TRUE@@ MYODBCUtilReadDriver.lo \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDataSource.lo \ @@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDataSourceStr.lo \ -@@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDriver.lo +@@ODBCINSTLINK_TRUE@@ MYODBCUtilWriteDriver.lo \ +@@ODBCINSTLINK_TRUE@@ strndup.lo am_libmyodbc3u_la_OBJECTS = stringutil.lo installer.lo odbcinstw.lo \ unicode_transcode.lo MYODBCUtilAllocDataSource.lo \ MYODBCUtilAllocDriver.lo MYODBCUtilClearDataSource.lo \ @@@@ -340,6 +342,7 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/strndup.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/installer.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/odbcinstw.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/stringutil.Plo@@am__quote@@ Index: util/strndup.c --- /dev/null 2008-04-17 08:08:44 +0200 +++ util/strndup.c 2008-04-17 08:08:03 +0200 @@@@ -0,0 +1,15 @@@@ + +#include + +char *strndup(const char *src, size_t len) +{ + char *dst; + + if (src == NULL) + return NULL; + if (dst = (char *)calloc(len + 1, sizeof(char)) == NULL) + return NULL; + strncpy(dst, src, len); + return dst; +} + @ 1.5 log @upgrading package: myodbc 3.51.15r409 -> 3.51.17r581 @ text @d2 3 a4 3 --- configure.orig 2007-05-04 04:55:25 +0200 +++ configure 2007-05-08 09:33:10 +0200 @@@@ -20846,7 +20846,7 @@@@ d14 2 a15 2 --- util/Makefile.in.orig 2007-07-13 21:48:15 +0200 +++ util/Makefile.in 2007-07-18 07:07:36 +0200 d26 10 a35 1 @@@@ -83,7 +84,8 @@@@ d42 2 a43 1 am_libmyodbc3u_la_OBJECTS = MYODBCUtilAllocDataSource.lo \ d45 1 a45 2 MYODBCUtilClearDriver.lo MYODBCUtilDefaultDataSource.lo \ @@@@ -348,6 +350,7 @@@@ d50 3 a52 3 .c.o: @@am__fastdepCC_TRUE@@ if $(COMPILE) -MT $@@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@@ $<; \ d54 2 a55 2 --- /dev/null 2007-05-08 09:33:33 +0200 +++ util/strndup.c 2007-05-08 09:28:45 +0200 @ 1.4 log @upgrading package: myodbc 3.51.12 -> 3.51.15r409 @ text @d14 9 a22 18 --- util/Makefile.in.orig 2007-05-04 04:55:23 +0200 +++ util/Makefile.in 2007-05-08 09:33:59 +0200 @@@@ -59,7 +59,7 @@@@ MYODBCUtilReadDataSource.lo MYODBCUtilReadDataSourceStr.lo \ MYODBCUtilReadDriver.lo MYODBCUtilWriteConnectStr.lo \ MYODBCUtilWriteDataSource.lo MYODBCUtilWriteDataSourceStr.lo \ - MYODBCUtilWriteDriver.lo + MYODBCUtilWriteDriver.lo strndup.lo libmyodbc3u_la_OBJECTS = $(am_libmyodbc3u_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver depcomp = $(SHELL) $(top_srcdir)/depcomp @@@@ -253,7 +253,8 @@@@ MYODBCUtilWriteConnectStr.c \ MYODBCUtilWriteDataSource.c \ MYODBCUtilWriteDataSourceStr.c \ - MYODBCUtilWriteDriver.c + MYODBCUtilWriteDriver.c \ + strndup.c d24 13 a36 3 EXTRA_DIST = \ util.pro @@@@ -329,6 +330,7 @@@@ @ 1.3 log @upgrading package: myodbc 3.51.11 -> 3.51.12 @ text @d1 12 a12 43 Index: driver/results.c --- driver/results.c.orig 2005-10-09 21:33:40 +0200 +++ driver/results.c 2006-06-14 09:31:28 +0200 @@@@ -543,6 +543,7 @@@@ @@purpose : rerunrs column atribute values */ +#if 0 #if defined(__APPLE__) SQLRETURN SQL_API SQLColAttribute( SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, @@@@ -569,6 +570,7 @@@@ StringLengthPtr, NumericAttributePtr ); } +#endif /* Index: myodbcinst/Makefile.in --- myodbcinst/Makefile.in.orig 2005-10-10 03:05:45 +0200 +++ myodbcinst/Makefile.in 2006-06-14 09:35:17 +0200 @@@@ -237,7 +237,7 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ @@MYODBCINST_TRUE@@myodbc3i_SOURCES = myodbcinst.c -@@MYODBCINST_TRUE@@myodbc3i_LDADD = @@LIBS@@ ../util/libmyodbcutil.la +@@MYODBCINST_TRUE@@myodbc3i_LDADD = ../util/libmyodbcutil.la @@ODBC_DM_LIB@@ @@LIBS@@ @@MYODBCINST_TRUE@@myodbc3i_DEPENDENCIES = ../util/libmyodbcutil.la # LDFLAGS=@@EXTRA_LDFLAGS@@ Index: samples/Makefile.in --- samples/Makefile.in.orig 2005-10-10 03:05:46 +0200 +++ samples/Makefile.in 2006-06-14 09:27:34 +0200 @@@@ -254,7 +254,7 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ INCLUDES = -I.. -AM_LDFLAGS = ../driver_r/libmyodbc3_r.la @@MYSQL_THREADSAFE_LIB@@ +AM_LDFLAGS = ../driver/libmyodbc3.la @@MYSQL_THREADSAFE_LIB@@ EXTRA_DIST = my_utility.h run-samples WIN-Makefile all: all-am d14 2 a15 2 --- util/Makefile.in.orig 2005-10-10 03:05:47 +0200 +++ util/Makefile.in 2006-06-14 09:27:34 +0200 d22 1 a22 1 libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS) d25 1 a25 1 @@@@ -247,7 +247,8 @@@@ d34 2 a35 2 util.pro \ @@@@ -324,6 +325,7 @@@@ d44 2 a45 2 --- /dev/null 2006-06-14 09:33:01 +0200 +++ util/strndup.c 2006-06-14 09:27:34 +0200 a61 12 Index: configure --- configure.orig 2005-10-10 03:02:59 +0200 +++ configure 2006-06-14 21:14:40 +0200 @@@@ -24491,7 +24491,7 @@@@ #define HAVE_SQLGETPRIVATEPROFILESTRING 1 _ACEOF - LIBS="$LIBS -lodbcinst" + LIBS="$LIBS -lodbcinst -lodbc" have_odbcinst=yes else LIBS="$save_LIBS" @ 1.3.2.1 log @file myodbc.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:04 +0000 @ text @d1 104 @ 1.3.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 104 Index: driver/results.c --- driver/results.c.orig 2005-10-09 21:33:40 +0200 +++ driver/results.c 2006-06-14 09:31:28 +0200 @@@@ -543,6 +543,7 @@@@ @@purpose : rerunrs column atribute values */ +#if 0 #if defined(__APPLE__) SQLRETURN SQL_API SQLColAttribute( SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, @@@@ -569,6 +570,7 @@@@ StringLengthPtr, NumericAttributePtr ); } +#endif /* Index: myodbcinst/Makefile.in --- myodbcinst/Makefile.in.orig 2005-10-10 03:05:45 +0200 +++ myodbcinst/Makefile.in 2006-06-14 09:35:17 +0200 @@@@ -237,7 +237,7 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ @@MYODBCINST_TRUE@@myodbc3i_SOURCES = myodbcinst.c -@@MYODBCINST_TRUE@@myodbc3i_LDADD = @@LIBS@@ ../util/libmyodbcutil.la +@@MYODBCINST_TRUE@@myodbc3i_LDADD = ../util/libmyodbcutil.la @@ODBC_DM_LIB@@ @@LIBS@@ @@MYODBCINST_TRUE@@myodbc3i_DEPENDENCIES = ../util/libmyodbcutil.la # LDFLAGS=@@EXTRA_LDFLAGS@@ Index: samples/Makefile.in --- samples/Makefile.in.orig 2005-10-10 03:05:46 +0200 +++ samples/Makefile.in 2006-06-14 09:27:34 +0200 @@@@ -254,7 +254,7 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ INCLUDES = -I.. -AM_LDFLAGS = ../driver_r/libmyodbc3_r.la @@MYSQL_THREADSAFE_LIB@@ +AM_LDFLAGS = ../driver/libmyodbc3.la @@MYSQL_THREADSAFE_LIB@@ EXTRA_DIST = my_utility.h run-samples WIN-Makefile all: all-am Index: util/Makefile.in --- util/Makefile.in.orig 2005-10-10 03:05:47 +0200 +++ util/Makefile.in 2006-06-14 09:27:34 +0200 @@@@ -59,7 +59,7 @@@@ MYODBCUtilReadDataSource.lo MYODBCUtilReadDataSourceStr.lo \ MYODBCUtilReadDriver.lo MYODBCUtilWriteConnectStr.lo \ MYODBCUtilWriteDataSource.lo MYODBCUtilWriteDataSourceStr.lo \ - MYODBCUtilWriteDriver.lo + MYODBCUtilWriteDriver.lo strndup.lo libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver depcomp = $(SHELL) $(top_srcdir)/depcomp @@@@ -247,7 +247,8 @@@@ MYODBCUtilWriteConnectStr.c \ MYODBCUtilWriteDataSource.c \ MYODBCUtilWriteDataSourceStr.c \ - MYODBCUtilWriteDriver.c + MYODBCUtilWriteDriver.c \ + strndup.c EXTRA_DIST = \ util.pro \ @@@@ -324,6 +325,7 @@@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo@@am__quote@@ @@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo@@am__quote@@ +@@AMDEP_TRUE@@@@am__include@@ @@am__quote@@./$(DEPDIR)/strndup.Plo@@am__quote@@ .c.o: @@am__fastdepCC_TRUE@@ if $(COMPILE) -MT $@@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@@ $<; \ Index: util/strndup.c --- /dev/null 2006-06-14 09:33:01 +0200 +++ util/strndup.c 2006-06-14 09:27:34 +0200 @@@@ -0,0 +1,15 @@@@ + +#include + +char *strndup(const char *src, size_t len) +{ + char *dst; + + if (src == NULL) + return NULL; + if (dst = (char *)calloc(len + 1, sizeof(char)) == NULL) + return NULL; + strncpy(dst, src, len); + return dst; +} + Index: configure --- configure.orig 2005-10-10 03:02:59 +0200 +++ configure 2006-06-14 21:14:40 +0200 @@@@ -24491,7 +24491,7 @@@@ #define HAVE_SQLGETPRIVATEPROFILESTRING 1 _ACEOF - LIBS="$LIBS -lodbcinst" + LIBS="$LIBS -lodbcinst -lodbc" have_odbcinst=yes else LIBS="$save_LIBS" @ 1.2 log @upgrade to latest version; cleanup packaging by including the extra file into the patch; fix strndup function (size_t is usually unsigned so comparing for lower 0 causes a warning; the return type is a 'char *' so return NULL instead of 0; the helper variable is also a 'char *' so compare against NULL; reduce style complexity by eliminating the nested context block, etc) @ text @d1 43 d45 8 a52 8 --- util/Makefile.in.orig 2005-02-02 17:56:15 +0100 +++ util/Makefile.in 2005-02-10 16:11:33 +0100 @@@@ -60,7 +60,7 @@@@ MYODBCUtilReadConnectStr.lo MYODBCUtilReadDataSource.lo \ MYODBCUtilReadDataSourceStr.lo MYODBCUtilReadDriver.lo \ MYODBCUtilWriteConnectStr.lo MYODBCUtilWriteDataSource.lo \ - MYODBCUtilWriteDataSourceStr.lo MYODBCUtilWriteDriver.lo + MYODBCUtilWriteDataSourceStr.lo MYODBCUtilWriteDriver.lo strndup.lo d56 1 a56 11 @@@@ -83,7 +83,8 @@@@ @@AMDEP_TRUE@@ ./$(DEPDIR)/MYODBCUtilWriteConnectStr.Plo \ @@AMDEP_TRUE@@ ./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo \ @@AMDEP_TRUE@@ ./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo \ -@@AMDEP_TRUE@@ ./$(DEPDIR)/MYODBCUtilWriteDriver.Plo +@@AMDEP_TRUE@@ ./$(DEPDIR)/MYODBCUtilWriteDriver.Plo \ +@@AMDEP_TRUE@@ ./$(DEPDIR)/strndup.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \ @@@@ -258,7 +259,8 @@@@ d66 1 a66 1 @@@@ -334,6 +336,7 @@@@ d75 2 a76 2 --- /dev/null 2005-02-10 16:13:23 +0100 +++ util/strndup.c 2005-02-10 16:17:25 +0100 d93 6 a98 11 Index: samples/Makefile.in --- samples/Makefile.in.orig 2005-02-02 17:56:15 +0100 +++ samples/Makefile.in 2005-02-10 16:21:58 +0100 @@@@ -252,7 +252,7 @@@@ x_includes = @@x_includes@@ x_libraries = @@x_libraries@@ INCLUDES = -I.. -AM_LDFLAGS = ../driver_r/libmyodbc3_r.la @@MYSQL_THREADSAFE_LIB@@ +AM_LDFLAGS = ../driver/libmyodbc3.la @@MYSQL_THREADSAFE_LIB@@ EXTRA_DIST = my_utility.h run-samples WIN-Makefile all: all-am d100 5 @ 1.1 log @implemented nonstandard strndup(3), and... upgrading package: myodbc 3.51.09 -> 3.51.10 @ text @d2 8 a9 9 diff -Nau util/Makefile.in.orig util/Makefile.in --- util/Makefile.in.orig 2005-01-13 13:50:12 +0100 +++ util/Makefile.in 2005-01-13 13:53:11 +0100 @@@@ -59,7 +59,7 @@@@ MYODBCUtilReadDataSource.lo MYODBCUtilReadDataSourceStr.lo \ MYODBCUtilReadDriver.lo MYODBCUtilWriteConnectStr.lo \ MYODBCUtilWriteDataSource.lo MYODBCUtilWriteDataSourceStr.lo \ - MYODBCUtilWriteDriver.lo + MYODBCUtilWriteDriver.lo strndup.lo d13 1 a13 1 @@@@ -79,7 +79,8 @@@@ d23 1 a23 1 @@@@ -251,7 +252,8 @@@@ d33 1 a33 1 @@@@ -324,6 +326,7 @@@@ d41 31 @