Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/database
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16548
Modified Files:
sqlite3.info sqlite3.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: sqlite3.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/database/sqlite3.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sqlite3.patch 11 Jul 2011 04:08:30 -0000 1.1
+++ sqlite3.patch 19 Jun 2013 22:55:37 -0000 1.2
@@ -1,97 +1,21 @@
-diff -urN sqlite-3.6.9.old/tool/lemon.c sqlite-3.6.9/tool/lemon.c
---- sqlite-3.6.9.old/tool/lemon.c 2009-01-08 10:46:00.000000000 -0600
-+++ sqlite-3.6.9/tool/lemon.c 2009-01-23 16:55:55.000000000 -0600
-@@ -1325,15 +1325,15 @@
- va_start(ap, format);
- /* Prepare a prefix to be prepended to every output line */
- if( lineno>0 ){
-- sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
-+ snprintf(prefix, sizeof prefix,"%.*s:%d:
",PREFIXLIMIT-10,filename,lineno);
- }else{
-- sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename);
-+ snprintf(prefix, sizeof prefix, "%.*s: ",PREFIXLIMIT-10,filename);
- }
- prefixsize = lemonStrlen(prefix);
- availablewidth = LINEWIDTH - prefixsize;
-
- /* Generate the error message */
-- vsprintf(errmsg,format,ap);
-+ vsnprintf(errmsg, sizeof errmsg, format,ap);
- va_end(ap);
- errmsgsize = lemonStrlen(errmsg);
- /* Remove trailing '\n's from the error message. */
-@@ -2350,7 +2350,7 @@
- for(z=psp->filename, nBack=0; *z; z++){
- if( *z=='\\' ) nBack++;
- }
-- sprintf(zLine, "#line %d ", psp->tokenlineno);
-+ snprintf(zLine, sizeof zLine, "#line %d ", psp->tokenlineno);
- nLine = lemonStrlen(zLine);
- n += nLine + lemonStrlen(psp->filename) + nBack;
- }
-@@ -2915,7 +2915,7 @@
- while( cfp ){
- char buf[20];
- if( cfp->dot==cfp->rp->nrhs ){
-- sprintf(buf,"(%d)",cfp->rp->index);
-+ snprintf(buf, sizeof buf, "(%d)",cfp->rp->index);
- fprintf(fp," %5s ",buf);
- }else{
- fprintf(fp," ");
-@@ -2981,7 +2981,7 @@
- c = *cp;
- *cp = 0;
- path = (char *)malloc( lemonStrlen(argv0) + lemonStrlen(name) + 2 );
-- if( path ) sprintf(path,"%s/%s",argv0,name);
-+ if( path ) snprintf(path, sizeof path, "%s/%s",argv0,name);
- *cp = c;
- }else{
- extern char *getenv();
-@@ -2994,7 +2994,7 @@
- if( cp==0 ) cp = &pathlist[lemonStrlen(pathlist)];
- c = *cp;
- *cp = 0;
-- sprintf(path,"%s/%s",pathlist,name);
-+ snprintf(path, sizeof path, "%s/%s",pathlist,name);
- *cp = c;
- if( c==0 ) pathlist = "";
- else pathlist = &cp[1];
-@@ -3074,9 +3074,9 @@
+--- sqlite-3.7.16-orig/sqlite3.c 2013-06-19 14:47:01.000000000 -0700
++++ sqlite-3.7.16/sqlite3.c 2013-06-19 14:54:29.000000000 -0700
+@@ -15671,6 +15671,18 @@
+ return ROUND8(n);
+ }
- cp = strrchr(lemp->filename,'.');
- if( cp ){
-- sprintf(buf,"%.*s.lt",(int)(cp-lemp->filename),lemp->filename);
-+ snprintf(buf, sizeof buf,
"%.*s.lt",(int)(cp-lemp->filename),lemp->filename);
- }else{
-- sprintf(buf,"%s.lt",lemp->filename);
-+ snprintf(buf, sizeof buf, "%s.lt",lemp->filename);
- }
- if( access(buf,004)==0 ){
- tpltname = buf;
-@@ -3236,7 +3236,7 @@
- while( n-- > 0 ){
- c = *(zText++);
- if( c=='%' && n>0 && zText[0]=='d' ){
-- sprintf(zInt, "%d", p1);
-+ snprintf(zInt, sizeof zInt, "%d", p1);
- p1 = p2;
- strcpy(&z[used], zInt);
- used += lemonStrlen(&z[used]);
-@@ -3830,7 +3830,7 @@
- /* Generate a table containing the symbolic name of every symbol
- */
- for(i=0; i<lemp->nsymbol; i++){
-- sprintf(line,"\"%s\",",lemp->symbols[i]->name);
-+ snprintf(line, sizeof line, "\"%s\",",lemp->symbols[i]->name);
- fprintf(out," %-15s",line);
- if( (i&3)==3 ){ fprintf(out,"\n"); lineno++; }
- }
-@@ -3986,7 +3986,7 @@
- in = file_open(lemp,".h","rb");
- if( in ){
- for(i=1; i<lemp->nterminal && fgets(line,LINESIZE,in); i++){
-- sprintf(pattern,"#define %s%-30s
%2d\n",prefix,lemp->symbols[i]->name,i);
-+ snprintf(pattern, sizeof pattern, "#define %s%-30s
%2d\n",prefix,lemp->symbols[i]->name,i);
- if( strcmp(line,pattern) ) break;
- }
- fclose(in);
++
++// this libkern function appeared with OS X 10.5
++static
++bool
++OSAtomicCompareAndSwapPtrBarrier(
++ void *__oldValue, void *__newValue, void * volatile *__theValue ) {
++ // wrap by casting
++ // assert(sizeof(int32_t) == sizeof(void*));
++ return OSAtomicCompareAndSwap32Barrier((int32_t)__oldValue,
++ (int32_t)__newValue, (volatile int32_t*)__theValue);
++}
++
+ /*
+ ** Initialize this module.
+ */
Index: sqlite3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/database/sqlite3.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sqlite3.info 10 Feb 2012 00:49:18 -0000 1.3
+++ sqlite3.info 19 Jun 2013 22:55:37 -0000 1.4
@@ -1,8 +1,8 @@
Info2: <<
Package: sqlite3
-Version: 3.7.9
+Version: 3.7.16.1
# Upstream is using 3XXYYZZ as version in tarballs instead of 3.X.Y.Z.
-Type: vers (3070900)
+Type: vers (3071601)
Revision: 1
Description: Embedded SQL database, version 3
@@ -28,8 +28,10 @@
DocFiles: README LICENSE
-Source: http://sqlite.org/sqlite-autoconf-%type_raw[vers].tar.gz
-Source-MD5: dce303524736fe89a76b8ed29d566352
+Source: http://sqlite.org/2013/sqlite-autoconf-%type_raw[vers].tar.gz
+Source-MD5: 8860d1a1ed26d40f07e3c7ae035b644a
+PatchFile: %n.patch
+PatchFile-MD5: aa399ba82d1a3c02205cd6fd0fd28681
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
