head	1.75;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.16
	OPENPKG_E1_MP:1.16
	OPENPKG_E1_MP_2_STABLE:1.12
	OPENPKG_E1_FP:1.12
	OPENPKG_2_STABLE_MP:1.24
	OPENPKG_2_STABLE_20061018:1.12
	OPENPKG_2_STABLE_20060622:1.12
	OPENPKG_2_STABLE:1.12.0.2
	OPENPKG_2_STABLE_BP:1.12
	OPENPKG_2_5_RELEASE:1.10
	OPENPKG_2_5_SOLID:1.10.0.2
	OPENPKG_2_5_SOLID_BP:1.10
	OPENPKG_2_4_RELEASE:1.6
	OPENPKG_2_4_SOLID:1.6.0.4
	OPENPKG_2_4_SOLID_BP:1.6
	OPENPKG_CW_FP:1.6
	OPENPKG_2_3_RELEASE:1.6
	OPENPKG_2_3_SOLID:1.6.0.2
	OPENPKG_2_3_SOLID_BP:1.6
	OPENPKG_2_2_RELEASE:1.5
	OPENPKG_2_2_SOLID:1.5.0.2
	OPENPKG_2_2_SOLID_BP:1.5
	OPENPKG_2_1_RELEASE:1.4
	OPENPKG_2_1_SOLID:1.4.0.2
	OPENPKG_2_1_SOLID_BP:1.4;
locks; strict;
comment	@# @;


1.75
date	2009.08.12.18.14.27;	author rse;	state Exp;
branches;
next	1.74;
commitid	saM6RsjXeBSb0rZt;

1.74
date	2009.06.28.07.43.23;	author rse;	state Exp;
branches;
next	1.73;
commitid	eBcJHZpcRefnXATt;

1.73
date	2009.06.15.17.57.17;	author rse;	state Exp;
branches;
next	1.72;
commitid	ZJXTrUXg2niTLYRt;

1.72
date	2009.06.01.08.06.14;	author rse;	state Exp;
branches;
next	1.71;
commitid	pvXVy8LO4PU0X7Qt;

1.71
date	2009.05.19.17.25.11;	author rse;	state Exp;
branches;
next	1.70;
commitid	pu7s6pnLRlDGsvOt;

1.70
date	2009.04.13.15.51.51;	author rse;	state Exp;
branches;
next	1.69;
commitid	7SPERjE2bAnp6SJt;

1.69
date	2009.03.31.18.14.15;	author rse;	state Exp;
branches;
next	1.68;
commitid	3dKxZQIaMKpajdIt;

1.68
date	2009.03.04.22.08.05;	author rse;	state Exp;
branches;
next	1.67;
commitid	gkSjXFJY8emctLEt;

1.67
date	2009.02.20.22.27.18;	author rse;	state Exp;
branches;
next	1.66;
commitid	ZVeT3mIGN1rHXdDt;

1.66
date	2009.01.17.10.45.10;	author rse;	state Exp;
branches;
next	1.65;
commitid	f0O0BB70EF7AaNyt;

1.65
date	2009.01.15.18.10.07;	author rse;	state Exp;
branches;
next	1.64;
commitid	W0XfHQWccvfdHzyt;

1.64
date	2009.01.12.16.20.28;	author rse;	state Exp;
branches;
next	1.63;
commitid	tudr4lcz4BKzbbyt;

1.63
date	2008.12.17.08.18.15;	author rse;	state Exp;
branches;
next	1.62;
commitid	aa0iYVo18WtXlNut;

1.62
date	2008.11.21.08.04.17;	author rse;	state Exp;
branches;
next	1.61;
commitid	BoYgPeSflcOY6srt;

1.61
date	2008.11.12.18.29.36;	author rse;	state Exp;
branches;
next	1.60;
commitid	LzXmjxyWwpvrRlqt;

1.60
date	2008.10.15.18.03.35;	author rse;	state Exp;
branches;
next	1.59;
commitid	pt5zTC6oc30kCKmt;

1.59
date	2008.09.23.06.23.50;	author rse;	state Exp;
branches;
next	1.58;
commitid	93YXaxMyoKD6sRjt;

1.58
date	2008.09.23.06.10.13;	author rse;	state Exp;
branches;
next	1.57;
commitid	ruoy8Skxc2crnRjt;

1.57
date	2008.08.31.08.08.21;	author rse;	state Exp;
branches;
next	1.56;
commitid	cUTpFHL7d0SNLUgt;

1.56
date	2008.08.07.07.12.54;	author rse;	state Exp;
branches;
next	1.55;
commitid	uqnb74tLMzJBePdt;

1.55
date	2008.07.17.07.35.24;	author rse;	state Exp;
branches;
next	1.54;
commitid	tcKt7dX1dM8b28bt;

1.54
date	2008.07.17.07.12.51;	author rse;	state Exp;
branches;
next	1.53;
commitid	V9hk3Pj0GUkrU7bt;

1.53
date	2008.05.15.11.37.18;	author rse;	state Exp;
branches;
next	1.52;
commitid	izM0Hx20OOQIo33t;

1.52
date	2008.05.15.11.33.54;	author rse;	state Exp;
branches;
next	1.51;
commitid	01gkpPXe0z7yn33t;

1.51
date	2008.04.17.06.28.17;	author rse;	state Exp;
branches;
next	1.50;
commitid	eYaelZJ04pmvAqZs;

1.50
date	2008.03.18.20.53.35;	author rse;	state Exp;
branches;
next	1.49;
commitid	AaLb0SRIRZg9lEVs;

1.49
date	2008.02.07.18.20.49;	author rse;	state Exp;
branches;
next	1.48;
commitid	1q0Kv19hyztsMuQs;

1.48
date	2008.02.01.22.29.34;	author rse;	state Exp;
branches;
next	1.47;
commitid	vV2xosUzp8nKlKPs;

1.47
date	2008.01.03.13.54.13;	author rse;	state Exp;
branches;
next	1.46;
commitid	PnvnK0kGb4iJqYLs;

1.46
date	2008.01.02.14.59.12;	author rse;	state Exp;
branches;
next	1.45;
commitid	lnv0vCdpxcv1PQLs;

1.45
date	2007.12.15.08.55.22;	author rse;	state Exp;
branches;
next	1.44;
commitid	7s5FudFOf0d5ovJs;

1.44
date	2007.11.28.19.15.36;	author rse;	state Exp;
branches;
next	1.43;
commitid	wO7My4dEouNJmnHs;

1.43
date	2007.11.06.07.18.00;	author rse;	state Exp;
branches;
next	1.42;
commitid	saj5jSjLvUxo6uEs;

1.42
date	2007.10.04.06.07.54;	author rse;	state Exp;
branches;
next	1.41;
commitid	OCaP3UE8JcG7MeAs;

1.41
date	2007.09.04.07.31.49;	author rse;	state Exp;
branches;
next	1.40;
commitid	nLZ4fJFrN6SGcows;

1.40
date	2007.08.24.18.01.56;	author rse;	state Exp;
branches;
next	1.39;
commitid	9eogRzLyTA4M22vs;

1.39
date	2007.08.24.17.01.16;	author rse;	state Exp;
branches;
next	1.38;
commitid	Spphb1kqe87YH1vs;

1.38
date	2007.08.14.19.28.56;	author cs;	state Exp;
branches;
next	1.37;
commitid	kDhFFfcMEOPyQKts;

1.37
date	2007.07.31.07.32.00;	author rse;	state Exp;
branches;
next	1.36;
commitid	KP0cQZblqVVukTrs;

1.36
date	2007.07.21.08.09.59;	author rse;	state Exp;
branches;
next	1.35;
commitid	ivSv3bcHZCltRBqs;

1.35
date	2007.07.21.07.42.21;	author rse;	state Exp;
branches;
next	1.34;
commitid	NxYbCym7TmkZHBqs;

1.34
date	2007.07.17.10.50.51;	author rse;	state Exp;
branches;
next	1.33;
commitid	pS66IUWseh8DS6qs;

1.33
date	2007.06.20.16.12.31;	author rse;	state Exp;
branches;
next	1.32;
commitid	pkEKZmRMGcdNwFms;

1.32
date	2007.06.20.12.48.34;	author rse;	state Exp;
branches;
next	1.31;
commitid	Efg3imKpw9wOoEms;

1.31
date	2007.06.18.17.25.19;	author rse;	state Exp;
branches;
next	1.30;
commitid	dPbnBn89uSzKZpms;

1.30
date	2007.06.03.09.41.58;	author rse;	state Exp;
branches;
next	1.29;
commitid	IHJvNoZa6GcGUrks;

1.29
date	2007.04.25.15.22.11;	author cs;	state Exp;
branches;
next	1.28;
commitid	A5y9MJMplQy73tfs;

1.28
date	2007.04.19.06.34.00;	author rse;	state Exp;
branches;
next	1.27;
commitid	PmxrHdINufBSjEes;

1.27
date	2007.04.09.17.01.30;	author cs;	state Exp;
branches;
next	1.26;
commitid	mzHdfxlIpYt47qds;

1.26
date	2007.04.03.08.39.06;	author rse;	state Exp;
branches;
next	1.25;
commitid	EcK4lclX2qcGwBcs;

1.25
date	2007.04.02.15.06.52;	author cs;	state Exp;
branches;
next	1.24;
commitid	zrVfHSOjySzHHvcs;

1.24
date	2007.02.23.14.30.35;	author rse;	state Exp;
branches;
next	1.23;
commitid	8LwyJBJWeHpZIC7s;

1.23
date	2007.02.19.07.26.18;	author rse;	state Exp;
branches;
next	1.22;
commitid	5amNRmv1grZov47s;

1.22
date	2007.02.13.17.55.32;	author rse;	state Exp;
branches;
next	1.21;
commitid	NPTtVt7B815ebm6s;

1.21
date	2007.02.11.10.47.05;	author rse;	state Exp;
branches;
next	1.20;
commitid	AKtgEHALXJ4eS36s;

1.20
date	2007.01.27.16.31.32;	author rse;	state Exp;
branches;
next	1.19;
commitid	uDOxUnU3miFhga4s;

1.19
date	2007.01.22.16.31.58;	author rse;	state Exp;
branches;
next	1.18;
commitid	DDFbdYy0lsWoqw3s;

1.18
date	2007.01.11.17.46.08;	author rse;	state Exp;
branches;
next	1.17;
commitid	TTogyX2ukelLb72s;

1.17
date	2007.01.10.18.51.40;	author rse;	state Exp;
branches;
next	1.16;
commitid	LDEnUsghJmbfAZ1s;

1.16
date	2007.01.05.07.50.07;	author rse;	state Exp;
branches;
next	1.15;
commitid	wGAOOZkwWIlg5i1s;

1.15
date	2006.12.18.18.18.18;	author rse;	state Exp;
branches;
next	1.14;
commitid	RhMdbKXice9D82Zr;

1.14
date	2006.12.18.09.21.41;	author rse;	state Exp;
branches;
next	1.13;
commitid	s5futXGpSJtxaZYr;

1.13
date	2006.12.18.08.22.28;	author rse;	state Exp;
branches;
next	1.12;
commitid	BBhx1sS9rM9eQYYr;

1.12
date	2006.06.10.11.05.24;	author rse;	state Exp;
branches
	1.12.2.1;
next	1.11;
commitid	8D8cwFFfrNkKSrAr;

1.11
date	2006.01.11.10.55.14;	author rse;	state Exp;
branches;
next	1.10;
commitid	UyMvdmgDaROcEahr;

1.10
date	2005.09.27.10.10.51;	author rse;	state Exp;
branches;
next	1.9;

1.9
date	2005.09.24.21.14.53;	author rse;	state Exp;
branches;
next	1.8;

1.8
date	2005.09.23.16.47.36;	author rse;	state Exp;
branches;
next	1.7;

1.7
date	2005.09.21.18.34.20;	author rse;	state Exp;
branches;
next	1.6;

1.6
date	2005.02.15.18.00.50;	author ms;	state Exp;
branches;
next	1.5;

1.5
date	2004.09.03.18.25.37;	author ms;	state Exp;
branches;
next	1.4;

1.4
date	2004.06.23.08.17.06;	author ms;	state Exp;
branches;
next	1.3;

1.3
date	2004.06.04.16.11.38;	author ms;	state Exp;
branches;
next	1.2;

1.2
date	2004.06.04.14.47.49;	author ms;	state Exp;
branches;
next	1.1;

1.1
date	2004.06.03.11.56.56;	author tho;	state Exp;
branches;
next	;

1.12.2.1
date	2006.12.22.19.13.37;	author thl;	state Exp;
branches;
next	1.12.2.2;
commitid	2LefOfqsS8nsjyZr;

1.12.2.2
date	2007.02.23.20.18.11;	author rse;	state Exp;
branches;
next	;
commitid	COsj7Ps26zpeEE7s;


desc
@@


1.75
log
@regen patch
@
text
@Index: Makefile.in
--- Makefile.in.orig	2009-07-06 16:29:57 +0200
+++ Makefile.in	2009-08-12 20:12:13 +0200
@@@@ -187,6 +187,17 @@@@
 USE_AMALGAMATION = @@USE_AMALGAMATION@@
 LIBOBJ = $(OBJS$(USE_AMALGAMATION))
 
+# FTS3 support
+ifdef FTS3
+TCC    += -DSQLITE_ENABLE_FTS3 -I$(TOP)/ext/fts3
+LIBOBJ += fts3.lo fts3_hash.lo fts3_expr.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
+endif
+
+# RTREE support
+ifdef RTREE
+TCC    += -DSQLITE_ENABLE_RTREE -I$(TOP)/ext/rtree
+LIBOBJ += rtree.lo
+endif
 
 # All of the source code files.
 #
@@@@ -477,6 +488,24 @@@@
 		-o $@@ $(TOP)/src/shell.c libsqlite3.la \
 		$(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
+fts3.lo:	$(TOP)/ext/fts3/fts3.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3.c
+fts3_hash.lo:	$(TOP)/ext/fts3/fts3_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_hash.c
+fts3_expr.lo:	$(TOP)/ext/fts3/fts3_expr.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_expr.c
+fts3_icu.lo:	$(TOP)/ext/fts3/fts3_icu.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_icu.c
+fts3_porter.lo:	$(TOP)/ext/fts3/fts3_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_porter.c
+fts3_tokenizer.lo:	$(TOP)/ext/fts3/fts3_tokenizer.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer.c
+fts3_tokenizer1.lo:	$(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
+
+rtree.lo:	$(TOP)/ext/rtree/rtree.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/rtree/rtree.c
+
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
 # build on the target system.  Some of the C source code and header
Index: configure
--- configure.orig	2009-08-01 17:04:20 +0200
+++ configure	2009-08-12 20:12:13 +0200
@@@@ -6012,11 +6012,7 @@@@
 if $ac_preproc_ok; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  :
 fi
 
 ac_ext=c
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig	2009-05-05 05:39:51 +0200
+++ sqlite3.pc.in	2009-08-12 20:12:13 +0200
@@@@ -8,6 +8,5 @@@@
 Name: SQLite
 Description: SQL database engine
 Version: @@RELEASE@@
-Libs: -L${libdir} -lsqlite3
-Libs.private: @@LIBS@@
+Libs: -L${libdir} -lsqlite3 @@LIBS@@
 Cflags: -I${includedir}
@


1.74
log
@upgrading package: sqlite 3.6.15 -> 3.6.16
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-06-25 13:35:50 +0200
+++ Makefile.in	2009-06-28 09:39:10 +0200
d48 2
a49 2
--- configure.orig	2009-06-25 13:45:57 +0200
+++ configure	2009-06-28 09:39:10 +0200
d65 1
a65 1
+++ sqlite3.pc.in	2009-06-28 09:39:10 +0200
@


1.73
log
@regen patch
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-06-12 04:37:45 +0200
+++ Makefile.in	2009-06-15 19:55:06 +0200
d48 2
a49 2
--- configure.orig	2009-06-15 02:04:07 +0200
+++ configure	2009-06-15 19:55:06 +0200
d65 1
a65 1
+++ sqlite3.pc.in	2009-06-15 19:55:06 +0200
@


1.72
log
@regen patch
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-05-25 13:13:30 +0200
+++ Makefile.in	2009-06-01 10:04:04 +0200
d48 2
a49 2
--- configure.orig	2009-05-25 14:40:54 +0200
+++ configure	2009-06-01 10:04:04 +0200
d65 1
a65 1
+++ sqlite3.pc.in	2009-06-01 10:04:04 +0200
@


1.71
log
@regen patch
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-05-05 05:39:48 +0200
+++ Makefile.in	2009-05-19 19:23:12 +0200
d48 2
a49 2
--- configure.orig	2009-05-18 18:22:42 +0200
+++ configure	2009-05-19 19:23:12 +0200
d65 1
a65 1
+++ sqlite3.pc.in	2009-05-19 19:23:12 +0200
@


1.70
log
@upgrading package: sqlite 3.6.12 -> 3.6.13
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-04-09 20:41:18 +0200
+++ Makefile.in	2009-04-13 17:43:27 +0200
d48 2
a49 2
--- configure.orig	2009-04-13 11:09:25 +0200
+++ configure	2009-04-13 17:44:28 +0200
d64 2
a65 2
--- sqlite3.pc.in.orig	2009-02-15 14:07:08 +0100
+++ sqlite3.pc.in	2009-04-13 17:43:27 +0200
@


1.69
log
@upgrading package: sqlite 3.6.11 -> 3.6.12
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-03-30 18:37:16 +0200
+++ Makefile.in	2009-03-31 20:09:03 +0200
d48 3
a50 3
--- configure.orig	2009-02-18 13:09:06 +0100
+++ configure	2009-03-31 20:06:08 +0200
@@@@ -5963,13 +5963,7 @@@@
d54 1
a54 3
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
d58 1
a58 1
-   { (exit 1); exit 1; }; }; }
d65 1
a65 1
+++ sqlite3.pc.in	2009-03-31 20:06:08 +0200
@


1.68
log
@reapply old patch for preprocessor stuff
@
text
@d2 4
a5 12
--- Makefile.in.orig	2009-02-15 14:07:08 +0100
+++ Makefile.in	2009-02-20 23:23:36 +0100
@@@@ -163,7 +163,7 @@@@
 
 # Object files for the SQLite library (non-amalgamation).
 #
-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
+OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo btmutex.lo \
         btree.lo build.lo callback.lo complete.lo date.lo \
         delete.lo expr.lo fault.lo func.lo global.lo \
         hash.lo journal.lo insert.lo legacy.lo loadext.lo \
@@@@ -188,6 +188,30 @@@@
a7 13
 
+# FTS1 support
+ifdef FTS1
+TCC    += -DSQLITE_ENABLE_FTS1 -I$(TOP)/ext/fts1
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+endif
+
+# FTS2 support
+ifdef FTS2
+TCC    += -DSQLITE_ENABLE_FTS2 -I$(TOP)/ext/fts2
+LIBOBJ += fts2.lo fts2_hash.lo fts2_porter.lo fts2_tokenizer1.lo
+endif
+
d11 1
a11 1
+LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_icu.lo fts3_tokenizer1.lo fts3_tokenizer.lo
d19 1
a19 1
+
d22 3
a24 4
 SRC = \
@@@@ -518,6 +542,9 @@@@
 auth.lo:	$(TOP)/src/auth.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
a25 29
+backup.lo:	$(TOP)/src/backup.c $(HDR)
+	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
+
 bitvec.lo:	$(TOP)/src/bitvec.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
 
@@@@ -817,3 +844,38 @@@@
 sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
 	$(TCC) -shared -o $@@ sqlite3.def \
 		-Wl,"--strip-all" $(REAL_LIBOBJ)
+
+fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
+fts1_hash.lo:	$(TOP)/ext/fts1/fts1_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
+fts1_porter.lo:	$(TOP)/ext/fts1/fts1_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
+fts1_tokenizer1.lo:	$(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
+
+fts2.lo:	$(TOP)/ext/fts2/fts2.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2.c
+fts2_hash.lo:	$(TOP)/ext/fts2/fts2_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_hash.c
+fts2_porter.lo:	$(TOP)/ext/fts2/fts2_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_porter.c
+fts2_tokenizer1.lo:	$(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts2/fts2_tokenizer1.c
+
d30 2
d44 3
a46 11
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig	2009-02-15 14:07:08 +0100
+++ sqlite3.pc.in	2009-02-20 23:22:48 +0100
@@@@ -8,6 +8,5 @@@@
 Name: SQLite
 Description: SQL database engine
 Version: @@RELEASE@@
-Libs: -L${libdir} -lsqlite3
-Libs.private: @@LIBS@@
+Libs: -L${libdir} -lsqlite3 @@LIBS@@
 Cflags: -I${includedir}
d48 2
a49 2
--- configure.orig	2009-02-15 14:07:08 +0100
+++ configure	2009-03-04 23:04:46 +0100
d65 11
@


1.67
log
@upgrading package: sqlite 3.6.10 -> 3.6.11
@
text
@d104 18
@


1.66
log
@regen patch
@
text
@d2 12
a13 3
--- Makefile.in.orig	2009-01-15 15:01:45 +0100
+++ Makefile.in	2009-01-17 11:43:12 +0100
@@@@ -184,6 +184,30 @@@@
d44 11
a54 1
@@@@ -801,3 +825,38 @@@@
d94 2
a95 2
--- sqlite3.pc.in.orig	2009-01-15 15:01:45 +0100
+++ sqlite3.pc.in	2009-01-17 11:43:12 +0100
@


1.65
log
@upgrading package: sqlite 3.6.8 -> 3.6.9
@
text
@d2 2
a3 2
--- Makefile.in.orig	2009-01-08 17:45:48 +0100
+++ Makefile.in	2009-01-15 19:04:34 +0100
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-12-19 15:17:41 +0100
+++ sqlite3.pc.in	2009-01-15 19:04:34 +0100
@


1.64
log
@upgrading package: sqlite 3.6.7 -> 3.6.8
@
text
@d3 1
a3 1
+++ Makefile.in	2009-01-12 17:10:26 +0100
d76 1
a76 1
+++ sqlite3.pc.in	2009-01-12 17:10:26 +0100
@


1.63
log
@upgrading package: sqlite 3.6.6.2 -> 3.6.7
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-12-04 20:41:45 +0100
+++ Makefile.in	2008-12-17 09:13:36 +0100
d35 1
a35 1
@@@@ -797,3 +821,38 @@@@
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-11-30 23:36:23 +0100
+++ sqlite3.pc.in	2008-12-17 09:13:36 +0100
@


1.62
log
@regen patch
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-11-19 00:37:10 +0100
+++ Makefile.in	2008-11-21 09:02:21 +0100
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-11-06 16:07:53 +0100
+++ sqlite3.pc.in	2008-11-21 09:02:21 +0100
@


1.61
log
@upgrading package: sqlite 3.6.4 -> 3.6.5
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-11-06 16:09:33 +0100
+++ Makefile.in	2008-11-12 19:23:43 +0100
d35 1
a35 1
@@@@ -791,3 +815,38 @@@@
d76 1
a76 1
+++ sqlite3.pc.in	2008-11-12 19:23:43 +0100
@


1.60
log
@upgrading package: sqlite 3.6.3 -> 3.6.4
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-10-14 20:07:37 +0200
+++ Makefile.in	2008-10-15 19:59:08 +0200
@@@@ -179,6 +179,30 @@@@
d35 1
a35 1
@@@@ -786,3 +810,38 @@@@
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-10-14 20:07:39 +0200
+++ sqlite3.pc.in	2008-10-15 19:59:34 +0200
@


1.59
log
@apply upstream vendor fix
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-09-08 13:57:08 +0200
+++ Makefile.in	2008-09-23 08:07:37 +0200
d35 1
a35 1
@@@@ -782,3 +806,38 @@@@
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-07-16 17:50:43 +0200
+++ sqlite3.pc.in	2008-09-23 08:07:37 +0200
d80 1
a80 1
 Version: @@VERSION@@
a84 17

-----------------------------------------------------------------------------

Upstream fixes (can be removed with SQLite 3.6.4)

Index: src/main.c
--- src/main.c	2008/09/08 08:08:09	1.500
+++ src/main.c	2008/09/22 17:22:20	1.501
@@@@ -135,6 +135,8 @@@@
         rc = SQLITE_NOMEM;
       }
     }
+  }
+  if( rc==SQLITE_OK ){
     sqlite3GlobalConfig.nRefInitMutex++;
   }
   sqlite3_mutex_leave(pMaster);
@


1.58
log
@upgrading package: sqlite 3.6.2 -> 3.6.3
@
text
@d85 17
@


1.57
log
@upgrading package: sqlite 3.6.1 -> 3.6.2
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-08-26 14:24:48 +0200
+++ Makefile.in	2008-08-31 10:05:44 +0200
d35 1
a35 1
@@@@ -779,3 +803,38 @@@@
d76 1
a76 1
+++ sqlite3.pc.in	2008-08-31 10:05:44 +0200
@


1.56
log
@upgrading package: sqlite 3.6.0 -> 3.6.1
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-08-05 21:58:48 +0200
+++ Makefile.in	2008-08-07 09:09:15 +0200
@@@@ -178,6 +178,30 @@@@
d35 1
a35 1
@@@@ -764,3 +788,38 @@@@
d76 1
a76 1
+++ sqlite3.pc.in	2008-08-07 09:09:15 +0200
a84 28

-----------------------------------------------------------------------------

Upstream Vendor CVS Patches (can be removed with SQLite 3.6.2)

Index: src/build.c
--- src/build.c	2008/08/04 04:39:49	1.493
+++ src/build.c	2008/08/06 13:47:41	1.494
@@@@ -2136,6 +2136,7 @@@@
   ExprList *pToCol,    /* Columns in the other table */
   int flags            /* Conflict resolution algorithms. */
 ){
+  sqlite3 *db = pParse->db;
 #ifndef SQLITE_OMIT_FOREIGN_KEY
   FKey *pFKey = 0;
   Table *p = pParse->pNewTable;
@@@@ -2143,10 +2144,8 @@@@
   int i;
   int nCol;
   char *z;
-  sqlite3 *db;
 
   assert( pTo!=0 );
-  db = pParse->db;
   if( p==0 || pParse->nErr || IN_DECLARE_VTAB ) goto fk_end;
   if( pFromCol==0 ){
     int iCol = p->nCol-1;

@


1.55
log
@with_fts1 and with_fts2 are obsolete (SQLite depractes those extension), with_fts3 has to be fixed and with_rtree was added
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-07-09 01:36:13 +0200
+++ Makefile.in	2008-07-17 09:33:03 +0200
@@@@ -172,6 +172,30 @@@@
d35 1
a35 1
@@@@ -754,3 +778,38 @@@@
d75 2
a76 2
--- sqlite3.pc.in.orig	2008-06-24 03:29:58 +0200
+++ sqlite3.pc.in	2008-07-17 09:32:21 +0200
d85 28
@


1.54
log
@upgrading package: sqlite 3.5.9 -> 3.6.0
@
text
@d3 2
a4 2
+++ Makefile.in	2008-07-17 09:09:03 +0200
@@@@ -172,6 +172,24 @@@@
d10 1
a10 1
+TCC    += -DSQLITE_ENABLE_FTS1
d16 1
a16 1
+TCC    += -DSQLITE_ENABLE_FTS2
d22 8
a29 2
+TCC    += -DSQLITE_ENABLE_FTS3
+LIBOBJ += fts3.lo fts3_hash.lo fts3_porter.lo fts3_tokenizer1.lo
d35 1
a35 1
@@@@ -754,3 +772,31 @@@@
d62 2
d66 2
d71 3
d76 1
a76 1
+++ sqlite3.pc.in	2008-07-17 09:09:03 +0200
@


1.53
log
@ops, fix bogus lines
@
text
@d2 2
a3 2
--- Makefile.in.orig	2008-05-12 19:10:26 +0200
+++ Makefile.in	2008-05-15 13:29:58 +0200
d29 1
a29 1
@@@@ -738,3 +756,31 @@@@
d62 2
a63 2
--- sqlite3.pc.in.orig	2008-05-02 03:56:18 +0200
+++ sqlite3.pc.in	2008-05-15 13:29:58 +0200
@


1.52
log
@upgrading package: sqlite 3.5.8 -> 3.5.9
@
text
@a71 2
Index: test/sqllimits1
sed: -e expression #1, char 30: unknown option to `s'
@


1.51
log
@upgrading package: sqlite 3.5.7 -> 3.5.8
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-04-14 02:49:45 +0200
+++ Makefile.in	2008-04-17 08:24:02 +0200
@@@@ -167,6 +167,24 @@@@
d29 1
a29 1
@@@@ -732,3 +750,31 @@@@
d62 2
a63 2
--- sqlite3.pc.in.orig	2008-03-20 13:06:04 +0100
+++ sqlite3.pc.in	2008-04-17 08:24:32 +0200
d72 2
@


1.50
log
@upgrading package: sqlite 3.5.6 -> 3.5.7
@
text
@d2 3
a4 3
--- Makefile.in.orig	2008-03-14 19:01:53 +0100
+++ Makefile.in	2008-03-18 21:49:33 +0100
@@@@ -149,6 +149,24 @@@@
d29 1
a29 1
@@@@ -712,3 +730,31 @@@@
d62 2
a63 2
--- sqlite3.pc.in.orig	2008-03-14 19:01:53 +0100
+++ sqlite3.pc.in	2008-03-18 21:45:30 +0100
d69 1
a69 1
-Libs.private: -lpthread
@


1.49
log
@upgrading package: sqlite 3.5.5 -> 3.5.6
@
text
@d2 5
a6 5
--- Makefile.in.orig	2008-01-22 19:42:50 +0100
+++ Makefile.in	2008-02-07 19:18:34 +0100
@@@@ -133,6 +133,24 @@@@
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbefifo.lo vdbemem.lo \
          where.lo utf.lo legacy.lo vtab.lo
d29 5
a33 4
@@@@ -554,6 +572,33 @@@@
 	$(LTLINK) -o tclsqlite3 tclsqlite-shell.lo \
 		 libsqlite3.la $(LIBTCL)
 
a60 3
 testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC)
 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \
                 -DSQLITE_NO_SYNC=1 $(TEMP_STORE) \
d62 2
a63 2
--- sqlite3.pc.in.orig	2007-11-30 02:28:10 +0100
+++ sqlite3.pc.in	2008-02-07 19:18:34 +0100
@


1.48
log
@upgrading package: sqlite 3.5.4 -> 3.5.5
@
text
@d3 1
a3 1
+++ Makefile.in	2008-02-01 23:26:04 +0100
d65 1
a65 1
+++ sqlite3.pc.in	2008-02-01 23:26:04 +0100
@


1.47
log
@remove tcl requirement (again) by backporting upstream vendor patch
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-12-13 19:17:41 +0100
+++ Makefile.in	2007-12-15 09:53:39 +0100
@@@@ -132,6 +132,24 @@@@
d65 1
a65 1
+++ sqlite3.pc.in	2007-12-15 09:53:39 +0100
a73 29
Index: sqlite/Makefile.in
--- Makefile.in	2007/12/13 18:20:46	1.191
+++ Makefile.in	2007/12/17 16:20:07	1.192
@@@@ -317,17 +317,10 @@@@
                 -rpath $(libdir)/sqlite \
 		-version-info "8:6:8"
 
-testcli$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
+sqlite3$(TEXE):	$(TOP)/src/shell.c libsqlite3.la sqlite3.h
 	$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
 		-o $@@ $(TOP)/src/shell.c libsqlite3.la \
 		$(LIBREADLINE) $(TLIBS)
-
-sqlite3$(EXE):	$(TOP)/src/shell.c sqlite3.c sqlite3.h
-	$(LTLINK) $(READLINE_FLAGS) -o $@@                          \
-		-DSQLITE_MAX_SQL_LENGTH=1000000000                  \
-		-USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0           \
-		$(TOP)/src/shell.c sqlite3.c                        \
-		$(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
@@@@ -577,7 +577,7 @@@@
 	  -e 's,$$,\\n",' \
 	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
 	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\
-                -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
+                -o sqlite3_analyzer$(TEXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
 		libtclsqlite3.la $(LIBTCL)
@


1.46
log
@apply a patch rpm5.org requires indirectly
@
text
@d74 10
a83 4
Index: Makefile.in
--- Makefile.in.orig    Thu Dec 13 19:17:42 2007
+++ Makefile.in  Wed Jan  2 11:37:50 2008
@@@@ -322,7 +322,7 @@@@
d86 7
d94 2
a95 5
-sqlite3$(EXE):	$(TOP)/src/shell.c sqlite3.c sqlite3.h
+sqlite3$(TEXE):	$(TOP)/src/shell.c sqlite3.c sqlite3.h
 	$(LTLINK) $(READLINE_FLAGS) -o $@@                          \
 		-DSQLITE_MAX_SQL_LENGTH=1000000000                  \
 		-USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0           \
@


1.45
log
@upgrading package: sqlite 3.5.3 -> 3.5.4
@
text
@d74 19
@


1.44
log
@upgrading package: sqlite 3.5.2 -> 3.5.3
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-11-23 16:05:48 +0100
+++ Makefile.in	2007-11-28 20:11:50 +0100
d29 1
a29 1
@@@@ -543,6 +561,33 @@@@
d64 2
a65 2
--- sqlite3.pc.in.orig	2007-11-22 01:47:05 +0100
+++ sqlite3.pc.in	2007-11-28 20:12:30 +0100
@


1.43
log
@upgrading package: sqlite 3.5.1 -> 3.5.2
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-10-19 19:43:30 +0200
+++ Makefile.in	2007-11-06 08:17:18 +0100
d64 10
a73 9
--- sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite3.pc.in	2007-11-06 08:17:18 +0100
@@@@ -8,5 +8,5 @@@@
 Name: SQLite
 Description: SQL database engine
 Version: @@VERSION@@
-Libs: -L${libdir} -lsqlite3
+Libs: -L${libdir} -lsqlite3 @@LIBS@@
 Cflags: -I${includedir}
@


1.42
log
@add support for new full-text-search v3
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-09-04 00:11:33 +0200
+++ Makefile.in	2007-10-04 08:06:28 +0200
d29 1
a29 1
@@@@ -537,6 +555,33 @@@@
d65 1
a65 1
+++ sqlite3.pc.in	2007-10-04 08:04:24 +0200
@


1.41
log
@upgrading package: sqlite 3.4.2 -> 3.5.0
@
text
@d2 3
a4 3
--- Makefile.in.orig	2007-06-28 14:46:18 +0200
+++ Makefile.in	2007-08-14 21:01:55 +0200
@@@@ -130,6 +130,18 @@@@
d20 6
d29 1
a29 1
@@@@ -492,6 +504,25 @@@@
d51 8
d65 1
a65 1
+++ sqlite3.pc.in	2007-08-14 21:04:47 +0200
@


1.40
log
@fix building under Solaris (sqlite.patch hunks are taken from upstream CVS and hence can be removed once 3.4.3 is released)
@
text
@a58 79
Index: tool/lemon.c
--- tool/lemon.c	30 Jul 2007 18:31:53 -0000	1.48
+++ tool/lemon.c	23 Aug 2007 02:50:56 -0000	1.49
@@@@ -108,7 +108,7 @@@@
 ** Principal data structures for the LEMON parser generator.
 */
 
-typedef enum {B_FALSE=0, B_TRUE} Boolean;
+typedef enum {LEMON_FALSE=0, LEMON_TRUE} Boolean;
 
 /* Symbols (terminals and nonterminals) of the grammar are stored
 ** in the following: */
@@@@ -610,7 +610,7 @@@@
   int progress;
 
   for(i=0; i<lemp->nsymbol; i++){
-    lemp->symbols[i]->lambda = B_FALSE;
+    lemp->symbols[i]->lambda = LEMON_FALSE;
   }
   for(i=lemp->nterminal; i<lemp->nsymbol; i++){
     lemp->symbols[i]->firstset = SetNew();
@@@@ -623,10 +623,10 @@@@
       if( rp->lhs->lambda ) continue;
       for(i=0; i<rp->nrhs; i++){
          struct symbol *sp = rp->rhs[i];
-         if( sp->type!=TERMINAL || sp->lambda==B_FALSE ) break;
+         if( sp->type!=TERMINAL || sp->lambda==LEMON_FALSE ) break;
       }
       if( i==rp->nrhs ){
-        rp->lhs->lambda = B_TRUE;
+        rp->lhs->lambda = LEMON_TRUE;
         progress = 1;
       }
     }
@@@@ -649,10 +649,10 @@@@
           }
           break;
 	}else if( s1==s2 ){
-          if( s1->lambda==B_FALSE ) break;
+          if( s1->lambda==LEMON_FALSE ) break;
 	}else{
           progress += SetUnion(s1->firstset,s2->firstset);
-          if( s2->lambda==B_FALSE ) break;
+          if( s2->lambda==LEMON_FALSE ) break;
 	}
       }
     }
@@@@ -972,11 +972,11 @@@@
   }
 
   /* Report an error for each rule that can never be reduced. */
-  for(rp=lemp->rule; rp; rp=rp->next) rp->canReduce = B_FALSE;
+  for(rp=lemp->rule; rp; rp=rp->next) rp->canReduce = LEMON_FALSE;
   for(i=0; i<lemp->nstate; i++){
     struct action *ap;
     for(ap=lemp->sorted[i]->ap; ap; ap=ap->next){
-      if( ap->type==REDUCE ) ap->x.rp->canReduce = B_TRUE;
+      if( ap->type==REDUCE ) ap->x.rp->canReduce = LEMON_TRUE;
     }
   }
   for(rp=lemp->rule; rp; rp=rp->next){
@@@@ -1210,7 +1210,7 @@@@
             break;
 	  }else{
             SetUnion(newcfp->fws,xsp->firstset);
-            if( xsp->lambda==B_FALSE ) break;
+            if( xsp->lambda==LEMON_FALSE ) break;
 	  }
 	}
         if( i==rp->nrhs ) Plink_add(&cfp->fplp,newcfp);
@@@@ -4271,7 +4271,7 @@@@
     sp->prec = -1;
     sp->assoc = UNK;
     sp->firstset = 0;
-    sp->lambda = B_FALSE;
+    sp->lambda = LEMON_FALSE;
     sp->destructor = 0;
     sp->datatype = 0;
     Symbol_insert(sp,sp->name);
@


1.39
log
@remove an accidentaly introduced trailing stray character
@
text
@d59 79
@


1.38
log
@upgrading package: sqlite 3.4.1 -> 3.4.2
@
text
@d10 1
a10 1
+TCC    += -DSQLITE_ENABLE_FTS1·
@


1.37
log
@apply a larger set of upstream fixes we have in the SQLite CVS applied since 3.4.1
@
text
@d3 1
a3 1
+++ Makefile.in	2007-07-21 10:09:07 +0200
d10 1
a10 1
+TCC    += -DSQLITE_ENABLE_FTS1 
d23 3
a25 3
@@@@ -498,6 +510,23 @@@@
 		-o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
 		libsqlite3.la $(LIBTCL)
d44 5
a48 91
 
 fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture $(TOP)/test/all.test
Index: ext/fts1/fts1.c
--- ext/fts1/fts1.c.orig	2007-06-28 14:46:18 +0200
+++ ext/fts1/fts1.c	2007-07-21 10:09:07 +0200
@@@@ -19,11 +19,7 @@@@
 #endif
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: ext/fts1/fts1_porter.c
--- ext/fts1/fts1_porter.c.orig	2007-06-12 14:18:00 +0200
+++ ext/fts1/fts1_porter.c	2007-07-21 10:09:07 +0200
@@@@ -26,11 +26,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: ext/fts1/fts1_tokenizer1.c
--- ext/fts1/fts1_tokenizer1.c.orig	2007-06-12 14:18:00 +0200
+++ ext/fts1/fts1_tokenizer1.c	2007-07-21 10:09:07 +0200
@@@@ -18,11 +18,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: ext/fts2/fts2.c
--- ext/fts2/fts2.c.orig	2007-07-03 12:15:32 +0200
+++ ext/fts2/fts2.c	2007-07-21 10:09:07 +0200
@@@@ -279,9 +279,6 @@@@
 #endif
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
Index: ext/fts2/fts2_porter.c
--- ext/fts2/fts2_porter.c.orig	2007-06-12 14:18:00 +0200
+++ ext/fts2/fts2_porter.c	2007-07-21 10:09:07 +0200
@@@@ -26,11 +26,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: ext/fts2/fts2_tokenizer1.c
--- ext/fts2/fts2_tokenizer1.c.orig	2007-06-28 14:46:19 +0200
+++ ext/fts2/fts2_tokenizer1.c	2007-07-21 10:09:07 +0200
@@@@ -26,11 +26,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
d51 1
a51 1
+++ sqlite3.pc.in	2007-07-21 10:09:07 +0200
a58 169
--- src/vdbe.c	2007/07/21 19:41:46	1.637
+++ src/vdbe.c	2007/07/22 19:10:21	1.638
@@@@ -1289,7 +1289,19 @@@@
   if( sqlite3SafetyOff(db) ) goto abort_due_to_misuse;
   (*ctx.pFunc->xFunc)(&ctx, n, apVal);
   if( sqlite3SafetyOn(db) ) goto abort_due_to_misuse;
-  if( sqlite3MallocFailed() ) goto no_mem;
+  if( sqlite3MallocFailed() ){
+    /* Even though a malloc() has failed, the implementation of the
+    ** user function may have called an sqlite3_result_XXX() function
+    ** to return a value. The following call releases any resources
+    ** associated with such a value.
+    **
+    ** Note: Maybe MemRelease() should be called if sqlite3SafetyOn()
+    ** fails also (the if(...) statement above). But if people are
+    ** misusing sqlite, they have bigger problems than a leaked value.
+    */
+    sqlite3VdbeMemRelease(&ctx.s);
+    goto no_mem;
+  }
   popStack(&pTos, n);
 
   /* If any auxilary data functions have been called by this user function,
@@@@ -4299,7 +4299,7 @@@@
     if( (pTos[-nRoot].flags &amp; MEM_Int)==0 ) break;
   }
   assert( nRoot>0 );
-  aRoot = sqliteMallocRaw( sizeof(int*)*(nRoot+1) );
+  aRoot = sqliteMallocRaw( sizeof(int)*(nRoot+1) );
   if( aRoot==0 ) goto no_mem;
   j = pOp->p1;
   assert( j>=0 &amp;&amp; j<p->nMem );
@@@@ -4306,7 +4306,7 @@@@
   pnErr = &p->aMem[j];
   assert( (pnErr->flags & MEM_Int)!=0 );
   for(j=0; j<nRoot; j++){
-    aRoot[j] = pTos[-j].u.i;
+    aRoot[j] = (pTos-j)->u.i;
   }
   aRoot[j] = 0;
   popStack(&pTos, nRoot);
Index: src/btree.c
--- src/btree.c	2007/06/26 01:04:49	1.392
+++ src/btree.c	2007/07/23 19:26:17	1.393
@@@@ -2009,7 +2009,7 @@@@
       assert(nFin==0 || pBt->nTrunc==0 || nFin<=pBt->nTrunc);
       rc = SQLITE_OK;
       if( pBt->nTrunc ){
-        sqlite3PagerWrite(pBt->pPage1->pDbPage);
+        rc = sqlite3PagerWrite(pBt->pPage1->pDbPage);
         put4byte(&pBt->pPage1->aData[32], 0);
         put4byte(&pBt->pPage1->aData[36], 0);
         pBt->nTrunc = nFin;
Index: src/insert.c
--- src/insert.c	2007/06/26 10:38:55	1.187
+++ src/insert.c	2007/07/23 19:39:47	1.188
@@@@ -1027,7 +1027,7 @@@@
     assert( pParse->ckOffset==nCol );
     pParse->ckOffset = 0;
     onError = overrideError!=OE_Default ? overrideError : OE_Abort;
-    if( onError==OE_Ignore || onError==OE_Replace ){
+    if( onError==OE_Ignore ){
       sqlite3VdbeAddOp(v, OP_Pop, nCol+1+hasTwoRowids, 0);
       sqlite3VdbeAddOp(v, OP_Goto, 0, ignoreDest);
     }else{
Index: src/expr.c
--- src/expr.c	2007/06/25 16:29:34	1.300
+++ src/expr.c	2007/07/23 22:51:15	1.301
@@@@ -1140,11 +1140,17 @@@@
       for(j=0; j<pEList->nExpr; j++){
         char *zAs = pEList->a[j].zName;
         if( zAs!=0 && sqlite3StrICmp(zAs, zCol)==0 ){
-          Expr *pDup;
+          Expr *pDup, *pOrig;
           assert( pExpr->pLeft==0 && pExpr->pRight==0 );
           assert( pExpr->pList==0 );
           assert( pExpr->pSelect==0 );
-          pDup = sqlite3ExprDup(pEList->a[j].pExpr);
+          pOrig = pEList->a[j].pExpr;
+          if( !pNC->allowAgg && ExprHasProperty(pOrig, EP_Agg) ){
+            sqlite3ErrorMsg(pParse, "misuse of aliased aggregate %s", zAs);
+            sqliteFree(zCol);
+            return 2;
+          }
+          pDup = sqlite3ExprDup(pOrig);
           if( pExpr->flags & EP_ExpCollate ){
             pDup->pColl = pExpr->pColl;
             pDup->flags |= EP_ExpCollate;
Index: src/func.c
--- src/func.c	2007/07/23 19:12:42	1.162
+++ src/func.c	2007/07/26 06:50:06	1.163
@@@@ -1118,6 +1118,7 @@@@
       if( zAux ){
         zRet[i*2] = '1';
         if( strcmp(zAux, z) ){
+          free_test_auxdata((void *)zRet);
           sqlite3_result_error(pCtx, "Auxilary data corruption", -1);
           return;
         }
Index: src/vdbeapi.c
--- src/vdbeapi.c	2007/07/12 13:18:05	1.94
+++ src/vdbeapi.c	2007/07/26 06:50:06	1.95
@@@@ -390,13 +390,13 @@@@
 ){
   struct AuxData *pAuxData;
   VdbeFunc *pVdbeFunc;
-  if( iArg<0 ) return;
+  if( iArg<0 ) goto failed;
 
   pVdbeFunc = pCtx->pVdbeFunc;
   if( !pVdbeFunc || pVdbeFunc->nAux<=iArg ){
     int nMalloc = sizeof(VdbeFunc) + sizeof(struct AuxData)*iArg;
     pVdbeFunc = sqliteRealloc(pVdbeFunc, nMalloc);
-    if( !pVdbeFunc ) return;
+    if( !pVdbeFunc ) goto failed;
     pCtx->pVdbeFunc = pVdbeFunc;
     memset(&pVdbeFunc->apAux[pVdbeFunc->nAux], 0, 
              sizeof(struct AuxData)*(iArg+1-pVdbeFunc->nAux));
@@@@ -410,6 +410,12 @@@@
   }
   pAuxData->pAux = pAux;
   pAuxData->xDelete = xDelete;
+  return;
+
+failed:
+  if( xDelete ){
+    xDelete(pAux);
+  }
 }
 
 /*
Index: src/where.c
--- src/where.c	2007/06/11 12:56:15	1.253
+++ src/where.c	2007/07/30 14:40:48	1.254
@@@@ -383,10 +383,22 @@@@
 /*
 ** Commute a comparision operator.  Expressions of the form "X op Y"
 ** are converted into "Y op X".
+**
+** If a collation sequence is associated with either the left or right
+** side of the comparison, it remains associated with the same side after
+** the commutation. So "Y collate NOCASE op X" becomes 
+** "X collate NOCASE op Y". This is because any collation sequence on
+** the left hand side of a comparison overrides any collation sequence 
+** attached to the right. For the same reason the EP_ExpCollate flag
+** is not commuted.
 */
 static void exprCommute(Expr *pExpr){
+  u16 expRight = (pExpr->pRight->flags & EP_ExpCollate);
+  u16 expLeft = (pExpr->pLeft->flags & EP_ExpCollate);
   assert( allowedOp(pExpr->op) && pExpr->op!=TK_IN );
   SWAP(CollSeq*,pExpr->pRight->pColl,pExpr->pLeft->pColl);
+  pExpr->pRight->flags = (pExpr->pRight->flags & ~EP_ExpCollate) | expLeft;
+  pExpr->pLeft->flags = (pExpr->pLeft->flags & ~EP_ExpCollate) | expRight;
   SWAP(Expr*,pExpr->pRight,pExpr->pLeft);
   if( pExpr->op>=TK_GT ){
     assert( TK_LT==TK_GT+2 );
Index: src/shell.c
--- src/shell.c	2007/07/30 18:24:39	1.165
+++ src/shell.c	2007/07/30 20:41:53	1.166
@@@@ -1779,7 +1779,7 @@@@
   in = fopen(sqliterc,"rb");
   if( in ){
     if( stdin_is_interactive ){
-      printf("Loading resources from %s\n",sqliterc);
+      printf("-- Loading resources from %s\n",sqliterc);
     }
     process_input(p,in);
     fclose(in);
@


1.36
log
@regen patch file for correct offsets without fuzzy matching
@
text
@d145 169
@


1.35
log
@upgrading package: sqlite 3.4.0 -> 3.4.1
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-06-14 22:54:38 +0200
+++ Makefile.in	2007-06-20 18:09:00 +0200
d48 2
a49 2
--- ext/fts1/fts1.c.orig	2007-06-12 14:18:00 +0200
+++ ext/fts1/fts1.c	2007-06-20 18:09:00 +0200
d64 1
a64 1
+++ ext/fts1/fts1_porter.c	2007-06-20 18:09:00 +0200
d79 1
a79 1
+++ ext/fts1/fts1_tokenizer1.c	2007-06-20 18:09:00 +0200
d93 3
a95 3
--- ext/fts2/fts2.c.orig	2007-06-13 15:29:40 +0200
+++ ext/fts2/fts2.c	2007-06-20 18:10:05 +0200
@@@@ -269,9 +269,6 @@@@
d107 1
a107 1
+++ ext/fts2/fts2_porter.c	2007-06-20 18:09:35 +0200
d121 3
a123 3
--- ext/fts2/fts2_tokenizer1.c.orig	2007-06-12 14:18:00 +0200
+++ ext/fts2/fts2_tokenizer1.c	2007-06-20 18:09:46 +0200
@@@@ -18,11 +18,7 @@@@
d137 1
a137 1
+++ sqlite3.pc.in	2007-06-20 18:09:00 +0200
@


1.34
log
@split ODBC patch out from sqlite.patch (I require this for rpm5.org)
@
text
@a22 9
@@@@ -409,7 +421,7 @@@@
 	cp $(TOP)/src/parse.y .
 	./lemon$(BEXE) $(OPTS) parse.y
 	mv parse.h parse.h.temp
-	awk -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
+	$(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
 
 pragma.lo:	$(TOP)/src/pragma.c $(HDR)
 	$(LTCOMPILE) -c $(TOP)/src/pragma.c
a144 27
Index: src/shell.c
--- src/shell.c.orig	2007-06-12 14:18:01 +0200
+++ src/shell.c	2007-06-20 18:09:00 +0200
@@@@ -1753,6 +1753,7 @@@@
   char *home_dir = NULL;
   const char *sqliterc = sqliterc_override;
   char *zBuf = 0;
+  int n;
   FILE *in = NULL;
 
   if (sqliterc == NULL) {
@@@@ -1761,12 +1762,13 @@@@
       fprintf(stderr,"%s: cannot locate your home directory!\n", Argv0);
       return;
     }
-    zBuf = malloc(strlen(home_dir) + 15);
+    n = strlen(home_dir) + 15;
+    zBuf = malloc(n);
     if( zBuf==0 ){
       fprintf(stderr,"%s: out of memory!\n", Argv0);
       exit(1);
     }
-    sqlite3_snprintf(sizeof(zBuf), zBuf,"%s/.sqliterc",home_dir);
+    sqlite3_snprintf(n, zBuf,"%s/.sqliterc",home_dir);
     free(home_dir);
     sqliterc = (const char*)zBuf;
   }
@


1.33
log
@add optional FTS2 support (Full Text Search 2)
@
text
@a153 27
Index: sqliteodbc-0.74/Makefile.in
--- sqliteodbc-0.74/Makefile.in.orig	2007-02-04 12:23:36 +0100
+++ sqliteodbc-0.74/Makefile.in	2007-06-20 18:09:00 +0200
@@@@ -6,7 +6,7 @@@@
 CC =		@@CC@@
 INSTALL =	@@INSTALL@@
 LIBTOOL =	./libtool
-CFLAGS=		@@CFLAGS@@ -DDRIVER_VER_INFO=\"@@VER_INFO@@\"
+CFLAGS=		@@CFLAGS@@ @@CPPFLAGS@@ -DDRIVER_VER_INFO=\"@@VER_INFO@@\"
 SQLITE_INC =	@@SQLITE_INC@@
 SQLITE_LIB =	@@SQLITE_LIB@@
 SQLITE_FLAGS =	-DHAVE_LIBVERSION=@@SQLITE_LIBVERSION@@ \
@@@@ -74,10 +74,10 @@@@
 
 install-3:	libsqlite3odbc.la @@EXT_BLOBTOXY@@ @@EXT_IMPEXP@@
 		$(LIBTOOL) $(INSTALL) libsqlite3odbc.la $(DESTDIR)$(libdir)
-		test -n "@@EXT_BLOBTOXY@@" && \
-		    $(LIBTOOL) $(INSTALL) @@EXT_BLOBTOXY@@ $(DESTDIR)$(libdir)
-		test -n "@@EXT_IMPEXP@@" && \
-		    $(LIBTOOL) $(INSTALL) @@EXT_IMPEXP@@ $(DESTDIR)$(libdir)
+		if [ ".@@EXT_BLOBTOXY@@" != . ]; then \
+		    $(LIBTOOL) $(INSTALL) @@EXT_BLOBTOXY@@ $(DESTDIR)$(libdir); fi
+		if [ ".@@EXT_IMPEXP@@" != . ]; then \
+		    $(LIBTOOL) $(INSTALL) @@EXT_IMPEXP@@ $(DESTDIR)$(libdir); fi
 
 uninstall-3:
 		$(LIBTOOL) --mode=uninstall \
@


1.32
log
@fix .sqliterc reading in sqlite(1)
@
text
@d3 2
a4 2
+++ Makefile.in	2007-06-18 19:20:18 +0200
@@@@ -130,6 +130,12 @@@@
d14 6
d23 1
a23 1
@@@@ -409,7 +415,7 @@@@
d32 1
a32 1
@@@@ -498,6 +504,14 @@@@
d44 9
d58 1
a58 1
+++ ext/fts1/fts1.c	2007-06-18 19:20:18 +0200
d73 1
a73 1
+++ ext/fts1/fts1_porter.c	2007-06-18 19:20:18 +0200
d88 44
a131 1
+++ ext/fts1/fts1_tokenizer1.c	2007-06-18 19:20:18 +0200
d146 1
a146 1
+++ sqlite3.pc.in	2007-06-18 19:20:18 +0200
d156 1
a156 1
+++ sqliteodbc-0.74/Makefile.in	2007-06-18 19:20:18 +0200
d182 2
a183 2
--- src/shell.c	4 May 2007 13:15:56 -0000	1.162
+++ src/shell.c	20 Jun 2007 12:43:54 -0000
@


1.31
log
@upgrading package: sqlite 3.3.17 -> 3.4.0
@
text
@d123 27
@


1.30
log
@finally remove all ancient SQLite 2.x support and this way greatly simplify packaging of SQLite again; fix with_readline support; fix GNU awk usage
@
text
@d2 2
a3 2
--- Makefile.in.orig	2007-04-06 14:44:37 +0200
+++ Makefile.in	2007-06-03 11:35:12 +0200
d5 1
a5 1
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
d17 1
a17 1
@@@@ -399,7 +405,7 @@@@
d26 1
a26 1
@@@@ -485,6 +491,14 @@@@
d42 2
a43 2
--- ext/fts1/fts1.c.orig	2007-04-12 23:24:09 +0200
+++ ext/fts1/fts1.c	2007-06-03 11:34:54 +0200
d57 2
a58 2
--- ext/fts1/fts1_porter.c.orig	2007-03-16 19:30:54 +0100
+++ ext/fts1/fts1_porter.c	2007-06-03 11:34:54 +0200
d72 2
a73 2
--- ext/fts1/fts1_tokenizer1.c.orig	2007-03-16 19:30:54 +0100
+++ ext/fts1/fts1_tokenizer1.c	2007-06-03 11:34:54 +0200
d88 1
a88 1
+++ sqlite3.pc.in	2007-06-03 11:34:54 +0200
d94 1
a94 1
+Libs: -L${libdir} -lsqlite3 @@TARGET_LIBS@@
d98 1
a98 1
+++ sqliteodbc-0.74/Makefile.in	2007-06-03 11:34:54 +0200
@


1.29
log
@upgrading package: sqlite 3.3.16 -> 3.3.17
@
text
@d1 4
a4 31
Index: sqlite-2.8.17/configure
--- sqlite-2.8.17/configure.orig	2005-04-24 00:43:23 +0200
+++ sqlite-2.8.17/configure	2006-12-18 09:51:03 +0100
@@@@ -20450,7 +20450,10 @@@@
   TARGET_HAVE_READLINE=0
 fi
 
-
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+    TARGET_HAVE_READLINE=0
+fi
 
 #########
 # Figure out whether or not we have a "usleep()" function.
Index: sqlite-2.8.17/src/encode.c
--- sqlite-2.8.17/src/encode.c.orig	2005-04-24 00:43:22 +0200
+++ sqlite-2.8.17/src/encode.c	2007-02-23 15:28:03 +0100
@@@@ -176,6 +176,8 @@@@
   int i, e;
   unsigned char c;
   e = *(in++);
+  if (e == 0)
+    return 0;
   i = 0;
   while( (c = *(in++))!=0 ){
     if( c==1 ){
Index: sqlite-3.3.17/Makefile.in
--- sqlite-3.3.17/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.17/Makefile.in	2006-12-18 09:51:03 +0100
@@@@ -132,6 +132,12 @@@@
d17 10
a26 1
@@@@ -481,6 +487,14 @@@@
d41 3
a43 17
Index: sqlite-3.3.17/configure
--- sqlite-3.3.17/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.17/configure	2006-12-18 09:51:03 +0100
@@@@ -20472,6 +20472,10 @@@@
   TARGET_HAVE_READLINE=0
 fi
 
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+    TARGET_HAVE_READLINE=0
+fi
 
 
 #########
Index: sqlite-3.3.17/ext/fts1/fts1.c
--- sqlite-3.3.17/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.17/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d56 3
a58 3
Index: sqlite-3.3.17/ext/fts1/fts1_porter.c
--- sqlite-3.3.17/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.17/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d71 3
a73 3
Index: sqlite-3.3.17/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.17/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.17/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d86 3
a88 3
Index: sqlite-3.3.17/sqlite3.pc.in
--- sqlite-3.3.17/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.17/sqlite3.pc.in	2006-12-18 09:51:03 +0100
d98 1
a98 1
+++ sqliteodbc-0.74/Makefile.in	2007-02-11 11:43:15 +0100
@


1.28
log
@upgrading package: sqlite 3.3.15 -> 3.3.16
@
text
@d28 3
a30 3
Index: sqlite-3.3.16/Makefile.in
--- sqlite-3.3.16/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.16/Makefile.in	2006-12-18 09:51:03 +0100
d59 3
a61 3
Index: sqlite-3.3.16/configure
--- sqlite-3.3.16/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.16/configure	2006-12-18 09:51:03 +0100
d73 3
a75 3
Index: sqlite-3.3.16/ext/fts1/fts1.c
--- sqlite-3.3.16/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.16/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d88 3
a90 3
Index: sqlite-3.3.16/ext/fts1/fts1_porter.c
--- sqlite-3.3.16/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.16/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d103 3
a105 3
Index: sqlite-3.3.16/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.16/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.16/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d118 3
a120 3
Index: sqlite-3.3.16/sqlite3.pc.in
--- sqlite-3.3.16/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.16/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.27
log
@upgrading package: sqlite 3.3.14 -> 3.3.15
@
text
@d28 3
a30 3
Index: sqlite-3.3.15/Makefile.in
--- sqlite-3.3.15/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.15/Makefile.in	2006-12-18 09:51:03 +0100
d59 3
a61 3
Index: sqlite-3.3.15/configure
--- sqlite-3.3.15/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.15/configure	2006-12-18 09:51:03 +0100
d73 3
a75 3
Index: sqlite-3.3.15/ext/fts1/fts1.c
--- sqlite-3.3.15/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.15/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d88 3
a90 3
Index: sqlite-3.3.15/ext/fts1/fts1_porter.c
--- sqlite-3.3.15/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.15/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d103 3
a105 3
Index: sqlite-3.3.15/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.15/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.15/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d118 3
a120 3
Index: sqlite-3.3.15/sqlite3.pc.in
--- sqlite-3.3.15/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.15/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.26
log
@upgrading package: sqlite 3.3.13 -> 3.3.14
@
text
@d28 3
a30 3
Index: sqlite-3.3.14/Makefile.in
--- sqlite-3.3.14/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.14/Makefile.in	2006-12-18 09:51:03 +0100
d59 3
a61 3
Index: sqlite-3.3.14/configure
--- sqlite-3.3.14/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.14/configure	2006-12-18 09:51:03 +0100
d73 3
a75 3
Index: sqlite-3.3.14/ext/fts1/fts1.c
--- sqlite-3.3.14/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.14/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d88 3
a90 3
Index: sqlite-3.3.14/ext/fts1/fts1_porter.c
--- sqlite-3.3.14/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.14/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d103 3
a105 3
Index: sqlite-3.3.14/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.14/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.14/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d118 3
a120 3
Index: sqlite-3.3.14/sqlite3.pc.in
--- sqlite-3.3.14/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.14/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.25
log
@modifying package: sqlite-3.3.13 20070326 -> 20070402
@
text
@d28 3
a30 3
Index: sqlite-3.3.13/Makefile.in
--- sqlite-3.3.13/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.13/Makefile.in	2006-12-18 09:51:03 +0100
d59 3
a61 3
Index: sqlite-3.3.13/configure
--- sqlite-3.3.13/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.13/configure	2006-12-18 09:51:03 +0100
d73 3
a75 3
Index: sqlite-3.3.13/ext/fts1/fts1.c
--- sqlite-3.3.13/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.13/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d88 3
a90 3
Index: sqlite-3.3.13/ext/fts1/fts1_porter.c
--- sqlite-3.3.13/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.13/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d103 3
a105 3
Index: sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d118 3
a120 3
Index: sqlite-3.3.13/sqlite3.pc.in
--- sqlite-3.3.13/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.13/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.24
log
@apply a bugfix from the PHP CVS to the ancient SQLite 2.x sources
@
text
@d128 3
a130 3
Index: sqliteodbc-0.73/Makefile.in
--- sqliteodbc-0.73/Makefile.in.orig	2007-02-04 12:23:36 +0100
+++ sqliteodbc-0.73/Makefile.in	2007-02-11 11:43:15 +0100
@


1.23
log
@modifying package: sqlite-3.3.13 20070213 -> 20070219
@
text
@d16 12
@


1.22
log
@upgrading package: sqlite 3.3.12 -> 3.3.13
@
text
@d116 3
a118 3
Index: sqliteodbc-0.72/Makefile.in
--- sqliteodbc-0.72/Makefile.in.orig	2007-02-04 12:23:36 +0100
+++ sqliteodbc-0.72/Makefile.in	2007-02-11 11:43:15 +0100
@


1.21
log
@modifying package: sqlite-3.3.12 20070127 -> 20070211
@
text
@d16 3
a18 3
Index: sqlite-3.3.12/Makefile.in
--- sqlite-3.3.12/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.12/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.12/configure
--- sqlite-3.3.12/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.12/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.12/ext/fts1/fts1.c
--- sqlite-3.3.12/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.12/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.12/ext/fts1/fts1_porter.c
--- sqlite-3.3.12/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.12/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.12/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.12/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.12/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.12/sqlite3.pc.in
--- sqlite-3.3.12/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.12/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.20
log
@upgrading package: sqlite 3.3.11 -> 3.3.12
@
text
@d116 3
a118 3
Index: sqliteodbc-0.71/Makefile.in
--- sqliteodbc-0.71/Makefile.in.orig	2006-07-03 07:51:27 +0200
+++ sqliteodbc-0.71/Makefile.in	2006-12-18 09:51:12 +0100
d128 15
@


1.19
log
@upgrading package: sqlite 3.3.10 -> 3.3.11
@
text
@d16 3
a18 3
Index: sqlite-3.3.11/Makefile.in
--- sqlite-3.3.11/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.11/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.11/configure
--- sqlite-3.3.11/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.11/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.11/ext/fts1/fts1.c
--- sqlite-3.3.11/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.11/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.11/ext/fts1/fts1_porter.c
--- sqlite-3.3.11/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.11/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.11/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.11/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.11/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.11/sqlite3.pc.in
--- sqlite-3.3.11/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.11/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.18
log
@modifying package: sqlite-3.3.10 20070110 -> 20070111
@
text
@d16 3
a18 3
Index: sqlite-3.3.10/Makefile.in
--- sqlite-3.3.10/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.10/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.10/configure
--- sqlite-3.3.10/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.10/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.10/ext/fts1/fts1.c
--- sqlite-3.3.10/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.10/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.10/ext/fts1/fts1_porter.c
--- sqlite-3.3.10/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.10/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.10/sqlite3.pc.in
--- sqlite-3.3.10/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.10/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.17
log
@upgrading package: sqlite 3.3.9 -> 3.3.10
@
text
@d116 3
a118 3
Index: sqliteodbc-0.70/Makefile.in
--- sqliteodbc-0.70/Makefile.in.orig	2006-07-03 07:51:27 +0200
+++ sqliteodbc-0.70/Makefile.in	2006-12-18 09:51:12 +0100
@


1.16
log
@upgrading package: sqlite 3.3.8 -> 3.3.9
@
text
@d16 3
a18 3
Index: sqlite-3.3.9/Makefile.in
--- sqlite-3.3.9/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.9/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.9/configure
--- sqlite-3.3.9/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.9/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.9/ext/fts1/fts1.c
--- sqlite-3.3.9/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.9/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.9/ext/fts1/fts1_porter.c
--- sqlite-3.3.9/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.9/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.9/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.9/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.9/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.9/sqlite3.pc.in
--- sqlite-3.3.9/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.9/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.15
log
@modifying package: sqlite-3.3.8 20061218 again
@
text
@d16 3
a18 3
Index: sqlite-3.3.8/Makefile.in
--- sqlite-3.3.8/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.8/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.8/configure
--- sqlite-3.3.8/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.8/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.8/ext/fts1/fts1.c
--- sqlite-3.3.8/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.8/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.8/ext/fts1/fts1_porter.c
--- sqlite-3.3.8/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.8/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.8/sqlite3.pc.in
--- sqlite-3.3.8/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.8/sqlite3.pc.in	2006-12-18 09:51:03 +0100
@


1.14
log
@merge patches, add comments and add optional ODBC support
@
text
@d116 3
a118 3
Index: sqliteodbc-0.69/Makefile.in
--- sqliteodbc-0.69/Makefile.in.orig	2006-07-03 07:51:27 +0200
+++ sqliteodbc-0.69/Makefile.in	2006-12-18 09:51:12 +0100
@


1.13
log
@add optional FTS1 (Full-Text Search Version 1) support; remove old and incorrectly applied LIBPTHREAD hack
@
text
@d1 4
a4 4
Index: configure
--- configure.orig	2005-12-19 18:30:55 +0100
+++ configure	2006-01-11 11:50:03 +0100
@@@@ -20255,6 +20255,10 @@@@
d8 1
a13 1
 
d15 4
a18 13
Index: sqlite3.pc.in
--- sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite3.pc.in	2006-06-10 12:36:25 +0200
@@@@ -8,5 +8,5 @@@@
 Name: SQLite
 Description: SQL database engine
 Version: @@VERSION@@
-Libs: -L${libdir} -lsqlite3
+Libs: -L${libdir} -lsqlite3 @@TARGET_LIBS@@
 Cflags: -I${includedir}
Index: Makefile.in
--- Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ Makefile.in	2006-12-18 09:11:09 +0100
d47 17
a63 3
Index: ext/fts1/fts1.c
--- ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ ext/fts1/fts1.c	2006-12-18 09:04:08 +0100
d76 3
a78 3
Index: ext/fts1/fts1_porter.c
--- ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ ext/fts1/fts1_porter.c	2006-12-18 09:04:19 +0100
d91 3
a93 3
Index: ext/fts1/fts1_tokenizer1.c
--- ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ ext/fts1/fts1_tokenizer1.c	2006-12-18 09:04:31 +0100
d106 22
@


1.12
log
@make sure libraries like Solaris' librt are passed through to the SQLite 3 using application
@
text
@d25 76
@


1.12.2.1
log
@MFC: make up leeway for 2_STABLE by virtue of build-time results
@
text
@d1 4
a4 50
Index: sqlite-2.8.17/configure
--- sqlite-2.8.17/configure.orig	2005-04-24 00:43:23 +0200
+++ sqlite-2.8.17/configure	2006-12-18 09:51:03 +0100
@@@@ -20450,7 +20450,10 @@@@
   TARGET_HAVE_READLINE=0
 fi
 
-
+if [ "$ac_cv_lib_readline_readline" = "no" ]
+then
+    TARGET_HAVE_READLINE=0
+fi
 
 #########
 # Figure out whether or not we have a "usleep()" function.
Index: sqlite-3.3.8/Makefile.in
--- sqlite-3.3.8/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.8/Makefile.in	2006-12-18 09:51:03 +0100
@@@@ -132,6 +132,12 @@@@
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
          where.lo utf.lo legacy.lo vtab.lo
 
+# FTS1 support
+ifdef FTS1
+TCC    += -DSQLITE_ENABLE_FTS1 
+LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
+endif
+
 # All of the source code files.
 #
 SRC = \
@@@@ -481,6 +487,14 @@@@
 		-o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
 		libsqlite3.la $(LIBTCL)
 
+fts1.lo:	$(TOP)/ext/fts1/fts1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
+fts1_hash.lo:	$(TOP)/ext/fts1/fts1_hash.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
+fts1_porter.lo:	$(TOP)/ext/fts1/fts1_porter.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
+fts1_tokenizer1.lo:	$(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
+	$(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
 
 fulltest:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture $(TOP)/test/all.test
Index: sqlite-3.3.8/configure
--- sqlite-3.3.8/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.8/configure	2006-12-18 09:51:03 +0100
@@@@ -20472,6 +20472,10 @@@@
d15 3
a17 48
Index: sqlite-3.3.8/ext/fts1/fts1.c
--- sqlite-3.3.8/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.8/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
@@@@ -19,11 +19,7 @@@@
 #endif
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: sqlite-3.3.8/ext/fts1/fts1_porter.c
--- sqlite-3.3.8/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.8/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
@@@@ -26,11 +26,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.8/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
@@@@ -18,11 +18,7 @@@@
 
 
 #include <assert.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#else
 #include <stdlib.h>
-#endif
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
Index: sqlite-3.3.8/sqlite3.pc.in
--- sqlite-3.3.8/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.8/sqlite3.pc.in	2006-12-18 09:51:03 +0100
a24 12
Index: sqliteodbc-0.70/Makefile.in
--- sqliteodbc-0.70/Makefile.in.orig	2006-07-03 07:51:27 +0200
+++ sqliteodbc-0.70/Makefile.in	2006-12-18 09:51:12 +0100
@@@@ -6,7 +6,7 @@@@
 CC =		@@CC@@
 INSTALL =	@@INSTALL@@
 LIBTOOL =	./libtool
-CFLAGS=		@@CFLAGS@@ -DDRIVER_VER_INFO=\"@@VER_INFO@@\"
+CFLAGS=		@@CFLAGS@@ @@CPPFLAGS@@ -DDRIVER_VER_INFO=\"@@VER_INFO@@\"
 SQLITE_INC =	@@SQLITE_INC@@
 SQLITE_LIB =	@@SQLITE_LIB@@
 SQLITE_FLAGS =	-DHAVE_LIBVERSION=@@SQLITE_LIBVERSION@@ \
@


1.12.2.2
log
@MFC: fix %preun/%post scripts and upgrade to latest versions
@
text
@d16 3
a18 15
Index: sqlite-2.8.17/src/encode.c
--- sqlite-2.8.17/src/encode.c.orig	2005-04-24 00:43:22 +0200
+++ sqlite-2.8.17/src/encode.c	2007-02-23 15:28:03 +0100
@@@@ -176,6 +176,8 @@@@
   int i, e;
   unsigned char c;
   e = *(in++);
+  if (e == 0)
+    return 0;
   i = 0;
   while( (c = *(in++))!=0 ){
     if( c==1 ){
Index: sqlite-3.3.13/Makefile.in
--- sqlite-3.3.13/Makefile.in.orig	2006-10-03 14:40:42 +0200
+++ sqlite-3.3.13/Makefile.in	2006-12-18 09:51:03 +0100
d47 3
a49 3
Index: sqlite-3.3.13/configure
--- sqlite-3.3.13/configure.orig	2006-10-03 14:42:27 +0200
+++ sqlite-3.3.13/configure	2006-12-18 09:51:03 +0100
d61 3
a63 3
Index: sqlite-3.3.13/ext/fts1/fts1.c
--- sqlite-3.3.13/ext/fts1/fts1.c.orig	2006-10-08 13:16:32 +0200
+++ sqlite-3.3.13/ext/fts1/fts1.c	2006-12-18 09:51:03 +0100
d76 3
a78 3
Index: sqlite-3.3.13/ext/fts1/fts1_porter.c
--- sqlite-3.3.13/ext/fts1/fts1_porter.c.orig	2006-10-01 20:01:13 +0200
+++ sqlite-3.3.13/ext/fts1/fts1_porter.c	2006-12-18 09:51:03 +0100
d91 3
a93 3
Index: sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c
--- sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c.orig	2006-09-30 15:57:33 +0200
+++ sqlite-3.3.13/ext/fts1/fts1_tokenizer1.c	2006-12-18 09:51:03 +0100
d106 3
a108 3
Index: sqlite-3.3.13/sqlite3.pc.in
--- sqlite-3.3.13/sqlite3.pc.in.orig	2004-07-19 06:25:47 +0200
+++ sqlite-3.3.13/sqlite3.pc.in	2006-12-18 09:51:03 +0100
d116 3
a118 3
Index: sqliteodbc-0.73/Makefile.in
--- sqliteodbc-0.73/Makefile.in.orig	2007-02-04 12:23:36 +0100
+++ sqliteodbc-0.73/Makefile.in	2007-02-11 11:43:15 +0100
a127 15
@@@@ -74,10 +74,10 @@@@
 
 install-3:	libsqlite3odbc.la @@EXT_BLOBTOXY@@ @@EXT_IMPEXP@@
 		$(LIBTOOL) $(INSTALL) libsqlite3odbc.la $(DESTDIR)$(libdir)
-		test -n "@@EXT_BLOBTOXY@@" && \
-		    $(LIBTOOL) $(INSTALL) @@EXT_BLOBTOXY@@ $(DESTDIR)$(libdir)
-		test -n "@@EXT_IMPEXP@@" && \
-		    $(LIBTOOL) $(INSTALL) @@EXT_IMPEXP@@ $(DESTDIR)$(libdir)
+		if [ ".@@EXT_BLOBTOXY@@" != . ]; then \
+		    $(LIBTOOL) $(INSTALL) @@EXT_BLOBTOXY@@ $(DESTDIR)$(libdir); fi
+		if [ ".@@EXT_IMPEXP@@" != . ]; then \
+		    $(LIBTOOL) $(INSTALL) @@EXT_IMPEXP@@ $(DESTDIR)$(libdir); fi
 
 uninstall-3:
 		$(LIBTOOL) --mode=uninstall \
@


1.11
log
@upgrading package: sqlite 3.2.8 -> 3.3.0
@
text
@d15 10
@


1.10
log
@fdatasync(3) is SUSv2 function which does not exist under FreeBSD, exists under Linux and just partly exists (in librt) on Solaris. So use it under Linux only for now as we don't want the librt dependency under Solaris
@
text
@d2 3
a4 3
--- configure.orig	2004-06-03 13:36:27.000000000 +0200
+++ configure	2004-06-03 13:39:37.000000000 +0200
@@@@ -20224,6 +20224,10 @@@@
a14 12
Index: src/os_unix.c
--- src/os_unix.c.orig	2005-09-22 17:43:40.000000000 +0200
+++ src/os_unix.c	2005-09-27 12:07:05.735642470 +0200
@@@@ -829,7 +829,7 @@@@
   if( rc ) rc = fsync(fd);
 
 #else /* if !defined(F_FULLSYNC) */
-#if  defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO>0
+#if  defined(__linux__) && defined(_POSIX_SYNCHRONIZED_IO) && _POSIX_SYNCHRONIZED_IO>0
   if( dataOnly ){
     rc = fdatasync(fd);
   }else
@


1.9
log
@upgrading package: sqlite 3.2.6 -> 3.2.7
@
text
@d15 12
@


1.8
log
@change logic from not-FreeBSD to Linux as others have no fdatasync(3), too
@
text
@a14 19
Index: src/os_unix.c
--- src/os_unix.c.orig	2005-09-17 18:34:55 +0200
+++ src/os_unix.c	2005-09-18 20:33:51 +0200
@@@@ -829,11 +829,15 @@@@
   if( rc ) rc = fsync(fd);
 
 #else
+#if defined(__linux__)
   if( dataOnly ){
     rc = fdatasync(fd);
   }else{
+#endif
     rc = fsync(fd);
+#if defined(__linux__)
   }
+#endif
 #endif /* defined(F_FULLFSYNC) */
 #endif /* defined(SQLITE_NO_SYNC) */
 
@


1.7
log
@switch from v3 to v2 as the primary version of the package altough v2 is still by default provided, too (as lots of packages still require it)
@
text
@d22 1
a22 1
+#if !defined(__FreeBSD__)
d28 1
a28 1
+#if !defined(__FreeBSD__)
@


1.6
log
@upgrading package: sqlite 2.8.15 -> 2.8.16
@
text
@d4 1
a4 1
@@@@ -20447,7 +20447,10 @@@@
a7 1
-
d13 1
d15 19
a33 1
 # Figure out whether or not we have a "usleep()" function.
@


1.5
log
@modifying package: sqlite-2.8.15 20040903 again
@
text
@d4 1
a4 1
@@@@ -20451,7 +20451,10 @@@@
@


1.4
log
@upgrading package: sqlite 3.0.0 -> 3.0.1
@
text
@d4 1
a4 1
@@@@ -20483,7 +20483,10 @@@@
@


1.3
log
@use a substitution instead of a patch for future maintenance
@
text
@d4 1
a4 1
@@@@ -20450,7 +20450,10 @@@@
@


1.2
log
@similar to libxslt and xmlsec, remove the nonessential and incomplete test for a C++ preprocessor
@
text
@d2 3
a4 240
--- configure.orig	2004-03-02 19:36:54.000000000 +0100
+++ configure	2004-06-04 16:44:55.023183512 +0200
@@@@ -4179,236 +4179,6 @@@@
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
 
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@@@ -20450,7 +20220,10 @@@@
@


1.1
log
@Fixed configure to disable readline if only header files but no libraries found.
@
text
@d2 240
a241 3
--- configure.orig	2004-06-03 13:36:27.000000000 +0200
+++ configure	2004-06-03 13:39:37.000000000 +0200
@@@@ -20450,7 +20450,10 @@@@
@