From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 22 15:00:25 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2F231065672 for ; Sun, 22 Jan 2012 15:00:25 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C8AB38FC1B for ; Sun, 22 Jan 2012 15:00:25 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q0MF0PeT034271 for ; Sun, 22 Jan 2012 15:00:25 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q0MF0PoP034265; Sun, 22 Jan 2012 15:00:25 GMT (envelope-from gnats) Resent-Date: Sun, 22 Jan 2012 15:00:25 GMT Resent-Message-Id: <201201221500.q0MF0PoP034265@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pavel I Volkov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4AB21065700 for ; Sun, 22 Jan 2012 14:55:24 +0000 (UTC) (envelope-from pol@catervaska.dyndns.org) Received: from osiris.dns4soho.net (osiris.dns4soho.net [IPv6:2a01:230:2::41]) by mx1.freebsd.org (Postfix) with ESMTP id CEA418FC18 for ; Sun, 22 Jan 2012 14:55:23 +0000 (UTC) Received: from cvs0.catervaska.dyndns.org (broadband-178-140-250-47.nationalcablenetworks.ru [178.140.250.47] (may be forged)) by osiris.dns4soho.net (8.14.5/8.14.5) with ESMTP id q0MEtLkw044511 for ; Sun, 22 Jan 2012 18:55:21 +0400 (MSK) (envelope-from pol@catervaska.dyndns.org) Received: from cvs0.catervaska.dyndns.org (localhost [127.0.0.1]) by cvs0.catervaska.dyndns.org (8.14.5/8.14.5) with ESMTP id q0MEtJqO037154 for ; Sun, 22 Jan 2012 18:55:19 +0400 (MSK) (envelope-from pol@cvs0.catervaska.dyndns.org) Received: (from pol@localhost) by cvs0.catervaska.dyndns.org (8.14.5/8.14.5/Submit) id q0MEtJbC037153; Sun, 22 Jan 2012 18:55:19 +0400 (MSK) (envelope-from pol) Message-Id: <201201221455.q0MEtJbC037153@cvs0.catervaska.dyndns.org> Date: Sun, 22 Jan 2012 18:55:19 +0400 (MSK) From: Pavel I Volkov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/164371: [MAINTAINER] databases/sqlite3: update to 3.7.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2012 15:00:26 -0000 >Number: 164371 >Category: ports >Synopsis: [MAINTAINER] databases/sqlite3: update to 3.7.10 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Jan 22 15:00:25 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Pavel I Volkov >Release: FreeBSD 9.0-RC2 i386 >Organization: >Environment: System: FreeBSD cvs0.catervaska.dyndns.org 9.0-RC2 FreeBSD 9.0-RC2 #0: Sun Nov 13 14:05:56 MSK 2011 >Description: - Update to 3.7.10 Added file(s): - files/patch-src-mem1.c Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- sqlite3-3.7.10.patch begins here --- 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 ++#include + #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} --- sqlite3-3.7.10.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: