CVS commit: pkgsrc/lang

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Fri Dec  7 01:54:53 UTC 2018

Modified Files:
        pkgsrc/lang/php70: Makefile.php
        pkgsrc/lang/php71: Makefile.php
        pkgsrc/lang/php72: Makefile.php

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/php71/Makefile.php
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/php72/Makefile.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.11 pkgsrc/lang/php70/Makefile.php:1.12
--- pkgsrc/lang/php70/Makefile.php:1.11 Tue Jul 31 01:17:56 2018
+++ pkgsrc/lang/php70/Makefile.php      Fri Dec  7 01:54:52 2018
@@ -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+=      --enable-xml
 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

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.10 pkgsrc/lang/php71/Makefile.php:1.11
--- pkgsrc/lang/php71/Makefile.php:1.10 Tue Jul 31 01:17:56 2018
+++ pkgsrc/lang/php71/Makefile.php      Fri Dec  7 01:54:52 2018
@@ -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+=      --enable-xml
 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

Index: pkgsrc/lang/php72/Makefile.php
diff -u pkgsrc/lang/php72/Makefile.php:1.8 pkgsrc/lang/php72/Makefile.php:1.9
--- pkgsrc/lang/php72/Makefile.php:1.8  Tue Jul 31 01:17:56 2018
+++ pkgsrc/lang/php72/Makefile.php      Fri Dec  7 01:54:53 2018
@@ -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+=      --enable-xml
 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}