Attachment 121403 Details for Bug 164371 – sqlite3-3.7.10.patch

[patch] sqlite3-3.7.10.patch

sqlite3-3.7.10.patch (text/plain), 4.83 KB, created by Pavel I Volkov on 2012-01-22 15:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel I Volkov

Created: 2012-01-22 15:00:25 UTC

Size: 4.83 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/Makefile /usr/ports/databases/sqlite3/Makefile
>--- /usr/ports/databases/sqlite3.orig/Makefile	2012-01-22 15:09:03.000000000 +0400
>+++ /usr/ports/databases/sqlite3/Makefile	2012-01-22 17:27:01.000000000 +0400
>@@ -6,11 +6,10 @@
> #
> 
> PORTNAME=	sqlite3
>-PORTVERSION=	3.7.9
>-PORTREVISION=	1
>+PORTVERSION=	3.7.10
> CATEGORIES=	databases
> MASTER_SITES=	http://www.sqlite.org/ http://www2.sqlite.org/
>-DISTNAME=	sqlite-src-3070900
>+DISTNAME=	sqlite-src-3071000
> 
> MAINTAINER=	pavelivolkov@googlemail.com
> COMMENT=	An SQL database engine in a C library
>@@ -46,11 +45,13 @@
> 		RAMTABLE	"Store temporary tables in RAM = ${RAMTABLE}" off \
> 		UPD_DEL_LIMIT	"ORDER BY and LIMIT on UPDATE and DELETE" off \
> 		URI		"Enable use the URI filename"		off \
>+		POWERSAFE	"Enable powersafe overwrite"		on \
> 		SOUNDEX		"Enables the soundex() SQL function"	off \
> 		METADATA	"Enable column metadata"		on \
> 		STAT3		"Help SQLite to chose a better query plan" off \
> 		DIRECT_READ	"File is read directly from disk"	off \
> 		MEMMAN		"Allows it to release unused memory"	off \
>+		MEMSTATUS	"Enable memory statistics"		on \
> 		SECURE_DELETE	"Overwrite deleted information with zeros" on \
> 		UNLOCK_NOTIFY	"Enable notification on unlocking"	on \
> 		THREADSAFE	"Build thread-safe library"		on \
>@@ -124,10 +125,35 @@
> CFLAGS+=		-DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}
> .endif
> 
>+# http://www.sqlite.org/wal.html#ckpt
>+.ifdef WAL_AUTOCHECKPOINT
>+CFLAGS+=		-DSQLITE_DEFAULT_WAL_AUTOCHECKPOINT=${WAL_AUTOCHECKPOINT}
>+.endif
>+
>+.ifdef SCHEMA_RETRY
>+CFLAGS+=		-DSQLITE_MAX_SCHEMA_RETRY=${SCHEMA_RETRY}
>+.endif
>+
>+# http://www.sqlite.org/psow.html
>+.if defined(WITH_POWERSAFE)
>+# SQLite to assume that application-level writes cannot changes bytes outside the range
>+# of bytes written even if the write occurs just before a power loss.
>+CFLAGS+=		-DSQLITE_POWERSAFE_OVERWRITE=1
>+.else
>+# SQLite assumes that other bytes in the same sector with a written byte might be changed
>+# or damaged by a power loss.
>+CFLAGS+=		-DSQLITE_POWERSAFE_OVERWRITE=0
>+.endif
>+
> .if defined(WITH_MEMMAN)
> CFLAGS+=		-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
> .endif
> 
>+# Disable memory statistics.
>+.if defined(WITHOUT_MEMSTATUS)
>+CFLAGS+=		-DSQLITE_DEFAULT_MEMSTATUS=0
>+.endif
>+
> .if defined(WITH_UPD_DEL_LIMIT)
> CFLAGS+=		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
> .endif
>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/distinfo /usr/ports/databases/sqlite3/distinfo
>--- /usr/ports/databases/sqlite3.orig/distinfo	2012-01-22 15:09:03.000000000 +0400
>+++ /usr/ports/databases/sqlite3/distinfo	2012-01-22 15:13:08.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (sqlite-src-3070900.zip) = 6ebffe166267fb783056a4200d7500289cc366ca287c9b3457dbd46a26d704d0
>-SIZE (sqlite-src-3070900.zip) = 4639586
>+SHA256 (sqlite-src-3071000.zip) = e976196a9c64bd152917760a134834a881c9eebc34f49125102a8918c5cd86a4
>+SIZE (sqlite-src-3071000.zip) = 4682084
>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/files/patch-src-mem1.c /usr/ports/databases/sqlite3/files/patch-src-mem1.c
>--- /usr/ports/databases/sqlite3.orig/files/patch-src-mem1.c	1970-01-01 03:00:00.000000000 +0300
>+++ /usr/ports/databases/sqlite3/files/patch-src-mem1.c	2012-01-22 16:46:04.000000000 +0400
>@@ -0,0 +1,11 @@
>+--- src/mem1.c.orig	2012-01-22 16:43:59.000000000 +0400
>++++ src/mem1.c	2012-01-22 16:44:42.000000000 +0400
>+@@ -59,7 +59,7 @@
>+ #define SQLITE_REALLOC(x,y) realloc((x),(y))
>+ 
>+ #ifdef HAVE_MALLOC_USABLE_SIZE
>+-#include <malloc.h>
>++#include <stdlib.h>
>+ #define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
>+ #else
>+ #undef SQLITE_MALLOCSIZE
>diff -ruN --exclude=CVS /usr/ports/databases/sqlite3.orig/files/patch-test-backup2.test /usr/ports/databases/sqlite3/files/patch-test-backup2.test
>--- /usr/ports/databases/sqlite3.orig/files/patch-test-backup2.test	2012-01-22 15:09:03.000000000 +0400
>+++ /usr/ports/databases/sqlite3/files/patch-test-backup2.test	2012-01-22 16:32:20.000000000 +0400
>@@ -1,11 +1,11 @@
>---- test/backup2.test.orig	2010-12-09 13:44:49.000000000 +0300
>-+++ test/backup2.test	2010-12-09 13:45:39.000000000 +0300
>-@@ -155,7 +155,7 @@
>-     file mkdir bu3.db
>-     set rc [catch {db restore temp bu3.db} res]
>-     lappend rc $res
>--  } {1 {cannot open source database: disk I/O error}}
>-+  } {1 {restore failed: file is encrypted or is not a database}}
>- }
>- 
>- # Try to restore from something that is not a database file.
>+--- test/backup2.test.orig	2012-01-22 16:15:22.000000000 +0400
>++++ test/backup2.test	2012-01-22 16:30:38.000000000 +0400
>+@@ -143,7 +143,7 @@
>+ #
>+ if {$tcl_platform(platform)=="windows"} {
>+   set msg {cannot open source database: unable to open database file}
>+-} elseif {$tcl_platform(os)=="OpenBSD"} {
>++} elseif {$tcl_platform(os)=="OpenBSD" || $tcl_platform(os)=="FreeBSD"} {
>+   set msg {restore failed: file is encrypted or is not a database}
>+ } else {
>+   set msg {cannot open source database: disk I/O error}

Actions: View | Diff

Attachments on bug 164371: 121403