From 6083a387a81dbbd66d6316a3a12a63f06d5f7109 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Sat, 6 Oct 2018 12:36:55 +0200 Subject: Unbundle libsqlite3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since there is no need to patch libsqlite3 for our purposes, and since libsqlite3 ≥ 3.3.9 (which is our current requirement) is widely available on distros, there is no reason anymore to bundle the library. Besides removing the bundled libsqlite, and adapting the configuration respectively, we also fix the use of the SQLITE_ENABLE_COLUMN_METADATA compile time constant to detect whether sqlite3_column_table_name() is available by a working feature detection (otherwise bug_42589.phpt would fail). We also skip bug73068.phpt for libsqlite 3.11.0 to 3.14.1 which have a bug (). We also completely drop support for the obscure pdo_sqlite_external extension (which could have been enabled on Windows only by passing `--pdo-sqlite-external` to configure), since it is not needed anymore. Furthermore, we remove references to the bundled libsqlite from Makefile.gcov, CONTRIBUTING.md and README.REDIST.BINS. --- README.REDIST.BINS | 66 +++++++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) (limited to 'README.REDIST.BINS') diff --git a/README.REDIST.BINS b/README.REDIST.BINS index 2004a2a136..e8b509be4c 100644 --- a/README.REDIST.BINS +++ b/README.REDIST.BINS @@ -1,22 +1,21 @@ -1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE -2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING -3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE -4. pcre2lib (ext/pcre) -5. ext/standard crypt -6. ext/standard crypt's blowfish implementation -7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite -8. ext/standard/rand -9. ext/standard/scanf -10. ext/standard/strnatcmp.c -11. ext/standard/uuencode -12. libxmlrpc ext/xmlrpc -13. main/snprintf.c -14. main/strlcat -15. main/strlcpy -16. libgd see ext/gd/libgd/COPYING -17. ext/phar portions of tar implementations -18. ext/phar/zip.c portion extracted from libzip -19. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB + 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE + 2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING + 3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE + 4. pcre2lib (ext/pcre) + 5. ext/standard crypt + 6. ext/standard crypt's blowfish implementation + 7. ext/standard/rand + 8. ext/standard/scanf + 9. ext/standard/strnatcmp.c +10. ext/standard/uuencode +11. libxmlrpc ext/xmlrpc +12. main/snprintf.c +13. main/strlcat +14. main/strlcpy +15. libgd see ext/gd/libgd/COPYING +16. ext/phar portions of tar implementations +17. ext/phar/zip.c portion extracted from libzip +18. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB 4. pcre2lib (ext/pcre) @@ -195,16 +194,7 @@ Blowfish library (I can't be sure if I would think of something if I hadn't seen his code). -7. Sqlite/Sqlite3 ext/sqlite3 ext/sqlite - -The author disclaims copyright to this source code. In place of -a legal notice, here is a blessing: - May you do good and not evil. - May you find forgiveness for yourself and forgive others. - May you share freely, never taking more than you give. - - -8. ext/standard/rand +7. ext/standard/rand The following php_mt_...() functions are based on a C++ class MTRand by Richard J. Wagner. For more information see the web page at @@ -258,7 +248,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -9. ext/standard/scanf +8. ext/standard/scanf scanf.c -- @@ -306,7 +296,7 @@ permission to use and distribute the software in accordance with the terms specified in this license. -10. ext/standard/strnatcmp.c +9. ext/standard/strnatcmp.c strnatcmp.c -- Perform 'natural order' comparisons of strings in C. Copyright (C) 2000 by Martin Pool @@ -328,7 +318,7 @@ freely, subject to the following restrictions: 3. This notice may not be removed or altered from any source distribution. -11. ext/standard/uuencode +10. ext/standard/uuencode Portions of this code are based on Berkeley's uuencode/uudecode implementation. @@ -365,7 +355,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -12. libxmlrpc ext/xmlrpc +11. libxmlrpc ext/xmlrpc Copyright 2000 Epinions, Inc. @@ -390,7 +380,7 @@ NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH DAMAGES. -13. main/snprintf.c +12. main/snprintf.c Copyright (c) 2002, 2006 Todd C. Miller @@ -465,8 +455,8 @@ SIO stdio-replacement strx_* functions by Panos Tsirigotis for xinetd. -14. main/strlcat -15. main/strlcpy +13. main/strlcat +14. main/strlcpy Copyright (c) 1998 Todd C. Miller All rights reserved. @@ -494,7 +484,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -17. ext/phar portions of tar implementations +16. ext/phar portions of tar implementations portions of tar implementations in ext/phar - phar_tar_octal() are based on an implementation by Tim Kientzle from libarchive, licensed with this license: @@ -523,7 +513,7 @@ implementation by Tim Kientzle from libarchive, licensed with this license: THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -18. ext/phar/zip.c portion extracted from libzip +17. ext/phar/zip.c portion extracted from libzip zip_dirent.c -- read directory entry (local or central), clean dirent Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner -- cgit v1.2.1