From ab753fcde40b28248172c552ce2b1f23eddfc9f4 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Fri, 12 Oct 2018 16:38:39 -1000 Subject: Update more packages --- data/_sqlite3/_metadata/version | 2 +- data/_sqlite3/framework.diff | 16 -------- data/_sqlite3/host.diff | 32 ---------------- data/_sqlite3/make.sh | 4 +- data/_sqlite3/misuse.diff | 53 -------------------------- data/_sqlite3/sqlite-3.5.9.tar.gz | Bin 2201083 -> 0 bytes data/_sqlite3/sqlite-autoconf-3240000.tar.gz | Bin 0 -> 2699252 bytes data/_sqlite3/tempdir.diff | 54 --------------------------- 8 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 data/_sqlite3/framework.diff delete mode 100644 data/_sqlite3/host.diff delete mode 100644 data/_sqlite3/misuse.diff delete mode 100644 data/_sqlite3/sqlite-3.5.9.tar.gz create mode 100644 data/_sqlite3/sqlite-autoconf-3240000.tar.gz delete mode 100644 data/_sqlite3/tempdir.diff (limited to 'data/_sqlite3') diff --git a/data/_sqlite3/_metadata/version b/data/_sqlite3/_metadata/version index 62841113a..954e22882 100644 --- a/data/_sqlite3/_metadata/version +++ b/data/_sqlite3/_metadata/version @@ -1 +1 @@ -3.5.9 +3.24.0 diff --git a/data/_sqlite3/framework.diff b/data/_sqlite3/framework.diff deleted file mode 100644 index f336c83dc..000000000 --- a/data/_sqlite3/framework.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru sqlite-3.5.9/Makefile.in sqlite-3.5.9+iPhone/Makefile.in ---- sqlite-3.5.9/Makefile.in 2008-05-12 17:10:26.000000000 +0000 -+++ sqlite-3.5.9+iPhone/Makefile.in 2008-08-01 08:21:45.000000000 +0000 -@@ -413,10 +413,12 @@ - - libsqlite3.la: $(LIBOBJ) - $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ -+ -framework CoreFoundation -framework Foundation \ - ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" - - libtclsqlite3.la: tclsqlite.lo libsqlite3.la - $(LTLINK) -o $@ tclsqlite.lo \ -+ -framework CoreFoundation -framework Foundation \ - $(LIBOBJ) @TCL_STUB_LIB_SPEC@ $(TLIBS) \ - -rpath "$(libdir)/sqlite" \ - -version-info "8:6:8" diff --git a/data/_sqlite3/host.diff b/data/_sqlite3/host.diff deleted file mode 100644 index b6e8ac8b5..000000000 --- a/data/_sqlite3/host.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff -ru sqlite-3.5.9/configure.ac sqlite-3.5.9+iPhone/configure.ac ---- sqlite-3.5.9/configure.ac 2008-05-07 12:18:23.000000000 +0000 -+++ sqlite-3.5.9+iPhone/configure.ac 2009-08-11 11:52:36.000000000 +0000 -@@ -163,8 +163,8 @@ - - ######### - # Check to see if the --with-hints=FILE option is used. If there is none, --# then check for a files named "$host.hints" and ../$hosts.hints where --# $host is the hostname of the build system. If still no hints are -+# then check for a files named "$host_.hints" and ../$hosts_.hints where -+# $host_ is the hostname of the build system. If still no hints are - # found, try looking in $system.hints and ../$system.hints where - # $system is the result of uname -s. - # -@@ -172,12 +172,12 @@ - AC_HELP_STRING([--with-hints=FILE],[Read configuration options from FILE]), - hints=$withval) - if test "$hints" = ""; then -- host=`hostname | sed 's/\..*//'` -- if test -r $host.hints; then -- hints=$host.hints -+ host_=`hostname | sed 's/\..*//'` -+ if test -r $host_.hints; then -+ hints=$host_.hints - else -- if test -r ../$host.hints; then -- hints=../$host.hints -+ if test -r ../$host_.hints; then -+ hints=../$host_.hints - fi - fi - fi diff --git a/data/_sqlite3/make.sh b/data/_sqlite3/make.sh index c3179fbb1..a4df3a1ee 100644 --- a/data/_sqlite3/make.sh +++ b/data/_sqlite3/make.sh @@ -1,5 +1,5 @@ pkg:setup -autoconf -pkg:configure --with-readline-inc=-I"$(PKG_DEST_ readline)"/usr/include/readline --with-readline-lib=-lreadline +automake -a -c -f 2>/dev/null || true +pkg:configure --with-readline-inc=-I"$(PKG_DEST_ readline)"/usr/include/readline --with-readline-lib=-lreadline --disable-tcl make pkg:install diff --git a/data/_sqlite3/misuse.diff b/data/_sqlite3/misuse.diff deleted file mode 100644 index 0e7b79255..000000000 --- a/data/_sqlite3/misuse.diff +++ /dev/null @@ -1,53 +0,0 @@ -diff -ru sqlite-3.5.9/src/vdbeapi.c sqlite-3.5.9+iPhone/src/vdbeapi.c ---- sqlite-3.5.9/src/vdbeapi.c 2008-05-13 12:52:46.000000000 +0000 -+++ sqlite-3.5.9+iPhone/src/vdbeapi.c 2008-08-01 03:22:00.000000000 +0000 -@@ -1072,6 +1072,9 @@ - int sqlite3_bind_double(sqlite3_stmt *pStmt, int i, double rValue){ - int rc; - Vdbe *p = (Vdbe *)pStmt; -+ if( p==0 ){ -+ return SQLITE_MISUSE; -+ } - sqlite3_mutex_enter(p->db->mutex); - rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ -@@ -1086,6 +1089,9 @@ - int sqlite3_bind_int64(sqlite3_stmt *pStmt, int i, sqlite_int64 iValue){ - int rc; - Vdbe *p = (Vdbe *)pStmt; -+ if( p==0 ){ -+ return SQLITE_MISUSE; -+ } - sqlite3_mutex_enter(p->db->mutex); - rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ -@@ -1097,6 +1103,9 @@ - int sqlite3_bind_null(sqlite3_stmt *pStmt, int i){ - int rc; - Vdbe *p = (Vdbe*)pStmt; -+ if( p==0 ){ -+ return SQLITE_MISUSE; -+ } - sqlite3_mutex_enter(p->db->mutex); - rc = vdbeUnbind(p, i); - sqlite3_mutex_leave(p->db->mutex); -@@ -1125,6 +1134,9 @@ - int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){ - int rc; - Vdbe *p = (Vdbe *)pStmt; -+ if( p==0 ){ -+ return SQLITE_MISUSE; -+ } - sqlite3_mutex_enter(p->db->mutex); - rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ -@@ -1137,6 +1149,9 @@ - int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){ - int rc; - Vdbe *p = (Vdbe *)pStmt; -+ if( p==0 ){ -+ return SQLITE_MISUSE; -+ } - sqlite3_mutex_enter(p->db->mutex); - rc = vdbeUnbind(p, i); - if( rc==SQLITE_OK ){ diff --git a/data/_sqlite3/sqlite-3.5.9.tar.gz b/data/_sqlite3/sqlite-3.5.9.tar.gz deleted file mode 100644 index 92bb8af07..000000000 Binary files a/data/_sqlite3/sqlite-3.5.9.tar.gz and /dev/null differ diff --git a/data/_sqlite3/sqlite-autoconf-3240000.tar.gz b/data/_sqlite3/sqlite-autoconf-3240000.tar.gz new file mode 100644 index 000000000..ad4be6eaa Binary files /dev/null and b/data/_sqlite3/sqlite-autoconf-3240000.tar.gz differ diff --git a/data/_sqlite3/tempdir.diff b/data/_sqlite3/tempdir.diff deleted file mode 100644 index c4a411e9b..000000000 --- a/data/_sqlite3/tempdir.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru sqlite-3.5.9/src/os_unix.c sqlite-3.5.9+iPhone/src/os_unix.c ---- sqlite-3.5.9/src/os_unix.c 2008-05-13 12:51:29.000000000 +0000 -+++ sqlite-3.5.9+iPhone/src/os_unix.c 2008-08-01 08:18:14.000000000 +0000 -@@ -75,6 +75,10 @@ - */ - #define MAX_PATHNAME 512 - -+#ifdef __APPLE__ -+#import -+#endif -+ - - /* - ** The unixFile structure is subclass of sqlite3_file specific for the unix -@@ -2497,6 +2501,7 @@ - static int unixGetTempname(sqlite3_vfs *pVfs, int nBuf, char *zBuf){ - static const char *azDirs[] = { - 0, -+ 0, - "/var/tmp", - "/usr/tmp", - "/tmp", -@@ -2509,6 +2514,12 @@ - int i, j; - struct stat buf; - const char *zDir = "."; -+#ifdef __APPLE__ -+ void *pool; -+ CFStringRef cfstr; -+ CFIndex maxsize; -+ char *cstr; -+#endif - - /* It's odd to simulate an io-error here, but really this is just - ** using the io-error infrastructure to test that SQLite handles this -@@ -2516,6 +2526,18 @@ - */ - SimulateIOError( return SQLITE_ERROR ); - -+#ifdef __APPLE__ -+ if (azDirs[1] == NULL) { -+ pool = NSPushAutoreleasePool(0); -+ cfstr = (CFStringRef) NSTemporaryDirectory(); -+ maxsize = CFStringGetMaximumSizeForEncoding(CFStringGetLength(cfstr), kCFStringEncodingUTF8) + 1; -+ cstr = malloc(maxsize); -+ CFStringGetCString(cfstr, cstr, maxsize, kCFStringEncodingUTF8); -+ azDirs[1] = cstr; -+ NSPopAutoreleasePool(pool); -+ } -+#endif -+ - azDirs[0] = sqlite3_temp_directory; - for(i=0; i