Hello community, here is the log from the commit of package xbsql checked in at Fri Feb 29 23:50:30 CET 2008. -------- --- xbsql/xbsql.changes 2007-11-09 11:46:57.000000000 +0100 +++ xbsql/xbsql.changes 2008-02-29 21:14:04.190014000 +0100 @@ -1,0 +2,5 @@ +Fri Feb 29 21:14:32 CET 2008 - coolo@suse.de + +- fix build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xbsql.spec ++++++ --- /var/tmp/diff_new_pack.a20880/_old 2008-02-29 23:49:48.000000000 +0100 +++ /var/tmp/diff_new_pack.a20880/_new 2008-02-29 23:49:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xbsql (Version 0.11) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,14 +10,15 @@ # norootforbuild + Name: xbsql -BuildRequires: bison gcc-c++ ncurses-devel readline-devel xbase-devel +BuildRequires: bison flex gcc-c++ ncurses-devel readline-devel xbase-devel License: LGPL v2.1 or later Group: Development/Libraries/C and C++ Summary: SQL Wrapper for the XBase Library Url: http://www.quaking.demon.co.uk/xbsql.html Version: 0.11 -Release: 187 +Release: 189 Source0: %name-%version.tar.bz2 Patch0: %name.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +47,8 @@ --libdir=%{_libdir} \ --mandir=/usr/share/man/ \ --sysconfdir=/etc/ +rm xbsql/lex.yy.c +make -C xbsql lex.yy.c make cd test make @@ -59,11 +62,9 @@ # mv $RPM_BUILD_ROOT/usr/bin/xql $RPM_BUILD_ROOT/usr/bin/XQL -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %clean rm -rf ${RPM_BUILD_ROOT} @@ -74,25 +75,28 @@ /usr/bin/* /usr/include/* %_libdir/libxbsql* + %changelog -* Fri Nov 09 2007 - lmichnovic@suse.cz +* Fri Feb 29 2008 coolo@suse.de +- fix build +* Fri Nov 09 2007 lmichnovic@suse.cz - added xbase-devel to BuildReq due to package split-off -* Thu Mar 29 2007 - stbinner@suse.de +* Thu Mar 29 2007 stbinner@suse.de - add bison and ncurses-devel to buildrequires -* Sun Sep 10 2006 - dmueller@suse.de +* Sun Sep 10 2006 dmueller@suse.de - use RPM_OPT_FLAGS -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Oct 12 2005 - dmueller@suse.de +* Wed Oct 12 2005 dmueller@suse.de - fix build -* Thu Nov 11 2004 - coolo@suse.de +* Thu Nov 11 2004 coolo@suse.de - fix file list for debug package -* Mon Nov 24 2003 - ro@suse.de +* Mon Nov 24 2003 ro@suse.de - fix typo in specfile -* Sun Nov 23 2003 - adrian@suse.de +* Sun Nov 23 2003 adrian@suse.de - solve file conflict with perl-XML-XQL ( /usr/bin/xql -> /usr/bin/XQL ) -* Wed Nov 19 2003 - adrian@suse.de +* Wed Nov 19 2003 adrian@suse.de - fix for lib64 -* Tue Nov 18 2003 - adrian@suse.de +* Tue Nov 18 2003 adrian@suse.de - initial package of version 0.11 ++++++ xbsql.diff ++++++ --- /var/tmp/diff_new_pack.a20880/_old 2008-02-29 23:49:48.000000000 +0100 +++ /var/tmp/diff_new_pack.a20880/_new 2008-02-29 23:49:48.000000000 +0100 @@ -73,3 +73,102 @@ w[f] = 100 ; } +--- xbsql/xbsql.l 2002-10-16 20:19:23.000000000 +0000 ++++ xbsql/xbsql.l 2008-02-29 20:00:33.000000000 +0000 +@@ -10,7 +10,7 @@ + %% + + \' { +- string ('\'') ; ++ tstring ('\'') ; + return T_STRING ; + } + +@@ -116,7 +116,7 @@ + #define HASHMSK (HASHSIZ-1) + static KEYWORD *hashtab[HASHSIZ] ; + +-static void string ++static void tstring + ( int qch + ) + { +--- xbsql/xbsql.y 2003-05-20 14:22:46.000000000 +0000 ++++ xbsql/xbsql.y 2008-02-29 19:57:17.000000000 +0000 +@@ -11,7 +11,7 @@ + + extern void yyerror (const char *, ...) ; + extern int yylex () ; +-static void string (int) ; ++static void tstring (int) ; + static int nextChar() ; + static int nextData(char *, int, int) ; + static char *textp ; + +--- xbsql/xb_fieldset.cpp 2003-03-28 19:07:31.000000000 +0000 ++++ xbsql/xb_fieldset.cpp 2008-02-29 20:09:30.000000000 +0000 +@@ -58,10 +58,12 @@ + if ((fldno < 0) || (fldno >= fieldSet.getNumFields())) + return XBSQL::IndexNone ; + +- char buff[255] ; +- strncpy (buff, tabname, sizeof(buff)) ; +- strncat (buff, "_", sizeof(buff)) ; +- strncat (buff, getFieldName(fldno), sizeof(buff)) ; ++ char buff[255]; ++ int bufflen = sizeof(buff); ++ strncpy (buff, tabname, bufflen) ; ++ bufflen -= strlen(tabname); ++ strncat (buff, "_", bufflen--) ; ++ strncat (buff, getFieldName(fldno), bufflen) ; + + const char *path = xbase->getPath (buff, "ndx") ; + int fd = open (path, O_RDONLY) ; +--- xbsql/xbsql.cpp 2003-03-28 19:07:31.000000000 +0000 ++++ xbsql/xbsql.cpp 2008-02-29 20:11:27.000000000 +0000 +@@ -378,7 +378,7 @@ + + strncpy (name, table, sizeof(name)) ; + strncat (name, "_", sizeof(name)) ; +- strncat (name, schema[idx].FieldName, sizeof(name)) ; ++ strncat (name, schema[idx].FieldName, sizeof(name) - strlen(table) - 1) ; + + path = getPath (name, "ndx") ; + idxflag = index[idx] == XBSQL::IndexUnique ? +@@ -465,11 +465,11 @@ + + for (int idx = 0 ; idx < fSet.getNumFields() ; idx += 1) + { +- char name[256] ; ++ char name[256]; + + strncpy (name, table, sizeof(name)) ; + strncat (name, "_", sizeof(name)) ; +- strncat (name, fSet.getFieldName (idx), sizeof(name)) ; ++ strncat (name, fSet.getFieldName (idx), sizeof(name) - strlen(table) - 1) ; + + path = getPath (name, "ndx") ; + #ifndef _WIN32 +@@ -875,10 +875,10 @@ + + strncpy (_oldName, oldName, sizeof(_oldName)) ; + strncat (_oldName, "_", sizeof(_oldName)) ; +- strncat (_oldName, fname, sizeof(_oldName)) ; ++ strncat (_oldName, fname, sizeof(_oldName) - strlen(oldName) - 1) ; + strncpy (_newName, newName, sizeof(_newName)) ; + strncat (_newName, "_", sizeof(_newName)) ; +- strncat (_newName, fname, sizeof(_newName)) ; ++ strncat (_newName, fname, sizeof(_newName) - strlen(newName) - 1) ; + + oldAnon = getPath (_oldName, "ndx") ; + newAnon = getPath (_newName, "ndx") ; +@@ -958,7 +958,7 @@ + + strncpy (_idxName, table, sizeof(_idxName)) ; + strncat (_idxName, "_", sizeof(_idxName)) ; +- strncat (_idxName, fname, sizeof(_idxName)) ; ++ strncat (_idxName, fname, sizeof(_idxName) - strlen(table) - 1) ; + + tabAnon = getPath (_idxName, "ndx") ; + + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de