cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to sqlite-3.6.12. full bulk build done by jasper@

Browse Source 
"go ahead" sthen@, ok fgs@, jasper@, simon@
This commit is contained in:
martynas 2009-04-16 20:09:58 +00:00
parent 56c787888b
commit 8e453aeab5
8 changed files with 39 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
databases/sqlite3/Makefile
View File

@ -1,16 +1,16 @@
# $OpenBSD: Makefile,v 1.43 2009/04/05 00:02:53 martynas Exp $
# $OpenBSD: Makefile,v 1.44 2009/04/16 20:09:58 martynas Exp $
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
V= 3.6.11
V= 3.6.12
DISTNAME= sqlite-${V}
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
PKGNAME-lemon= lemon-${V}
CATEGORIES= databases
SHARED_LIBS += sqlite3 13.1 # .8.6
SHARED_LIBS += tclsqlite3 12.1 # .8.6
SHARED_LIBS += sqlite3 13.2 # .8.6
SHARED_LIBS += tclsqlite3 12.2 # .8.6
MASTER_SITES= ${HOMEPAGE}
@ -32,11 +32,6 @@ CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
--enable-threads-override-locks
# XXX gcc bug? some regress tests crash w/-O2 but not -Os
.if ${MACHINE_ARCH} == "amd64"
CFLAGS+=-Os
.endif
PSEUDO_FLAVORS= no_tcl
.if ${MACHINE_ARCH} != "m88k" && ${MACHINE_ARCH} != "vax"
FLAVOR?=

10
databases/sqlite3/distinfo
View File

@ -1,5 +1,5 @@
MD5 (sqlite-3.6.11.tar.gz) = frsJlpardsxv9l3UltF4WA==
RMD160 (sqlite-3.6.11.tar.gz) = w42CyD9dZM+zAuMjLFB7r7C2TnQ=
SHA1 (sqlite-3.6.11.tar.gz) = vRw3F4TZkPe16ZyEHljeuH+/S24=
SHA256 (sqlite-3.6.11.tar.gz) = /Qe+ebTU6EU2deFCkHp3fQd3bsKz4qn03XZFon/NKKE=
SIZE (sqlite-3.6.11.tar.gz) = 2804714
MD5 (sqlite-3.6.12.tar.gz) = E2AIZaaaP1TSrEKg1rdD2w==
RMD160 (sqlite-3.6.12.tar.gz) = xFXdf12sOrdbHA5Yypp2bn+xk3g=
SHA1 (sqlite-3.6.12.tar.gz) = Bf+0hNJkAw3kHuS94JFb8ZANXzI=
SHA256 (sqlite-3.6.12.tar.gz) = lsI8HpCAjwbkAA4eMl81R9ocOLFkojeqsRhPoNoykgE=
SIZE (sqlite-3.6.12.tar.gz) = 2769510

18
databases/sqlite3/patches/patch-Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
--- Makefile.in.orig Sun Feb 15 15:07:08 2009
+++ Makefile.in Sun Mar 22 13:28:08 2009
@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.l
$OpenBSD: patch-Makefile_in,v 1.13 2009/04/16 20:09:58 martynas Exp $
--- Makefile.in.orig Mon Mar 30 19:37:16 2009
+++ Makefile.in Sun Apr 5 11:14:52 2009
@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.l
table.lo tokenize.lo trigger.lo update.lo \
util.lo vacuum.lo \
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo \
@ -15,7 +15,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
# Determine the real value of LIBOBJ based on the 'configure' script
#
@@ -273,7 +273,8 @@ SRC = \
@@ -274,7 +274,8 @@ SRC = \
$(TOP)/src/vdbeInt.h \
$(TOP)/src/vtab.c \
$(TOP)/src/walker.c \
@ -25,7 +25,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
# Generated source code files
#
@@ -438,7 +439,7 @@ HDR += \
@@ -439,7 +440,7 @@ HDR += \
# hidden when the library is built via the amalgamation).
#
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@ -34,7 +34,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
@@ -466,7 +467,7 @@ libsqlite3.la: $(LIBOBJ)
@@ -467,7 +468,7 @@ libsqlite3.la: $(LIBOBJ)
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite.lo \
@ -43,7 +43,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
-rpath "$(TCLLIBDIR)" \
-version-info "8:6:8" \
-avoid-version
@@ -504,6 +505,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
@@ -505,6 +506,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
sqlite3.lo: sqlite3.c
$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
@ -53,7 +53,7 @@ $OpenBSD: patch-Makefile_in,v 1.12 2009/04/05 00:02:54 martynas Exp $
# Rules to build individual files
#
alter.lo: $(TOP)/src/alter.c $(HDR)
@@ -799,6 +803,8 @@ clean:
@@ -808,6 +812,8 @@ clean:
distclean: clean
rm -f config.log config.status libtool Makefile sqlite3.pc

10
databases/sqlite3/patches/patch-src_os_unix_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_os_unix_c,v 1.7 2009/04/05 00:02:54 martynas Exp $
--- src/os_unix.c.orig Sun Feb 15 15:07:09 2009
+++ src/os_unix.c Mon Mar 23 12:53:43 2009
$OpenBSD: patch-src_os_unix_c,v 1.8 2009/04/16 20:09:58 martynas Exp $
--- src/os_unix.c.orig Tue Mar 31 03:40:16 2009
+++ src/os_unix.c Sun Apr 5 11:14:52 2009
@@ -111,6 +111,14 @@
# define _LARGEFILE_SOURCE 1
#endif
@ -107,7 +107,7 @@ $OpenBSD: patch-src_os_unix_c,v 1.7 2009/04/05 00:02:54 martynas Exp $
static int transferOwnership(unixFile *pFile){
int rc;
pthread_t hSelf;
@@ -3950,7 +3961,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
@@ -3964,7 +3975,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
#if !defined(SQLITE_TEST)
{
int pid, fd;
@ -116,7 +116,7 @@ $OpenBSD: patch-src_os_unix_c,v 1.7 2009/04/05 00:02:54 martynas Exp $
if( fd<0 ){
time_t t;
time(&t);
@@ -4253,7 +4264,7 @@ static int proxyGenerateHostID(char *pHostID){
@@ -4269,7 +4280,7 @@ static int proxyGenerateHostID(char *pHostID){
memset(key, 0, HOSTIDLEN);
len = 0;

10
databases/sqlite3/patches/patch-src_sqliteInt_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_sqliteInt_h,v 1.3 2009/01/31 15:49:34 simon Exp $
--- src/sqliteInt.h.orig Thu Jan 15 15:01:47 2009
+++ src/sqliteInt.h Tue Jan 27 10:20:56 2009
$OpenBSD: patch-src_sqliteInt_h,v 1.4 2009/04/16 20:09:58 martynas Exp $
--- src/sqliteInt.h.orig Mon Mar 30 19:37:16 2009
+++ src/sqliteInt.h Sun Apr 5 11:14:52 2009
@@ -35,11 +35,6 @@
#pragma warn -spa /* Suspicious pointer arithmetic */
#endif
@ -57,5 +57,5 @@ $OpenBSD: patch-src_sqliteInt_h,v 1.3 2009/01/31 15:49:34 simon Exp $
+#define LARGEST_INT64 INT64_MAX
+#define SMALLEST_INT64 INT64_MIN
/*
** An instance of the following structure is used to store the busy-handler
/*
** Round up a number to the next larger multiple of 8. This is used

14
databases/sqlite3/patches/patch-src_sqlite_h_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_sqlite_h_in,v 1.2 2008/10/27 17:14:18 simon Exp $
--- src/sqlite.h.in.orig Tue Oct 14 20:07:41 2008
+++ src/sqlite.h.in Sat Oct 25 19:39:50 2008
$OpenBSD: patch-src_sqlite_h_in,v 1.3 2009/04/16 20:09:58 martynas Exp $
--- src/sqlite.h.in.orig Mon Mar 30 19:37:16 2009
+++ src/sqlite.h.in Sun Apr 5 11:14:53 2009
@@ -35,6 +35,7 @@
#ifndef _SQLITE3_H_
#define _SQLITE3_H_
@ -9,9 +9,9 @@ $OpenBSD: patch-src_sqlite_h_in,v 1.2 2008/10/27 17:14:18 simon Exp $
/*
** Make sure we can call this stuff from C++.
@@ -215,6 +216,9 @@ typedef struct sqlite3 sqlite3;
** {H10202} The [sqlite_uint64] and [sqlite3_uint64] type shall specify
** a 64-bit unsigned integer.
@@ -186,6 +187,9 @@ typedef struct sqlite3 sqlite3;
**
** Requirements: [H10201] [H10202]
*/
+typedef int64_t sqlite_int64;
+typedef uint64_t sqlite_uint64;
@ -19,7 +19,7 @@ $OpenBSD: patch-src_sqlite_h_in,v 1.2 2008/10/27 17:14:18 simon Exp $
#ifdef SQLITE_INT64_TYPE
typedef SQLITE_INT64_TYPE sqlite_int64;
typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
@@ -224,6 +228,7 @@ typedef struct sqlite3 sqlite3;
@@ -195,6 +199,7 @@ typedef struct sqlite3 sqlite3;
#else
typedef long long int sqlite_int64;
typedef unsigned long long int sqlite_uint64;

8
databases/sqlite3/patches/patch-src_test1_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_test1_c,v 1.2 2009/04/05 00:02:54 martynas Exp $
$OpenBSD: patch-src_test1_c,v 1.3 2009/04/16 20:09:58 martynas Exp $
Fix test on big endian arches. Bug filed upstream at
http://www.sqlite.org/cvstrac/tktview?tn=3621
--- src/test1.c.orig Sun Feb 15 15:07:11 2009
+++ src/test1.c Sun Mar 22 13:23:03 2009
@@ -1200,7 +1200,7 @@ static int sqlite3_mprintf_int(
--- src/test1.c.orig Mon Mar 30 19:37:16 2009
+++ src/test1.c Sun Apr 5 11:14:53 2009
@@ -1201,7 +1201,7 @@ static int sqlite3_mprintf_int(
int argc, /* Number of arguments */
char **argv /* Text of each argument */
){

13
databases/sqlite3/patches/patch-test_backup2_test
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-test_backup2_test,v 1.2 2009/04/05 07:52:17 martynas Exp $
--- test/backup2.test.orig Wed Feb 11 18:06:19 2009
+++ test/backup2.test Tue Mar 24 14:00:28 2009
@@ -111,8 +111,8 @@ do_test backup2-6 {
# Try to backup to something that is not a database file.
#
do_test backup2-7 {
- catch {file attributes bu2.db -permissions rw-------}
catch {file attributes bu2.db -readonly 0}
+ catch {file attributes bu2.db -permissions rw-------}
set out [open bu2.db w]
puts $out "This is not a valid database file"
close $out