subject:"\[CVS\] OpenPKG\: openpkg\-src\/myodbc\/ myodbc.patch myodbc.spec"

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

2008-04-16 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   17-Apr-2008 08:25:56
  Branch: HEAD Handle: 2008041707255600

  Modified files:
openpkg-src/myodbc  myodbc.patch myodbc.spec

  Log:
upgrading package: myodbc 3.51.24r1071 -> 5.1.4r1107

  Summary:
RevisionChanges Path
1.6 +23 -14 openpkg-src/myodbc/myodbc.patch
1.58+4  -4  openpkg-src/myodbc/myodbc.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r1.5 -r1.6 myodbc.patch
  --- openpkg-src/myodbc/myodbc.patch   18 Jul 2007 05:14:33 -  1.5
  +++ openpkg-src/myodbc/myodbc.patch   17 Apr 2008 06:25:56 -  1.6
  @@ -1,7 +1,7 @@
   Index: configure
   configure.orig   2007-05-04 04:55:25 +0200
  -+++ configure2007-05-08 09:33:10 +0200
  -@@ -20846,7 +20846,7 @@
  +--- configure.orig   2008-04-15 18:20:29 +0200
   configure2008-04-17 08:08:03 +0200
  +@@ -20226,7 +20226,7 @@
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS
  @@ -11,8 +11,8 @@
/* confdefs.h.  */
_ACEOF
   Index: util/Makefile.in
   util/Makefile.in.orig2007-07-13 21:48:15 +0200
  -+++ util/Makefile.in 2007-07-18 07:07:36 +0200
  +--- util/Makefile.in.orig2008-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 \
  @@ -23,27 +23,36 @@

subdir = util
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  -@@ -83,7 +84,8 @@
  +@@ -74,7 +75,7 @@
  + MYODBCUtilDSNExists.c MYODBCUtilReadDataSource.c \
  + MYODBCUtilReadDataSourceStr.c MYODBCUtilReadDriver.c \
  + MYODBCUtilWriteDataSource.c MYODBCUtilWriteDataSourceStr.c \
  +-MYODBCUtilWriteDriver.c
  ++MYODBCUtilWriteDriver.c strndup.c
  + @[EMAIL PROTECTED] = 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 \
   [EMAIL PROTECTED]@   MYODBCUtilWriteDriver.lo
   [EMAIL PROTECTED]@   MYODBCUtilWriteDriver.lo \
   [EMAIL PROTECTED]@   strndup.lo
  - am_libmyodbc3u_la_OBJECTS = MYODBCUtilAllocDataSource.lo \
  + am_libmyodbc3u_la_OBJECTS = stringutil.lo installer.lo odbcinstw.lo \
  + unicode_transcode.lo MYODBCUtilAllocDataSource.lo \
MYODBCUtilAllocDriver.lo MYODBCUtilClearDataSource.lo \
  - MYODBCUtilClearDriver.lo MYODBCUtilDefaultDataSource.lo \
  -@@ -348,6 +350,7 @@
  +@@ -340,6 +342,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
   [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL 
PROTECTED]@
  - 
  - .c.o:
  - @am__fastdepCC_TRUE@if $(COMPILE) -MT $@ -MD -MP -MF 
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
   Index: util/strndup.c
   /dev/null2007-05-08 09:33:33 +0200
  -+++ util/strndup.c   2007-05-08 09:28:45 +0200
  +--- /dev/null2008-04-17 08:08:44 +0200
   util/strndup.c   2008-04-17 08:08:03 +0200
   @@ -0,0 +1,15 @@
   +
   +#include 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.spec
  
  $ cvs diff -u -r1.57 -r1.58 myodbc.spec
  --- openpkg-src/myodbc/myodbc.spec21 Mar 2008 11:45:50 -  1.57
  +++ openpkg-src/myodbc/myodbc.spec17 Apr 2008 06:25:56 -  1.58
  @@ -22,8 +22,8 @@
   ##
   
   #   package version
  -%define   V_major 3.51
  -%define   V_minor 24r1071
  +%define   V_major 5.1
  +%define   V_minor 4r1107
   
   #   package information
   Name: myodbc
  @@ -36,10 +36,10 @@
   Group:Database
   License:  GPL
   Version:  %{V_major}.%{V_minor}
  -Release:  20080321
  +Release:  20080417
   
   #   list of sources
  -Source0:  
http://dev.mysql.com/downloads/connector/odbc/::/mysql-connector-odbc-%{version}.tar.gz

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

2007-07-17 Thread Christoph Schug

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Christoph Schug
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   18-Jul-2007 07:14:33
  Branch: HEAD Handle: 2007071806143300

  Modified files:
openpkg-src/myodbc  myodbc.patch myodbc.spec

  Log:
upgrading package: myodbc 3.51.15r409 -> 3.51.17r581

  Summary:
RevisionChanges Path
1.5 +22 -21 openpkg-src/myodbc/myodbc.patch
1.49+2  -2  openpkg-src/myodbc/myodbc.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r1.4 -r1.5 myodbc.patch
  --- openpkg-src/myodbc/myodbc.patch   8 May 2007 07:37:59 -   1.4
  +++ openpkg-src/myodbc/myodbc.patch   18 Jul 2007 05:14:33 -  1.5
  @@ -11,28 +11,29 @@
/* confdefs.h.  */
_ACEOF
   Index: util/Makefile.in
   util/Makefile.in.orig2007-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
  +--- util/Makefile.in.orig2007-07-13 21:48:15 +0200
   util/Makefile.in 2007-07-18 07:07:36 +0200
  +@@ -49,7 +49,8 @@
  + @ODBCINSTLINK_TRUE@ MYODBCUtilReadDriver.c \
  + @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSource.c \
  + @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSourceStr.c \
  [EMAIL PROTECTED]@MYODBCUtilWriteDriver.c
  [EMAIL PROTECTED]@MYODBCUtilWriteDriver.c \
  [EMAIL PROTECTED]@strndup.c

  - EXTRA_DIST = \
  - util.pro
  -@@ -329,6 +330,7 @@
  + subdir = util
  + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  +@@ -83,7 +84,8 @@
  + @ODBCINSTLINK_TRUE@ MYODBCUtilReadDriver.lo \
  + @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSource.lo \
  + @ODBCINSTLINK_TRUE@ MYODBCUtilWriteDataSourceStr.lo \
  [EMAIL PROTECTED]@MYODBCUtilWriteDriver.lo
  [EMAIL PROTECTED]@MYODBCUtilWriteDriver.lo \
  [EMAIL PROTECTED]@strndup.lo
  + am_libmyodbc3u_la_OBJECTS = MYODBCUtilAllocDataSource.lo \
  + MYODBCUtilAllocDriver.lo MYODBCUtilClearDataSource.lo \
  + MYODBCUtilClearDriver.lo MYODBCUtilDefaultDataSource.lo \
  +@@ -348,6 +350,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.spec
  
  $ cvs diff -u -r1.48 -r1.49 myodbc.spec
  --- openpkg-src/myodbc/myodbc.spec8 May 2007 07:37:59 -   1.48
  +++ openpkg-src/myodbc/myodbc.spec18 Jul 2007 05:14:33 -  1.49
  @@ -24,7 +24,7 @@
   
   #   package version
   %define   V_major 3.51
  -%define   V_minor 15r409
  +%define   V_minor 17r581
   
   #   package information
   Name: myodbc
  @@ -37,7 +37,7 @@
   Group:Database
   License:  GPL
   Version:  %{V_major}.%{V_minor}
  -Release:  20070508
  +Release:  20070718
   
   #   list of sources
   Source0:  
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/mysql-connector-odbc-%{version}.tar.gz
  @@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

2007-05-08 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   08-May-2007 09:38:00
  Branch: HEAD Handle: 2007050808375900

  Modified files:
openpkg-src/myodbc  myodbc.patch myodbc.spec

  Log:
upgrading package: myodbc 3.51.12 -> 3.51.15r409

  Summary:
RevisionChanges Path
1.4 +20 -63 openpkg-src/myodbc/myodbc.patch
1.48+2  -2  openpkg-src/myodbc/myodbc.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r1.3 -r1.4 myodbc.patch
  --- openpkg-src/myodbc/myodbc.patch   14 Jun 2006 19:24:40 -  1.3
  +++ openpkg-src/myodbc/myodbc.patch   8 May 2007 07:37:59 -   1.4
  @@ -1,59 +1,28 @@
  -Index: driver/results.c
   driver/results.c.orig2005-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@
  - @[EMAIL PROTECTED] = myodbcinst.c
  [EMAIL PROTECTED]@myodbc3i_LDADD = @LIBS@ ../util/libmyodbcutil.la
  [EMAIL PROTECTED]@myodbc3i_LDADD = ../util/libmyodbcutil.la @ODBC_DM_LIB@ 
@LIBS@ 
  - @[EMAIL PROTECTED] = ../util/libmyodbcutil.la
  - 
  - # [EMAIL PROTECTED]@
  -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: configure
  +--- configure.orig   2007-05-04 04:55:25 +0200
   configure2007-05-08 09:33:10 +0200
  +@@ -20846,7 +20846,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.orig2005-10-10 03:05:47 +0200
  -+++ util/Makefile.in 2006-06-14 09:27:34 +0200
  +--- util/Makefile.in.orig2007-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
  - libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS)
  + libmyodbc3u_la_OBJECTS = $(am_libmyodbc3u_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver
depcomp = $(SHELL) $(top_srcdir)/depcomp
  -@@ -247,7 +247,8 @@
  +@@ -253,7 +253,8 @@
MYODBCUtilWriteConnectStr.c \
MYODBCUtilWriteDataSource.c \
MYODBCUtilWriteDataSourceStr.c \
  @@ -62,8 +31,8 @@
   +strndup.c

EXTRA_DIST = \
  - util.pro \
  -@@ -324,6 +325,7 @@
  + util.pro
  +@@ -329,6 +330,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  @@ -72,8 +41,8 @@
.c.o:
@am__fastdepCC_TRUE@if $(COMPILE) -MT $@ -MD -MP -MF 
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
   Index: util/strndup.c
   /dev/null2006-06-14 09:33:01 +0200
  -+++ util/strndup.c   2006-06-14 09:27:34 +0200
  +--- /dev/null2007-05-08 09:33:33 +0200
   util/strndup.c   2007-05-08 09:28:45 +0200
   @@ -0,0 +1,15 @@
   +
   +#include 
  @@ -90,15 +59,3 @@
   +return dst;
   +}
   +
  -Index: configure
   configure.orig   2005-10-10 03:02:59 +0200
  -+++ configure2006-06-14 21:14:40 +0200
  -@@ -24491,7 +24491,7 @@
  - #define HAVE_SQLGETPRIVATEPROFILESTRING 1
  - _ACEOF
  - 
  --  L

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

2006-06-14 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   14-Jun-2006 21:24:42
  Branch: HEAD Handle: 2006061420244000

  Modified files:
openpkg-src/myodbc  myodbc.patch myodbc.spec

  Log:
upgrading package: myodbc 3.51.11 -> 3.51.12

  Summary:
RevisionChanges Path
1.3 +66 -33 openpkg-src/myodbc/myodbc.patch
1.44+11 -9  openpkg-src/myodbc/myodbc.spec
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r1.2 -r1.3 myodbc.patch
  --- openpkg-src/myodbc/myodbc.patch   10 Feb 2005 15:27:01 -  1.2
  +++ openpkg-src/myodbc/myodbc.patch   14 Jun 2006 19:24:40 -  1.3
  @@ -1,26 +1,59 @@
  +Index: driver/results.c
  +--- driver/results.c.orig2005-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@
  + @[EMAIL PROTECTED] = myodbcinst.c
  [EMAIL PROTECTED]@myodbc3i_LDADD = @LIBS@ ../util/libmyodbcutil.la
  [EMAIL PROTECTED]@myodbc3i_LDADD = ../util/libmyodbcutil.la @ODBC_DM_LIB@ 
@LIBS@ 
  + @[EMAIL PROTECTED] = ../util/libmyodbcutil.la
  + 
  + # [EMAIL PROTECTED]@
  +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.orig2005-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
  +--- util/Makefile.in.orig2005-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
  -@@ -83,7 +83,8 @@
  - @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteConnectStr.Plo \
  - @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo \
  - @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo \
  [EMAIL PROTECTED]@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo
  [EMAIL PROTECTED]@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo \
  [EMAIL PROTECTED]@./$(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 @@
  +@@ -247,7 +247,8 @@
MYODBCUtilWriteConnectStr.c \
MYODBCUtilWriteDataSource.c \
MYODBCUtilWriteDataSourceStr.c \
  @@ -30,7 +63,7 @@

EXTRA_DIST = \
util.pro \
  -@@ -334,6 +336,7 @@
  +@@ -324,6 +325,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  @@ -39,8 +72,8 @@
.c.o:
@am__fastdepCC_TRUE@if $(COMPILE) -MT $@ -MD -MP -MF 
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
   Index: util/strndup.c
   /dev/null2005-

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec strndup.c

2005-02-10 Thread Ralf S. Engelschall

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   10-Feb-2005 16:27:01
  Branch: HEAD Handle: 2005021015270100

  Modified files:
openpkg-src/myodbc  myodbc.patch myodbc.spec
  Removed files:
openpkg-src/myodbc  strndup.c

  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)

  Summary:
RevisionChanges Path
1.2 +42 -12 openpkg-src/myodbc/myodbc.patch
1.41+5  -6  openpkg-src/myodbc/myodbc.spec
1.2 +0  -43 openpkg-src/myodbc/strndup.c
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r1.1 -r1.2 myodbc.patch
  --- openpkg-src/myodbc/myodbc.patch   13 Jan 2005 14:05:36 -  1.1
  +++ openpkg-src/myodbc/myodbc.patch   10 Feb 2005 15:27:01 -  1.2
  @@ -1,17 +1,16 @@
   Index: util/Makefile.in
  -diff -Nau util/Makefile.in.orig util/Makefile.in
   util/Makefile.in.orig2005-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
  +--- util/Makefile.in.orig2005-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
libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver
depcomp = $(SHELL) $(top_srcdir)/depcomp
  -@@ -79,7 +79,8 @@
  +@@ -83,7 +83,8 @@
@AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteConnectStr.Plo \
@AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo \
@AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo \
  @@ -21,7 +20,7 @@
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
  -@@ -251,7 +252,8 @@
  +@@ -258,7 +259,8 @@
MYODBCUtilWriteConnectStr.c \
MYODBCUtilWriteDataSource.c \
MYODBCUtilWriteDataSourceStr.c \
  @@ -31,7 +30,7 @@

EXTRA_DIST = \
util.pro \
  -@@ -324,6 +326,7 @@
  +@@ -334,6 +336,7 @@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  @@ -39,3 +38,34 @@

.c.o:
@am__fastdepCC_TRUE@if $(COMPILE) -MT $@ -MD -MP -MF 
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  +Index: util/strndup.c
  +--- /dev/null2005-02-10 16:13:23 +0100
   util/strndup.c   2005-02-10 16:17:25 +0100
  +@@ -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: 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
  + 
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.spec
  
  $ cvs diff -u -r1.40 -r1.41 myodbc.spec
  --- openpkg-src/myodbc/myodbc.spec13 Jan 2005 14:05:36 -  1.40
  +++ ope

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec strndup.c

2005-01-13 Thread Michael Schloh

  OpenPKG CVS Repository
  http://cvs.openpkg.org/
  

  Server: cvs.openpkg.org  Name:   Michael Schloh
  Root:   /e/openpkg/cvs   Email:  [EMAIL PROTECTED]
  Module: openpkg-src  Date:   13-Jan-2005 15:05:37
  Branch: HEAD Handle: 2005011314053600

  Added files:
openpkg-src/myodbc  myodbc.patch strndup.c
  Modified files:
openpkg-src/myodbc  myodbc.spec

  Log:
implemented nonstandard strndup(3), and... upgrading package: myodbc
3.51.09 -> 3.51.10

  Summary:
RevisionChanges Path
1.1 +41 -0  openpkg-src/myodbc/myodbc.patch
1.40+6  -2  openpkg-src/myodbc/myodbc.spec
1.1 +43 -0  openpkg-src/myodbc/strndup.c
  

  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.patch
  
  $ cvs diff -u -r0 -r1.1 myodbc.patch
  --- /dev/null 2005-01-13 15:05:36 +0100
  +++ myodbc.patch  2005-01-13 15:05:37 +0100
  @@ -0,0 +1,41 @@
  +Index: util/Makefile.in
  +diff -Nau util/Makefile.in.orig util/Makefile.in
  +--- util/Makefile.in.orig2005-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
  + libmyodbcutil_la_OBJECTS = $(am_libmyodbcutil_la_OBJECTS)
  + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/driver
  + depcomp = $(SHELL) $(top_srcdir)/depcomp
  +@@ -79,7 +79,8 @@
  + @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteConnectStr.Plo \
  + @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSource.Plo \
  + @AMDEP_TRUE@./$(DEPDIR)/MYODBCUtilWriteDataSourceStr.Plo \
  [EMAIL PROTECTED]@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo
  [EMAIL PROTECTED]@./$(DEPDIR)/MYODBCUtilWriteDriver.Plo \
  [EMAIL PROTECTED]@./$(DEPDIR)/strndup.Plo
  + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
  +@@ -251,7 +252,8 @@
  + MYODBCUtilWriteConnectStr.c \
  + MYODBCUtilWriteDataSource.c \
  + MYODBCUtilWriteDataSourceStr.c \
  +-MYODBCUtilWriteDriver.c
  ++MYODBCUtilWriteDriver.c \
  ++strndup.c
  + 
  + EXTRA_DIST = \
  + util.pro \
  +@@ -324,6 +326,7 @@
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  + @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
  [EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL 
PROTECTED]@
  + 
  + .c.o:
  + @am__fastdepCC_TRUE@if $(COMPILE) -MT $@ -MD -MP -MF 
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/myodbc.spec
  
  $ cvs diff -u -r1.39 -r1.40 myodbc.spec
  --- openpkg-src/myodbc/myodbc.spec1 Jan 2005 10:52:43 -   1.39
  +++ openpkg-src/myodbc/myodbc.spec13 Jan 2005 14:05:36 -  1.40
  @@ -25,7 +25,7 @@
   
   #   package version
   %define   V_major 3.51
  -%define   V_minor 09
  +%define   V_minor 10
   
   #   package information
   Name: myodbc
  @@ -38,10 +38,12 @@
   Group:Database
   License:  GPL
   Version:  %{V_major}.%{V_minor}
  -Release:  20041026
  +Release:  20050113
   
   #   list of sources
   Source0:  
http://sunsite.informatik.rwth-aachen.de/mysql/Downloads/MyODBC3/MyODBC-%{version}.tar.gz
  +Source1:  strndup.c
  +Patch0:   myodbc.patch
   
   #   build information
   Prefix:   %{l_prefix}
  @@ -65,6 +67,8 @@
   
   %prep
   %setup -q -n MyODBC-%{V_major}.%{V_minor}
  +%patch -p0
  +cp %{SOURCE strndup.c} util/
   
   %build
   CC="%{l_cc}" \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/myodbc/strndup.c
  
  $ cvs diff -u -r0 -r1.1 strndup.c
  --- /dev/null 2005-01-13 15:05:36 +0100
  +++ strndup.c 2005-01-13 15:05:37 +0100
  @@ -0,0 +1,43 @@
  +/*
  +** strndup.c: ISO C implementation
  +** Copyright (c) 2003 Michael Schloh von Bennewitz <[EMAIL PROTECTED]>
  +** Copyright (c) 2003 Cable & Wireless 
  +**
  +** Permission to use, copy, modify, and distribute this software for
  +** any purpose with or without fee is hereby granted, provided that
  +** the above copyright notice and this permission notice appear in all
  +** c

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec strndup.c

[CVS] OpenPKG: openpkg-src/myodbc/ myodbc.patch myodbc.spec strndup.c

6 matches

Site Navigation

Mail list logo

Footer information