Don't use sqlite internal functions wrt bug #227215

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 90 insertions, 9 deletions

diff --git a/dev-db/sqlitebrowser/ChangeLog b/dev-db/sqlitebrowser/ChangeLog
index 94e54340b597..8c10454270fa 100644
--- a/dev-db/sqlitebrowser/ChangeLog
+++ b/dev-db/sqlitebrowser/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/sqlitebrowser
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.5 2008/07/27 20:16:22 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/ChangeLog,v 1.6 2009/02/03 15:11:55 drizzt Exp $
+
+  03 Feb 2009; <drizzt@gentoo.org>
+  +files/sqlitebrowser-1.3-sqlite-deprecated.patch,
+  sqlitebrowser-1.3.ebuild:
+  Don't use sqlite internal functions wrt bug #227215
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> sqlitebrowser-1.3.ebuild:
   QA: Get rid of deprecated qt_min_version().
diff --git a/dev-db/sqlitebrowser/Manifest b/dev-db/sqlitebrowser/Manifest
index b035c291ac88..200440fffb65 100644
--- a/dev-db/sqlitebrowser/Manifest
+++ b/dev-db/sqlitebrowser/Manifest
@@ -1,5 +1,6 @@
 AUX sqlitebrowser-1.3-externalsqlite.patch 1452 RMD160 6899b48e6a94d65971adc003406586a5f76a52cd SHA1 41ae256f437388398c80ad5190f98918c2e653fc SHA256 0f469eef5570659f4bd92ccedd9d111b0e1b4c24a2ffc876a6a09a6475ecffdc
+AUX sqlitebrowser-1.3-sqlite-deprecated.patch 2745 RMD160 f574ae76103ad0c4b39214f34b53e827dc8cc912 SHA1 c735dc1c9df78f0a49e452d0388cb69527a8b836 SHA256 f7ba82aaedd98645622b8bdab6c6ff04dda36111b5571ae1a9d435b7c1c3902b
 DIST sqlitebrowser-1.3-src.tar.gz 563588 RMD160 884330dd595ec091f1aab885cb845dd19adeb189 SHA1 5defc7965e352bcaf8c763b76b2cfe11360b68f9 SHA256 10298d6ec7a615b856b11d89715c32ee7cd9076cfde81a3bef5e7cb0bf9d12d0
-EBUILD sqlitebrowser-1.3.ebuild 913 RMD160 37d4d3aa258e9be771ee9ae35fa07ea03945f5b1 SHA1 f1f67902a3469c4e175041149aebc27c976d5000 SHA256 80e720c66fcc8d02c2c570afeb99b97bc1e1d3753181655ce731b9b34e6eaa1c
-MISC ChangeLog 1009 RMD160 c8577cbce45956837b21ed9bf233019cd29bc3f4 SHA1 4d607d4e1c940fa7434b1d55bb568d092c345193 SHA256 7d7b9a21db48968ec9c271b176a357a3a064531b5e5744f5b67a47bb2732ddc5
+EBUILD sqlitebrowser-1.3.ebuild 909 RMD160 baa9c8aa8e7e78ef6be1bc4899185e6e6f82a225 SHA1 c459397d708e6a207e1e32ebe0053b9235f6f249 SHA256 496a652b567683305f84446ca7b81c941d02145f4447f255503394aa595230ca
+MISC ChangeLog 1180 RMD160 5cdf96bcdd9dab6d74fbc12116b92161b6fb5721 SHA1 b0ac9cb94f7bf38e02eef3ded4cc1466a31140b8 SHA256 b129c69c15ee561b090b3df5c7f835250ae14afa0943569fe15046a26bb47279
 MISC metadata.xml 614 RMD160 594074d057fe056dae2ae5fbf97cd926d5e2323d SHA1 19ce6ed83bc4ae5e358077f01af7caa309597c1d SHA256 d74930fd6877278736c1692a0cfd70bf9ff1918fe0a9762505d52f7026a85283
diff --git a/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch
new file mode 100644
index 000000000000..567db7b77d8a
--- /dev/null
+++ b/dev-db/sqlitebrowser/files/sqlitebrowser-1.3-sqlite-deprecated.patch
@@ -0,0 +1,76 @@
+Common subdirectories: sqlitebrowser.orig/.moc and sqlitebrowser/.moc
+Common subdirectories: sqlitebrowser.orig/.obj and sqlitebrowser/.obj
+Common subdirectories: sqlitebrowser.orig/.ui and sqlitebrowser/.ui
+Common subdirectories: sqlitebrowser.orig/CVS and sqlitebrowser/CVS
+Common subdirectories: sqlitebrowser.orig/images and sqlitebrowser/images
+diff -u sqlitebrowser.orig/sqlbrowser_util.c sqlitebrowser/sqlbrowser_util.c
+--- sqlitebrowser.orig/sqlbrowser_util.c	2009-02-03 11:34:57.000000000 +0100
++++ sqlitebrowser/sqlbrowser_util.c	2009-02-03 11:46:25.000000000 +0100
+@@ -3,7 +3,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-
++#include <stdint.h>
+ 
+ /*following routines extracted from shell.c for dump support*/
+ 
+@@ -23,6 +23,40 @@
+ #define ArraySize(X)  (sizeof(X)/sizeof(X[0]))
+ 
+ /*
++** Return TRUE if z is a pure numeric string.  Return FALSE if the
++** string contains any character which is not part of a number. If
++** the string is numeric and contains the '.' character, set *realnum
++** to TRUE (otherwise FALSE).
++**
++** An empty string is considered non-numeric.
++*/
++static int _isNumber(const char *z, int *realnum, uint8_t enc){
++  int incr = (enc==SQLITE_UTF8?1:2);
++  if( enc==SQLITE_UTF16BE ) z++;
++  if( *z=='-' || *z=='+' ) z += incr;
++  if( !isdigit(*(uint8_t*)z) ){
++    return 0;
++  }
++  z += incr;
++  if( realnum ) *realnum = 0;
++  while( isdigit(*(uint8_t*)z) ){ z += incr; }
++  if( *z=='.' ){
++    z += incr;
++    if( !isdigit(*(uint8_t*)z) ) return 0;
++    while( isdigit(*(uint8_t*)z) ){ z += incr; }
++    if( realnum ) *realnum = 1;
++  }
++  if( *z=='e' || *z=='E' ){
++    z += incr;
++    if( *z=='+' || *z=='-' ) z += incr;
++    if( !isdigit(*(uint8_t*)z) ) return 0;
++    while( isdigit(*(uint8_t*)z) ){ z += incr; }
++    if( realnum ) *realnum = 1;
++  }
++  return *z==0;
++}
++
++/*
+ ** Output the given string as a quoted string using SQL quoting conventions.
+ */
+ static void output_quoted_string(FILE *out, const char *z){
+@@ -192,7 +226,7 @@
+         char *zSep = i>0 ? ",": "";
+         if( azArg[i]==0 ){
+           fprintf(p->out,"%sNULL",zSep);
+-        }else if( sqlite3IsNumber(azArg[i], NULL, SQLITE_UTF8) ){
++        }else if( _isNumber(azArg[i], NULL, SQLITE_UTF8) ){
+           fprintf(p->out,"%s%s",zSep, azArg[i]);
+         }else{
+           if( zSep[0] ) fprintf(p->out,"%s",zSep);
+@@ -350,7 +384,7 @@
+ static int _is_command_terminator(const char *zLine){
+   while( isspace(*zLine) ){ zLine++; };
+   if( zLine[0]=='/' && _all_whitespace(&zLine[1]) ) return 1;  /* Oracle */
+-  if( sqlite3StrNICmp(zLine,"go",2)==0 && _all_whitespace(&zLine[2]) ){
++  if( strncasecmp(zLine,"go",2)==0 && _all_whitespace(&zLine[2]) ){
+     return 1;  /* SQL Server */
+   }
+   return 0;
diff --git a/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild b/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
index ee8c89be03c9..891a8b027b66 100644
--- a/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
+++ b/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild,v 1.5 2008/07/27 20:16:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlitebrowser/sqlitebrowser-1.3.ebuild,v 1.6 2009/02/03 15:11:55 drizzt Exp $
 
 EAPI=1
 
@@ -27,10 +27,9 @@ src_unpack() {
 
 	sed -i 's/\r/\n/g' *.{cpp,h}
 
-	# I hate qt designer!
-	has_version "=x11-libs/qt-3.3*" && sed -i '1s/UI version="3.2"/UI version="3.3"/'
-
 	epatch "${FILESDIR}"/${P}-externalsqlite.patch
+	# Don't use internal sqlite3 function wrt #227215
+	epatch "${FILESDIR}"/${P}-sqlite-deprecated.patch
 }
 
 src_compile() {