Attachment #121403 for bug #164371

View | Details | Raw Unified | Return to bug 164371
Collapse All | Expand All




#

PORTNAME=	sqlite3
PORTVERSION=	3.7.10
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	http://www.sqlite.org/ http://www2.sqlite.org/
DISTNAME=	sqlite-src-3071000

MAINTAINER=	pavelivolkov@googlemail.com
COMMENT=	An SQL database engine in a C library

		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 \

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

Lines 1-2 Link Here

(-)/usr/ports/databases/sqlite3/distinfo (-2 / +2 lines)
1	SHA256 (sqlite-src-3070900.zip) = 6ebffe166267fb783056a4200d7500289cc366ca287c9b3457dbd46a26d704d0	1	SHA256 (sqlite-src-3071000.zip) = e976196a9c64bd152917760a134834a881c9eebc34f49125102a8918c5cd86a4
2	SIZE (sqlite-src-3070900.zip) = 4639586	2	SIZE (sqlite-src-3071000.zip) = 4682084

Line 0 Link Here

(-)/usr/ports/databases/sqlite3/files/patch-src-mem1.c (+11 lines)
	1	--- src/mem1.c.orig 2012-01-22 16:43:59.000000000 +0400
	2	+++ src/mem1.c 2012-01-22 16:44:42.000000000 +0400
	3	@@ -59,7 +59,7 @@
	4	#define SQLITE_REALLOC(x,y) realloc((x),(y))
	5
	6	#ifdef HAVE_MALLOC_USABLE_SIZE
	7	-#include <malloc.h>
	8	+#include <stdlib.h>
	9	#define SQLITE_MALLOCSIZE(x) malloc_usable_size(x)
	10	#else
	11	#undef SQLITE_MALLOCSIZE

Lines 1-11 Link Here

(-)/usr/ports/databases/sqlite3/files/patch-test-backup2.test (-11 / +11 lines)
1	--- test/backup2.test.orig 2010-12-09 13:44:49.000000000 +0300	1	--- test/backup2.test.orig 2012-01-22 16:15:22.000000000 +0400
2	+++ test/backup2.test 2010-12-09 13:45:39.000000000 +0300	2	+++ test/backup2.test 2012-01-22 16:30:38.000000000 +0400
3	@@ -155,7 +155,7 @@	3	@@ -143,7 +143,7 @@
4	file mkdir bu3.db	4	#
5	set rc [catch {db restore temp bu3.db} res]	5	if {$tcl_platform(platform)=="windows"} {
6	lappend rc $res	6	set msg {cannot open source database: unable to open database file}
7	- } {1 {cannot open source database: disk I/O error}}	7	-} elseif {$tcl_platform(os)=="OpenBSD"} {
8	+ } {1 {restore failed: file is encrypted or is not a database}}	8	+} elseif {$tcl_platform(os)=="OpenBSD" \|\| $tcl_platform(os)=="FreeBSD"} {
9	}	9	set msg {restore failed: file is encrypted or is not a database}
10		10	} else {
11	# Try to restore from something that is not a database file.	11	set msg {cannot open source database: disk I/O error}

Return to bug 164371

Lines 6-16 Link Here

(-)/usr/ports/databases/sqlite3/Makefile (-3 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= sqlite3	8	PORTNAME= sqlite3
9	PORTVERSION= 3.7.9	9	PORTVERSION= 3.7.10
10	PORTREVISION= 1
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/	11	MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/
13	DISTNAME= sqlite-src-3070900	12	DISTNAME= sqlite-src-3071000
14		13
15	MAINTAINER= pavelivolkov@googlemail.com	14	MAINTAINER= pavelivolkov@googlemail.com
16	COMMENT= An SQL database engine in a C library	15	COMMENT= An SQL database engine in a C library
Lines 46-56 Link Here
46	RAMTABLE "Store temporary tables in RAM = ${RAMTABLE}" off \	45	RAMTABLE "Store temporary tables in RAM = ${RAMTABLE}" off \
47	UPD_DEL_LIMIT "ORDER BY and LIMIT on UPDATE and DELETE" off \	46	UPD_DEL_LIMIT "ORDER BY and LIMIT on UPDATE and DELETE" off \
48	URI "Enable use the URI filename" off \	47	URI "Enable use the URI filename" off \
		48	POWERSAFE "Enable powersafe overwrite" on \
49	SOUNDEX "Enables the soundex() SQL function" off \	49	SOUNDEX "Enables the soundex() SQL function" off \
50	METADATA "Enable column metadata" on \	50	METADATA "Enable column metadata" on \
51	STAT3 "Help SQLite to chose a better query plan" off \	51	STAT3 "Help SQLite to chose a better query plan" off \
52	DIRECT_READ "File is read directly from disk" off \	52	DIRECT_READ "File is read directly from disk" off \
53	MEMMAN "Allows it to release unused memory" off \	53	MEMMAN "Allows it to release unused memory" off \
		54	MEMSTATUS "Enable memory statistics" on \
54	SECURE_DELETE "Overwrite deleted information with zeros" on \	55	SECURE_DELETE "Overwrite deleted information with zeros" on \
55	UNLOCK_NOTIFY "Enable notification on unlocking" on \	56	UNLOCK_NOTIFY "Enable notification on unlocking" on \
56	THREADSAFE "Build thread-safe library" on \	57	THREADSAFE "Build thread-safe library" on \
Lines 124-133 Link Here
124	CFLAGS+= -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}	125	CFLAGS+= -DSQLITE_DEFAULT_TEMP_CACHE_SIZE=${TEMP_CACHE_SIZE}
125	.endif	126	.endif
126		127
		128	# http://www.sqlite.org/wal.html#ckpt
		129	.ifdef WAL_AUTOCHECKPOINT
		130	CFLAGS+= -DSQLITE_DEFAULT_WAL_AUTOCHECKPOINT=${WAL_AUTOCHECKPOINT}
		131	.endif
		132
		133	.ifdef SCHEMA_RETRY
		134	CFLAGS+= -DSQLITE_MAX_SCHEMA_RETRY=${SCHEMA_RETRY}
		135	.endif
		136
		137	# http://www.sqlite.org/psow.html
		138	.if defined(WITH_POWERSAFE)
		139	# SQLite to assume that application-level writes cannot changes bytes outside the range
		140	# of bytes written even if the write occurs just before a power loss.
		141	CFLAGS+= -DSQLITE_POWERSAFE_OVERWRITE=1
		142	.else
		143	# SQLite assumes that other bytes in the same sector with a written byte might be changed
		144	# or damaged by a power loss.
		145	CFLAGS+= -DSQLITE_POWERSAFE_OVERWRITE=0
		146	.endif
		147
127	.if defined(WITH_MEMMAN)	148	.if defined(WITH_MEMMAN)
128	CFLAGS+= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1	149	CFLAGS+= -DSQLITE_ENABLE_MEMORY_MANAGEMENT=1
129	.endif	150	.endif
130		151
		152	# Disable memory statistics.
		153	.if defined(WITHOUT_MEMSTATUS)
		154	CFLAGS+= -DSQLITE_DEFAULT_MEMSTATUS=0
		155	.endif
		156
131	.if defined(WITH_UPD_DEL_LIMIT)	157	.if defined(WITH_UPD_DEL_LIMIT)
132	CFLAGS+= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1	158	CFLAGS+= -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1
133	.endif	159	.endif