diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/02-use-packaged-lempar.c.patch | 18 | ||||
| -rw-r--r-- | debian/patches/10-520466-libsqlite3-depends-on-libdl.patch | 43 | ||||
| -rw-r--r-- | debian/patches/10-520478-squash-bad-deps.patch | 18 | ||||
| -rw-r--r-- | debian/patches/10-665363-disable-malloc-usable-size.patch | 17 | ||||
| -rw-r--r-- | debian/patches/20-hurd-locking-style.patch | 47 | ||||
| -rw-r--r-- | debian/patches/30-cross.patch | 63 | ||||
| -rw-r--r-- | debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch | 23 | ||||
| -rw-r--r-- | debian/patches/32-dynamic_link.patch | 14 | ||||
| -rw-r--r-- | debian/patches/40-amalgamation_configure.patch | 37 | ||||
| -rw-r--r-- | debian/patches/series | 9 |
10 files changed, 289 insertions, 0 deletions
diff --git a/debian/patches/02-use-packaged-lempar.c.patch b/debian/patches/02-use-packaged-lempar.c.patch new file mode 100644 index 0000000..273d359 --- /dev/null +++ b/debian/patches/02-use-packaged-lempar.c.patch @@ -0,0 +1,18 @@ +Description: use packaged lempar.c + Look for lempar.c under the package directory. +Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> +Last-Update: 2020-12-04 + +--- + +--- a/tool/lemon.c ++++ b/tool/lemon.c +@@ -3673,6 +3673,8 @@ PRIVATE FILE *tplt_open(struct lemon *le + tpltname = buf; + }else if( access(templatename,004)==0 ){ + tpltname = templatename; ++ }else if( access("/usr/share/lemon/lempar.c",004)==0 ){ ++ tpltname = "/usr/share/lemon/lempar.c"; + }else{ + toFree = tpltname = pathsearch(lemp->argv0,templatename,0); + } diff --git a/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch new file mode 100644 index 0000000..150b8bd --- /dev/null +++ b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch @@ -0,0 +1,43 @@ +Index: sqlite3-3.7.17/configure.ac +=================================================================== +--- sqlite3-3.7.17.orig/configure.ac 2013-05-20 12:56:30.000000000 +0200 ++++ sqlite3-3.7.17/configure.ac 2013-05-21 22:20:46.000000000 +0200 +@@ -233,6 +233,38 @@ + AC_SUBST(BUILD_CC) + + ########## ++# Do we want to support load_extension()? ++# ++AC_ARG_ENABLE(load-extension, ++AC_HELP_STRING([--enable-load-extension], ++ [Include SQL functions for loading extension libraries]),, ++ enable_load_extension=auto) ++ ++if test "x$enable_load_extension" = xyes || ++ test "x$enable_load_extension" = xauto; then ++ ++ can_load_extension=yes ++ # libtool will already have looked for <dlfcn.h> ++ if test $ac_cv_header_dlfcn_h = no; then ++ can_load_extension=no ++ else ++ AC_SEARCH_LIBS(dlopen, dl, , [can_load_extension=no]) ++ fi ++elif test "x$enable_load_extension" = xno; then ++ can_load_extension=no ++else ++ AC_MSG_ERROR([invalid argument to --enable-load-extension]) ++fi ++ ++if test $can_load_extension = no; then ++ if test "x$enable_load_extension" = xyes; then ++ AC_MSG_ERROR([<dlfcn.h> routines missing, load_extension() not supported]) ++ fi ++ AC_DEFINE(SQLITE_OMIT_LOAD_EXTENSION, 1, ++ [Define if the load_extension() sql function should be omitted.]) ++fi ++ ++########## + # Do we want to support multithreaded use of sqlite + # + AC_ARG_ENABLE(threadsafe, diff --git a/debian/patches/10-520478-squash-bad-deps.patch b/debian/patches/10-520478-squash-bad-deps.patch new file mode 100644 index 0000000..665ab27 --- /dev/null +++ b/debian/patches/10-520478-squash-bad-deps.patch @@ -0,0 +1,18 @@ +--- sqlite3-3.9.1.orig/Makefile.in ++++ sqlite3-3.9.1/Makefile.in +@@ -597,6 +597,7 @@ sqlite3.pc: $(TOP)/sqlite3.pc.in + libsqlite3.la: $(LIBOBJ) + $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \ + ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" ++ sed -i "/dependency_libs/s/'.*'/''/" $@ + + libtclsqlite3.la: tclsqlite.lo libsqlite3.la + $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ +@@ -604,6 +605,7 @@ libtclsqlite3.la: tclsqlite.lo libsqlite + -rpath "$(TCLLIBDIR)" \ + -version-info "8:6:8" \ + -avoid-version ++ sed -i "/dependency_libs/s/'.*'/''/" $@ + + sqlite3$(TEXE): shell.c sqlite3.c + $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ diff --git a/debian/patches/10-665363-disable-malloc-usable-size.patch b/debian/patches/10-665363-disable-malloc-usable-size.patch new file mode 100644 index 0000000..a4371ff --- /dev/null +++ b/debian/patches/10-665363-disable-malloc-usable-size.patch @@ -0,0 +1,17 @@ +Description: Disable malloc_usable_size + Disable code introduced in sqlite 3.7.10 using malloc_usable_size, as it caused + a regression on 64-bit platforms. +Author: Steven Chamberlain <steven@pyro.eu.org> +Bug-Debian: http://bugs.debian.org/665363 + +--- sqlite3-3.7.11.orig/configure.ac ++++ sqlite3-3.7.11/configure.ac +@@ -108,7 +108,7 @@ AC_CHECK_HEADERS([sys/types.h stdlib.h s + ######### + # Figure out whether or not we have these functions + # +-AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64]) ++AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s strchrnul usleep utime pread pread64 pwrite pwrite64]) + + ######### + # By default, we use the amalgamation (this may be changed below...) diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch new file mode 100644 index 0000000..0667d25 --- /dev/null +++ b/debian/patches/20-hurd-locking-style.patch @@ -0,0 +1,47 @@ +--- a/src/os_unix.c ++++ b/src/os_unix.c +@@ -85,7 +85,7 @@ + # include <sys/mman.h> + #endif + +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + # include <sys/ioctl.h> + # include <sys/file.h> + # include <sys/param.h> +@@ -2236,7 +2236,7 @@ + ** + ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off + */ +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + + /* + ** Retry flock() calls that fail with EINTR +@@ -5039,7 +5039,7 @@ + 0 /* xShmMap method */ + ) + +-#if SQLITE_ENABLE_LOCKING_STYLE ++#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) + IOMETHODS( + flockIoFinder, /* Finder function name */ + flockIoMethods, /* sqlite3_io_methods object name */ +@@ -7505,6 +7505,8 @@ + UNIXVFS("unix", autolockIoFinder ), + #elif OS_VXWORKS + UNIXVFS("unix", vxworksIoFinder ), ++#elif defined(__GNU__) ++ UNIXVFS("unix", flockIoFinder ), + #else + UNIXVFS("unix", posixIoFinder ), + #endif +@@ -7514,7 +7516,7 @@ + #if OS_VXWORKS + UNIXVFS("unix-namedsem", semIoFinder ), + #endif +-#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS ++#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS || defined(__GNU__) + UNIXVFS("unix-posix", posixIoFinder ), + #endif + #if SQLITE_ENABLE_LOCKING_STYLE diff --git a/debian/patches/30-cross.patch b/debian/patches/30-cross.patch new file mode 100644 index 0000000..0ec7db1 --- /dev/null +++ b/debian/patches/30-cross.patch @@ -0,0 +1,63 @@ +Index: sqlite3/Makefile.in +=================================================================== +--- sqlite3.orig/Makefile.in ++++ sqlite3/Makefile.in +@@ -799,10 +799,20 @@ sqlite3.lo: sqlite3.c + + # Rules to build the LEMON compiler generator + # +-lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c ++lemon-for-build$(BEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c + $(BCC) -o $@ $(TOP)/tool/lemon.c + cp $(TOP)/tool/lempar.c . + ++lemon$(TEXE): $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c ++ $(LTLINK) -o $@ $(TOP)/tool/lemon.c ++ cp $(TOP)/tool/lempar.c . ++ ++ifeq ($(CROSS_BUILDING),yes) ++LEMON_FOR_BUILD = lemon-for-build$(BEXE) ++else ++LEMON_FOR_BUILD = lemon$(TEXE) ++endif ++ + # Rules to build the program that generates the source-id + # + mksourceid$(BEXE): $(TOP)/tool/mksourceid.c +@@ -1087,9 +1087,9 @@ opcodes.h: parse.h $(TOP)/src/vdbe.c $(T + # + parse.h: parse.c + +-parse.c: $(TOP)/src/parse.y lemon$(BEXE) ++parse.c: $(TOP)/src/parse.y $(LEMON_FOR_BUILD) + cp $(TOP)/src/parse.y . +- ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y ++ ./$(LEMON_FOR_BUILD) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y + + sqlite3.h: $(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) $(TOP)/VERSION + $(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h +@@ -1225,10 +1225,10 @@ FTS5_SRC = \ + $(TOP)/ext/fts5/fts5_varint.c \ + $(TOP)/ext/fts5/fts5_vocab.c \ + +-fts5parse.c: $(TOP)/ext/fts5/fts5parse.y lemon$(BEXE) ++fts5parse.c: $(TOP)/ext/fts5/fts5parse.y $(LEMON_FOR_BUILD) + cp $(TOP)/ext/fts5/fts5parse.y . + rm -f fts5parse.h +- ./lemon$(BEXE) $(OPTS) -S fts5parse.y ++ ./$(LEMON_FOR_BUILD)$(BEXE) $(OPTS) -S fts5parse.y + + fts5parse.h: fts5parse.c + +@@ -1496,7 +1496,10 @@ clean: + rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la + rm -f sqlite3.h opcodes.* + rm -rf .libs .deps +- rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz ++ rm -f $(LEMON_FOR_BUILD) lempar.c parse.* sqlite*.tar.gz ++ifeq ($(CROSS_BUILDING), yes) ++ rm -f lemon$(TEXE) ++endif + rm -f mkkeywordhash$(BEXE) keywordhash.h + rm -f mksourceid$(BEXE) + rm -f *.da *.bb *.bbg gmon.out diff --git a/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch b/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch new file mode 100644 index 0000000..0a4e68b --- /dev/null +++ b/debian/patches/31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch @@ -0,0 +1,23 @@ +Description: increase the maximum possible value of the page size + Firefox/Iceweasel uses a page size of 32k, but sqlite won't allow it + because the maximum it allows by default is 8k (through the + SQLITE_MAX_DEFAULT_PAGE_SIZE define). This patch increases this limit. + . +Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> +Bug-Debian: http://bugs.debian.org/672573 +Forwarded: <not-needed> +Last-Update: 2019-12-29 + +--- + +--- sqlite3-3.7.12.orig/src/sqliteLimit.h ++++ sqlite3-3.7.12/src/sqliteLimit.h +@@ -171,7 +171,7 @@ + ** SQLite will choose on its own. + */ + #ifndef SQLITE_MAX_DEFAULT_PAGE_SIZE +-# define SQLITE_MAX_DEFAULT_PAGE_SIZE 8192 ++# define SQLITE_MAX_DEFAULT_PAGE_SIZE 32768 + #endif + #if SQLITE_MAX_DEFAULT_PAGE_SIZE>SQLITE_MAX_PAGE_SIZE + # undef SQLITE_MAX_DEFAULT_PAGE_SIZE diff --git a/debian/patches/32-dynamic_link.patch b/debian/patches/32-dynamic_link.patch new file mode 100644 index 0000000..55ab04b --- /dev/null +++ b/debian/patches/32-dynamic_link.patch @@ -0,0 +1,14 @@ +--- sqlite3-3.38.3.orig/Makefile.in ++++ sqlite3-3.38.3/Makefile.in +@@ -672,9 +672,9 @@ + -avoid-version + sed -i "/dependency_libs/s/'.*'/''/" $@ + +-sqlite3$(TEXE): shell.c sqlite3.c ++sqlite3$(TEXE): shell.c libsqlite3.la + $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ +- shell.c sqlite3.c \ ++ shell.c libsqlite3.la \ + $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" + + sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h diff --git a/debian/patches/40-amalgamation_configure.patch b/debian/patches/40-amalgamation_configure.patch new file mode 100644 index 0000000..1ae1a95 --- /dev/null +++ b/debian/patches/40-amalgamation_configure.patch @@ -0,0 +1,37 @@ +--- sqlite-src-3370000/configure.ac.orig 2021-11-27 16:05:17.000000000 +0100 ++++ sqlite-src-3370000/configure.ac 2021-12-03 21:21:47.506868981 +0100 +@@ -116,6 +116,13 @@ + USE_AMALGAMATION=1 + + ######### ++# By default, amalgamation sqlite3.c will have #line directives. ++# This is a build option not shown by ./configure --help ++# To control it, use configure option: amalgamation_line_macros=? ++# where ? is no to suppress #line directives or yes to create them. ++AMALGAMATION_LINE_MACROS=--linemacros=0 ++ ++######### + # See whether we can run specific tclsh versions known to work well; + # if not, then we fall back to plain tclsh. + # TODO: try other versions before falling back? +@@ -606,6 +613,20 @@ + fi + AC_SUBST(USE_AMALGAMATION) + ++######## ++# See whether --disable ++if test "${amalgamation_line_macros+set}" = set; then : ++ enableval=$amalgamation_line_macros; ++fi ++ ++if test "${amalgamation_line_macros}" = "yes" ; then ++ AMALGAMATION_LINE_MACROS=--linemacros=1 ++fi ++if test "${amalgamation_line_macros}" = "no" ; then ++ AMALGAMATION_LINE_MACROS=--linemacros=0 ++fi ++AC_SUBST(AMALGAMATION_LINE_MACROS) ++ + ######### + # Look for zlib. Only needed by extensions and by the sqlite3.exe shell + AC_CHECK_HEADERS(zlib.h) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..276265e --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,9 @@ +10-520466-libsqlite3-depends-on-libdl.patch +10-520478-squash-bad-deps.patch +20-hurd-locking-style.patch +30-cross.patch +10-665363-disable-malloc-usable-size.patch +31-increase_SQLITE_MAX_DEFAULT_PAGE_SIZE_to_32k.patch +32-dynamic_link.patch +02-use-packaged-lempar.c.patch +40-amalgamation_configure.patch |