From cc7bcfa238fd1f86dac86c24372fe9594834f56f Mon Sep 17 00:00:00 2001 From: Vishal Biswas Date: Sun, 26 Mar 2017 04:52:48 +0530 Subject: [PATCH] add php-pgsql and php-fpm (#875) * php: update from 7.1.2 to 7.1.3 * add TERMUX_SUBPKG_CONFFILES * php: add subpkgs php-pgsql and php-fpm --- build-package.sh | 2 ++ packages/php/build.sh | 17 +++++++++++++++-- packages/php/php-fpm.patch | 11 +++++++++++ packages/php/php-fpm.subpackage.sh | 4 ++++ packages/php/php-pgsql.subpackage.sh | 3 +++ 5 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 packages/php/php-fpm.patch create mode 100644 packages/php/php-fpm.subpackage.sh create mode 100644 packages/php/php-pgsql.subpackage.sh diff --git a/build-package.sh b/build-package.sh index cb4a0ab3..02e1cd03 100755 --- a/build-package.sh +++ b/build-package.sh @@ -939,6 +939,8 @@ termux_step_massage() { test ! -z "$TERMUX_SUBPKG_CONFLICTS" && echo "Conflicts: $TERMUX_SUBPKG_CONFLICTS" >> control $TERMUX_TAR -cJf "$SUB_PKG_PACKAGE_DIR/control.tar.xz" . + for f in $TERMUX_SUBPKG_CONFFILES; do echo "$TERMUX_PREFIX/$f" >> conffiles; done + # Create the actual .deb file: TERMUX_SUBPKG_DEBFILE=$TERMUX_DEBDIR/${SUB_PKG_NAME}_${TERMUX_PKG_FULLVERSION}_${SUB_PKG_ARCH}.deb test ! -f "$TERMUX_COMMON_CACHEDIR/debian-binary" && echo "2.0" > "$TERMUX_COMMON_CACHEDIR/debian-binary" diff --git a/packages/php/build.sh b/packages/php/build.sh index d15a81ed..008c2ebe 100644 --- a/packages/php/build.sh +++ b/packages/php/build.sh @@ -1,13 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://php.net TERMUX_PKG_DESCRIPTION="Server-side, HTML-embedded scripting language" -TERMUX_PKG_VERSION=7.1.2 +TERMUX_PKG_VERSION=7.1.3 TERMUX_PKG_SRCURL=http://www.php.net/distributions/php-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=d815a0c39fd57bab1434a77ff0610fb507c22f790c66cd6f26e27030c4b3e971 +TERMUX_PKG_SHA256=e4887c2634778e37fd962fbdf5c4a7d32cd708482fe07b448804625570cb0bb0 # Build native php for phar to build (see pear-Makefile.frag.patch): TERMUX_PKG_HOSTBUILD=true # Build the native php without xml support as we only need phar: TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="--disable-libxml --disable-dom --disable-simplexml --disable-xml --disable-xmlreader --disable-xmlwriter --without-pear" TERMUX_PKG_DEPENDS="libandroid-glob, libxml2, liblzma, openssl, pcre, libbz2, libcrypt, libcurl, libgd, readline, freetype" +TERMUX_PKG_RM_AFTER_INSTALL="php/php/fpm" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" ac_cv_func_res_nsearch=no @@ -31,6 +32,10 @@ ac_cv_func_res_nsearch=no --with-pcre-regex=$TERMUX_PREFIX --with-readline=$TERMUX_PREFIX --with-zlib +--with-pgsql=shared +--with-pdo-pgsql=shared +--enable-fpm +--sbindir=$TERMUX_PREFIX/bin " termux_step_pre_configure () { @@ -42,6 +47,8 @@ termux_step_pre_configure () { # Run autoconf since we have patched config.m4 files. cd $TERMUX_PKG_SRCDIR autoconf + + export EXTENSION_DIR=$TERMUX_PREFIX/lib/php } termux_step_post_configure () { @@ -50,3 +57,9 @@ termux_step_post_configure () { # Avoid src/ext/standard/dns.c trying to use struct __res_state: perl -p -i -e 's/#define HAVE_RES_NSEARCH 1//' $TERMUX_PKG_BUILDDIR/main/php_config.h } + +termux_step_post_make_install () { + mkdir -p $TERMUX_PREFIX/etc/php-fpm.d + cp sapi/fpm/php-fpm.conf $TERMUX_PREFIX/etc/ + cp sapi/fpm/www.conf $TERMUX_PREFIX/etc/php-fpm.d/ +} diff --git a/packages/php/php-fpm.patch b/packages/php/php-fpm.patch new file mode 100644 index 00000000..b3863994 --- /dev/null +++ b/packages/php/php-fpm.patch @@ -0,0 +1,11 @@ +--- ./sapi/fpm/www.conf.in ++++ ./sapi/fpm/www.conf.in +@@ -33,7 +33,7 @@ + ; (IPv6 and IPv4-mapped) on a specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++listen = @TERMUX_PREFIX@/var/run/php-fpm.sock + + ; Set listen(2) backlog. + ; Default Value: 511 (-1 on FreeBSD and OpenBSD) diff --git a/packages/php/php-fpm.subpackage.sh b/packages/php/php-fpm.subpackage.sh new file mode 100644 index 00000000..d94a6aad --- /dev/null +++ b/packages/php/php-fpm.subpackage.sh @@ -0,0 +1,4 @@ +TERMUX_SUBPKG_INCLUDE="bin/php-fpm etc/php-fpm.conf etc/php-fpm.d/www.conf share/man/man8/php-fpm.8" +TERMUX_SUBPKG_CONFFILES="etc/php-fpm.conf etc/php-fpm.d/www.conf" +TERMUX_SUBPKG_DEPENDS="php" +TERMUX_SUBPKG_DESCRIPTION="FastCGI Process Manager for PHP" diff --git a/packages/php/php-pgsql.subpackage.sh b/packages/php/php-pgsql.subpackage.sh new file mode 100644 index 00000000..356485b9 --- /dev/null +++ b/packages/php/php-pgsql.subpackage.sh @@ -0,0 +1,3 @@ +TERMUX_SUBPKG_INCLUDE="lib/php/pgsql.so lib/php/pdo_pgsql.so" +TERMUX_SUBPKG_DEPENDS="php, postgresql" +TERMUX_SUBPKG_DESCRIPTION="PostgreSQL modules for PHP" -- 2.11.0