diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:12:33 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2014-10-16 23:12:33 -0400 |
| commit | 121be71cab384e98755def99c2c4dc3dc82806ac (patch) | |
| tree | 50a57e97bee3aa700989337ff2297088d11a2b68 | |
| parent | 9ce5373557d7740469c5e43231414d8bb9c3000f (diff) | |
updated patches from sqlite3_3.8.6 package
4 files changed, 14 insertions, 14 deletions
diff --git a/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch index 150b8bd..85be05e 100644 --- a/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch +++ b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch @@ -2,7 +2,7 @@ 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 @@ +@@ -232,6 +232,38 @@ fi AC_SUBST(BUILD_CC) ########## diff --git a/debian/patches/10-520478-squash-bad-deps.patch b/debian/patches/10-520478-squash-bad-deps.patch index 62262d3..e7a1276 100644 --- a/debian/patches/10-520478-squash-bad-deps.patch +++ b/debian/patches/10-520478-squash-bad-deps.patch @@ -1,13 +1,13 @@ ---- sqlcipher-2.2.1.orig/Makefile.in -+++ sqlcipher-2.2.1/Makefile.in -@@ -521,18 +521,20 @@ sqlcipher.pc: $(TOP)/sqlcipher.pc.in +--- sqlcipher-3.2.0.orig/Makefile.in ++++ sqlcipher-3.2.0/Makefile.in +@@ -509,18 +509,20 @@ sqlcipher.pc: $(TOP)/sqlcipher.pc.in libsqlcipher.la: $(LIBOBJ) - $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ + $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" + sed -i "/dependency_libs/s/'.*'/''/" $@ libtclsqlite3.la: tclsqlite.lo libsqlcipher.la - $(LTLINK) -o $@ tclsqlite.lo \ + $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ - libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ + libsqlcipher.la @TCL_STUB_LIB_SPEC@ \ -rpath "$(TCLLIBDIR)" \ diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch index 73e72a3..a6da3ab 100644 --- a/debian/patches/20-hurd-locking-style.patch +++ b/debian/patches/20-hurd-locking-style.patch @@ -1,15 +1,15 @@ --- a/src/os_unix.c +++ b/src/os_unix.c -@@ -131,7 +131,7 @@ +@@ -97,7 +97,7 @@ + # include <sys/mman.h> #endif - --#if SQLITE_ENABLE_LOCKING_STYLE -+#if SQLITE_ENABLE_LOCKING_STYLE || defined(__GNU__) +-#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS ++#if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS || defined(__GNU__) # include <sys/ioctl.h> # if OS_VXWORKS # include <semaphore.h> -@@ -2198,7 +2198,7 @@ +@@ -2214,7 +2214,7 @@ ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if ** compiling for VXWORKS. */ @@ -18,7 +18,7 @@ /* ** Retry flock() calls that fail with EINTR -@@ -4927,7 +4927,7 @@ +@@ -4992,7 +4992,7 @@ dotlockCheckReservedLock /* xCheckReservedLock method */ ) @@ -27,7 +27,7 @@ IOMETHODS( flockIoFinder, /* Finder function name */ flockIoMethods, /* sqlite3_io_methods object name */ -@@ -7366,6 +7366,8 @@ +@@ -7455,6 +7455,8 @@ static sqlite3_vfs aVfs[] = { #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) UNIXVFS("unix", autolockIoFinder ), 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 index bd0360e..afe769b 100644 --- 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 @@ -3,7 +3,7 @@ Description: increase the maximum possible value of the page size 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.hu> +Author: Laszlo Boszormenyi (GCS) <gcs@debian.org> Bug-Debian: http://bugs.debian.org/672573 --- |