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:
Revision Changes 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 -0000 1.1
+++ openpkg-src/myodbc/myodbc.patch 10 Feb 2005 15:27:01 -0000 1.2
@@ -1,17 +1,16 @@
Index: util/Makefile.in
-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
+--- 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
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/null 2005-02-10 16:13:23 +0100
++++ util/strndup.c 2005-02-10 16:17:25 +0100
+@@ -0,0 +1,15 @@
++
++#include <stdio.h>
++
++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.spec 13 Jan 2005 14:05:36 -0000 1.40
+++ openpkg-src/myodbc/myodbc.spec 10 Feb 2005 15:27:01 -0000 1.41
@@ -25,7 +25,7 @@
# package version
%define V_major 3.51
-%define V_minor 10
+%define V_minor 11
# package information
Name: myodbc
@@ -38,11 +38,10 @@
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
-Release: 20050113
+Release: 20050210
# 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
@@ -50,8 +49,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: mysql < 4.1, unixodbc
-PreReq: mysql < 4.1, unixodbc
+BuildPreReq: mysql, unixodbc
+PreReq: mysql, unixodbc
AutoReq: no
AutoReqProv: no
@@ -68,7 +67,6 @@
%prep
%setup -q -n MyODBC-%{V_major}.%{V_minor}
%patch -p0
- cp %{SOURCE strndup.c} util/
%build
CC="%{l_cc}" \
@@ -82,6 +80,7 @@
--with-unixODBC=%{l_prefix} \
--with-unixODBC-libs=%{l_prefix}/lib \
--with-unixODBC-includes=%{l_prefix}/include \
+ --disable-thread-safe \
--enable-shared \
--disable-static
%{l_make} %{l_mflags -O}
@@ .
rm -f openpkg-src/myodbc/strndup.c <<'@@ .'
Index: openpkg-src/myodbc/strndup.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
