pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang Link PHP with shared libsqlite3 isntead of built-in



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4bc7afc9c01b
branches:  trunk
changeset: 326451:4bc7afc9c01b
user:      manu <manu%pkgsrc.org@localhost>
date:      Fri Dec 07 01:54:52 2018 +0000

description:
Link PHP with shared libsqlite3 isntead of built-in

We used to build PHP with its built-in, statically linked libsqlite3. When
used in an executable with dynamically looaded modules such as Apache, some
module may load a shared libsqlite3, which has the same symbols as PHP's
built-in libsqlite3. This causes unreliable cross-version calls and is
source of crashes.

The fix is to disable PHP's built-in libslite3 and always use an external,
shared libsqlite3.

diffstat:

 lang/php70/Makefile.php |  5 ++++-
 lang/php71/Makefile.php |  5 ++++-
 lang/php72/Makefile.php |  5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diffs (57 lines):

diff -r 629e58a29e42 -r 4bc7afc9c01b lang/php70/Makefile.php
--- a/lang/php70/Makefile.php   Fri Dec 07 00:31:21 2018 +0000
+++ b/lang/php70/Makefile.php   Fri Dec 07 01:54:52 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.11 2018/07/31 01:17:56 maya Exp $
+# $NetBSD: Makefile.php,v 1.12 2018/12/07 01:54:52 manu Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -46,6 +46,9 @@
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-sqlite3=shared
+.include "../../databases/sqlite3/buildlink3.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline disable-filter-url
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
diff -r 629e58a29e42 -r 4bc7afc9c01b lang/php71/Makefile.php
--- a/lang/php71/Makefile.php   Fri Dec 07 00:31:21 2018 +0000
+++ b/lang/php71/Makefile.php   Fri Dec 07 01:54:52 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.10 2018/07/31 01:17:56 maya Exp $
+# $NetBSD: Makefile.php,v 1.11 2018/12/07 01:54:52 manu Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -46,6 +46,9 @@
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-sqlite3=shared
+.include "../../databases/sqlite3/buildlink3.mk"
+
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
 PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline disable-filter-url
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl readline
diff -r 629e58a29e42 -r 4bc7afc9c01b lang/php72/Makefile.php
--- a/lang/php72/Makefile.php   Fri Dec 07 00:31:21 2018 +0000
+++ b/lang/php72/Makefile.php   Fri Dec 07 01:54:52 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.8 2018/07/31 01:17:56 maya Exp $
+# $NetBSD: Makefile.php,v 1.9 2018/12/07 01:54:53 manu Exp $
 # used by lang/php72/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -49,6 +49,9 @@
 CONFIGURE_ARGS+=       --with-libxml-dir=${PREFIX}
 .include "../../textproc/libxml2/buildlink3.mk"
 
+CONFIGURE_ARGS+=       --with-sqlite3=shared
+.include "../../databases/sqlite3/buildlink3.mk"
+
 CONFIGURE_ARGS+=       --with-pcre-regex=${BUILDLINK_PREFIX.pcre}
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}



Home | Main Index | Thread Index | Old Index