From owner-freebsd-gecko@FreeBSD.ORG Mon Jan 28 19:20:00 2013 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E563A4AB for ; Mon, 28 Jan 2013 19:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id C80C3674; Mon, 28 Jan 2013 19:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r0SJK07H027438; Mon, 28 Jan 2013 19:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r0SJK0e2027433; Mon, 28 Jan 2013 19:20:00 GMT (envelope-from gnats) Resent-Date: Mon, 28 Jan 2013 19:20:00 GMT Resent-Message-Id: <201301281920.r0SJK0e2027433@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: gecko@freebsd.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jan Beich Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 6967A437 for ; Mon, 28 Jan 2013 19:16:06 +0000 (UTC) (envelope-from jbeich@tormail.org) Received: from outgoing.tormail.org (outgoing.tormail.org [82.221.96.22]) by mx1.freebsd.org (Postfix) with ESMTP id 08B2964B for ; Mon, 28 Jan 2013 19:16:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=internal.tormail.org) by outgoing.tormail.org with esmtp (Exim 4.72) (envelope-from ) id 1TzuBQ-0002qd-8v for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Jan 2013 22:15:57 +0300 Received: from jbeich by internal.tormail.org with local (Exim 4.63) (envelope-from ) id 1Tzu8z-000HFS-05 for FreeBSD-gnats-submit@freebsd.org; Mon, 28 Jan 2013 19:13:28 +0000 Message-Id: <1Tzu8z-000HFS-05@internal.tormail.org> Date: Mon, 28 Jan 2013 16:11:07 -0300 From: Jan Beich To: FreeBSD-gnats-submit@freebsd.org X-GNATS-Notify: gecko@freebsd.org Subject: ports/175656: [patch] databases/sqlite3: update to 3.7.15.2 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 19:20:01 -0000 >Number: 175656 >Category: ports >Synopsis: [patch] databases/sqlite3: update to 3.7.15.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jan 28 19:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Jan Beich >Release: FreeBSD 10.0-CURRENT amd64 >Organization: >Environment: seperficial testing with firefox-nightly and subversion >Description: sqlite-3.7.15.X brings us SQLITE_FCNTL_TEMPFILENAME which is currently required for upcoming nss-3.14.2 [1] and an option to use SQLITE_CONFIG_SQLLOG [2] among other things [3]. [1] https://mxr.mozilla.org/security/ident?i=SQLITE_FCNTL_TEMPFILENAME [2] https://www.sqlite.org/cgi/src/info/f0843f885a [3] https://www.sqlite.org/releaselog/3_7_15.html >How-To-Repeat: $ make # nss-3.14.2 [...] sdb.c:266:44: error: use of undeclared identifier 'SQLITE_FCNTL_TEMPFILENAME' sqlrv = sqlite3_file_control(sqlDB, 0, SQLITE_FCNTL_TEMPFILENAME, ^ 1 error generated. >Fix: --- update.diff begins here --- Index: databases/sqlite3/Makefile =================================================================== --- databases/sqlite3/Makefile (revision 310604) +++ databases/sqlite3/Makefile (working copy) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= sqlite3 -PORTVERSION= 3.7.14.1 +PORTVERSION= 3.7.15.2 CATEGORIES= databases MASTER_SITES= http://www.sqlite.org/ http://www2.sqlite.org/ http://www3.sqlite.org/ -DISTNAME= sqlite-autoconf-3071401 +DISTNAME= sqlite-autoconf-3071502 MAINTAINER= pavelivolkov@gmail.com COMMENT= An SQL database engine in a C library @@ -38,6 +38,7 @@ OPTIONS= \ MEMMAN "Allows it to release unused memory" off \ SECURE_DELETE "Overwrite deleted information with zeros" on \ UNLOCK_NOTIFY "Enable notification on unlocking" on \ + SQLLOG "Allow logging operations" off \ THREADSAFE "Build thread-safe library" on \ EXTENSION "Allow loadable extensions" on \ @@ -137,6 +138,10 @@ CPPFLAGS+= -DSQLITE_ENABLE_UNLOCK_NOTIFY=1 CPPFLAGS+= -DSQLITE_ENABLE_COLUMN_METADATA=1 .endif +.if !defined(WITHOUT_SQLLOG) +CPPFLAGS+= -DSQLITE_ENABLE_SQLLOG=1 +.endif + .if !defined(WITHOUT_THREADSAFE) CONFIGURE_ARGS+= --enable-threadsafe LDFLAGS+= ${PTHREAD_LIBS} @@ -152,6 +157,10 @@ CONFIGURE_ARGS+= --disable-dynamic-extensions .include +post-patch: + @${REINPLACE_CMD} '/^pkgconf/s,$${libdir},$${prefix}/libdata,' \ + ${WRKSRC}/Makefile.in + post-install: .if !defined(NO_INSTALL_MANPAGES) @${INSTALL_MAN} ${WRKSRC}/sqlite3.1 ${MANPREFIX}/man/man1 Index: databases/sqlite3/distinfo =================================================================== --- databases/sqlite3/distinfo (revision 310604) +++ databases/sqlite3/distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (sqlite-autoconf-3071401.tar.gz) = d46d302a63b23d9c3b80e519be12cb7d6a8d3da57bd9c119341a0aa8b3b28692 -SIZE (sqlite-autoconf-3071401.tar.gz) = 1832051 +SHA256 (sqlite-autoconf-3071502.tar.gz) = 782d16b797f6ca879f6f679ba3fb6ceb54bcb0cab65feef332058bf04b36ba8c +SIZE (sqlite-autoconf-3071502.tar.gz) = 1846778 Index: databases/sqlite3/files/patch-Makefile.in =================================================================== --- databases/sqlite3/files/patch-Makefile.in (revision 310604) +++ databases/sqlite3/files/patch-Makefile.in (working copy) @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2012-05-25 09:51:37.000000000 +0400 -+++ ./Makefile.in 2012-05-25 09:52:43.000000000 +0400 -@@ -243,7 +243,7 @@ - sqlite3_DEPENDENCIES = $(top_builddir)/libsqlite3.la - include_HEADERS = sqlite3.h sqlite3ext.h - EXTRA_DIST = sqlite3.pc sqlite3.1 tea --pkgconfigdir = ${libdir}/pkgconfig -+pkgconfigdir = ${prefix}/libdata/pkgconfig - pkgconfig_DATA = sqlite3.pc - man_MANS = sqlite3.1 - all: all-am --- update.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: