On 2009/12/18 22:36, Christian Weisgerber wrote:
> I would like to update www/firefox35 to 3.5.6 for the latest round
> of security fixes. There's nothing to it, version number and
> distinfo update. *Except* that it wants sqlite 3.6.16.1 or better
> and our sqlite port is at 3.6.16. I can't find a distfile for
> 3.6.16.1 and sthen@ says 3.6.17 and later require Tcl for building,
> which needs careful examination, so updating databases/sqlite3 will
> be its own effort.
>
> So, update firefox35 to 3.5.6 and switch to its included sqlite,
> or wait until databases/sqlite3 is updated?
>
> (And, yes, apparently there was a notable bug fix after sqlite
> 3.6.16.)
Here's the diff picked out of their fossil repository, with a
hand-patch to the configure script (we either need to do this,
or switch to CONFIGURE_STYLE=autoconf; this is simpler).
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/sqlite3/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile 3 Aug 2009 09:55:47 -0000 1.47
+++ Makefile 18 Dec 2009 22:22:23 -0000
@@ -5,9 +5,9 @@ COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
V= 3.6.16
DISTNAME= sqlite-${V}
-PKGNAME-main= sqlite3-${V}
-PKGNAME-tcl= sqlite3-tcl-${V}
-PKGNAME-lemon= lemon-${V}
+PKGNAME-main= sqlite3-${V}.1
+PKGNAME-tcl= sqlite3-tcl-${V}.1
+PKGNAME-lemon= lemon-${V}.1
CATEGORIES= databases
SHARED_LIBS += sqlite3 13.3 # .8.6
SHARED_LIBS += tclsqlite3 12.3 # .8.6
Index: patches/patch-VERSION
===================================================================
RCS file: patches/patch-VERSION
diff -N patches/patch-VERSION
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-VERSION 18 Dec 2009 22:22:23 -0000
@@ -0,0 +1,6 @@
+$OpenBSD$
+--- VERSION.orig Fri Dec 18 22:05:03 2009
++++ VERSION Fri Dec 18 22:05:04 2009
+@@ -1 +1 @@
+-3.6.16
++3.6.16.1
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 22 Apr 2009 21:23:43 -0000 1.7
+++ patches/patch-configure 18 Dec 2009 22:22:23 -0000
@@ -1,6 +1,17 @@
$OpenBSD: patch-configure,v 1.7 2009/04/22 21:23:43 martynas Exp $
---- configure.orig Mon Apr 13 12:09:25 2009
-+++ configure Thu Apr 16 23:11:23 2009
+--- configure.orig Thu Jun 25 12:45:57 2009
++++ configure Fri Dec 18 22:16:44 2009
+@@ -743,8 +743,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
+ # Identity of this package.
+ PACKAGE_NAME='sqlite'
+ PACKAGE_TARNAME='sqlite'
+-PACKAGE_VERSION='3.6.16'
+-PACKAGE_STRING='sqlite 3.6.16'
++PACKAGE_VERSION='3.6.16.1'
++PACKAGE_STRING='sqlite 3.6.16.1'
+ PACKAGE_BUGREPORT=''
+
+ # Factoring default headers for most tests.
@@ -12259,7 +12259,7 @@ USE_AMALGAMATION=1
# if not, then we fall back to plain tclsh.
# TODO: try other versions before falling back?
Index: patches/patch-src_expr_c
===================================================================
RCS file: patches/patch-src_expr_c
diff -N patches/patch-src_expr_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_expr_c 18 Dec 2009 22:22:23 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/expr.c.orig Fri Dec 18 22:05:11 2009
++++ src/expr.c Fri Dec 18 22:05:22 2009
+@@ -1672,7 +1672,7 @@ void sqlite3CodeSubselect(
+ if( sqlite3Select(pParse, pSel, &dest) ){
+ return;
+ }
+- pExpr->iColumn = (i16)dest.iParm;
++ pExpr->iColumn = dest.iParm;
+ ExprSetIrreducible(pExpr);
+ break;
+ }
Index: patches/patch-src_sqliteInt_h
===================================================================
RCS file: /cvs/ports/databases/sqlite3/patches/patch-src_sqliteInt_h,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_sqliteInt_h
--- patches/patch-src_sqliteInt_h 3 Aug 2009 09:55:47 -0000 1.5
+++ patches/patch-src_sqliteInt_h 18 Dec 2009 22:22:23 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.5 2009/08/03 09:55:47 sthen Exp $
--- src/sqliteInt.h.orig Fri Jun 26 16:14:55 2009
-+++ src/sqliteInt.h Sun Jun 28 14:40:40 2009
++++ src/sqliteInt.h Fri Dec 18 22:05:53 2009
@@ -35,11 +35,6 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@@ -59,3 +59,12 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.5 20
/*
** Round up a number to the next larger multiple of 8. This is used
+@@ -1511,7 +1499,7 @@ struct Expr {
+
+ int iTable; /* TK_COLUMN: cursor number of table holding column
+ ** TK_REGISTER: register number */
+- i16 iColumn; /* TK_COLUMN: column index. -1 for rowid */
++ int iColumn; /* TK_COLUMN: column index. -1 for rowid */
+ i16 iAgg; /* Which entry in pAggInfo->aCol[] or ->aFunc[] */
+ i16 iRightJoinTable; /* If EP_FromJoin, the right table of the join */
+ u16 flags2; /* Second set of flags. EP2_... */
