Revision: 25374
http://sourceforge.net/p/gar/code/25374
Author: cgrzemba
Date: 2015-11-11 15:54:28 +0000 (Wed, 11 Nov 2015)
Log Message:
-----------
php5/branches/php-5.6.x: update 5.6.15, add ap2_modphp
Modified Paths:
--------------
csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
csw/mgar/pkg/php5/branches/php-5.6.x/checksums
csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW
Added Paths:
-----------
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/Makefile
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-11 12:08:00 UTC
(rev 25373)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/Makefile 2015-11-11 15:54:28 UTC
(rev 25374)
@@ -1,5 +1,5 @@
NAME = php
-VERSION = 5.6.13
+VERSION = 5.6.15
GARTYPE = v2
DESCRIPTION = A high-level scripting language.
@@ -18,9 +18,10 @@
EXTRA_MODULATORS = SAPI
# MODULATIONS_SAPI = cgi ap2
-MODULATIONS_SAPI = ap2
+MODULATIONS_SAPI = ap24 ap2
MERGE_SCRIPTS_isa-default-sapi-cgi = copy-all
MERGE_SCRIPTS_isa-default-sapi-ap2 = copy-all
+MERGE_SCRIPTS_isa-default-sapi-ap24 = copy-all
# turn on the build scripts to enable/disable modules
PHP5_EXT = 1
@@ -46,6 +47,9 @@
DISTFILES += $(DISTNAME).tar.xz
DISTFILES += phpext pear.conf.CSW CSWphp5.postinstall
DISTFILES += CSWphp5.cswreleasenotes
+DISTFILES += CSWap24-modphp5.cswreleasenotes
+DISTFILES += CSWap24-modphp5.postinstall
+DISTFILES += CSWap24-modphp5.preremove
DISTFILES += CSWap2-modphp5.cswreleasenotes
DISTFILES += CSWap2-modphp5.postinstall
DISTFILES += CSWap2-modphp5.preremove
@@ -141,6 +145,9 @@
CHECKPKG_OVERRIDES_CSWphp5-dev +=
file-with-bad-content|/usr/local|root/opt/csw/php5/lib/php/build/phpize.m4
CHECKPKG_OVERRIDES_CSWphp5-dev +=
file-with-bad-content|/usr/local|root/opt/csw/php5/man/man1/php-config.1
+ifeq ($(SAPI),ap24)
+EXTRA_MERGE_EXCLUDE += $(prefix)/apache2.*
+
PACKAGES += CSWap24-modphp5
SPKG_DESC_CSWap24-modphp5 = The apache 2.4.x php5 module
RUNTIME_DEP_PKGS_CSWap24-modphp5 = CSWphp5 CSWapache24 CSWlibxml2-2
@@ -149,10 +156,23 @@
RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuuc55
RUNTIME_DEP_PKGS_CSWap24-modphp5 += CSWlibicuio55
PKGFILES_CSWap24-modphp5 += $(libdir)/apache2/modules.*
+PKGFILES_CSWap24-modphp5 += $(sysconfdir_ap24).*
CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWphp5
CHECKPKG_OVERRIDES_CSWap24-modphp5 += surplus-dependency|CSWapache24
CHECKPKG_OVERRIDES_CSWap24-modphp5 +=
file-with-bad-content|/usr/local|root/opt/csw/lib/apache2/modules/libphp5.so
+endif
+ifeq ($(SAPI),ap2)
+EXTRA_MERGE_EXCLUDE += $(sysconfdir_ap24).*
+
+PACKAGES += CSWap2-modphp5
+SPKG_DESC_CSWap2-modphp5 = The apache 2.2.x php5 module
+RUNTIME_DEP_PKGS_CSWap2-modphp5 = CSWphp5 CSWapache2 CSWlibxml2-2
+PKGFILES_CSWap2-modphp5 += $(prefix)/apache2.*
+CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWphp5
+CHECKPKG_OVERRIDES_CSWap2-modphp5 += surplus-dependency|CSWapache2
+endif
+
$(eval $(call php5_subpackage,bcmath,))
$(eval $(call php5_subpackage,bz2,CSWlibbz2-1-0))
$(eval $(call php5_subpackage,calendar,))
@@ -283,7 +303,8 @@
#EXTRA_CPPFLAGS += -D_RWSTD_NO_NEW_HEADER
sysconfdir = /etc$(prefix)/php5
-sysconfdir_ap2 = /etc$(prefix)/apache2
+sysconfdir_ap24 = /etc$(prefix)/apache2
+sysconfdir_ap2 = /opt/csw/apache2/etc
CONFIGURE_ARGS += --prefix=$(prefix)/php5
CONFIGURE_ARGS += --sysconfdir=$(sysconfdir)
@@ -380,10 +401,11 @@
CONFIGURE_ARGS += --with-zlib-dir=$(prefix)
CONFIGURE_ARGS += --with-zlib=$(prefix)
CONFIGURE_ARGS += --enable-cli
+CONFIGURE_ARGS_fpm += --enable-fpm
-ifeq ($(SAPI),ap2)
-CONFIGURE_ARGS += --with-apxs2=$(prefix)/bin/apxs
-endif
+CONFIGURE_ARGS_ap24 += --with-apxs2=$(prefix)/bin/apxs
+CONFIGURE_ARGS_ap2 += --with-apxs2=$(prefix)/bin/apxs
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(SAPI))
# Disable Tests (report submitted to PHP QA)
# works, but takes a lot of time
@@ -422,8 +444,8 @@
# @echo "LoadModule foo2_module libexec/mod_foo2.so" >>
$(DESTDIR)$(AP2SYSCONF)/httpd.conf
# @$(MAKECOOKIE)
-post-install-modulated: AP2SYSCONF=$(sysconfdir_ap2)/httpd.conf
-post-install-modulated: AP2EXTCONF=$(sysconfdir_ap2)/extra
+post-install-modulated: AP2SYSCONF=$(sysconfdir_$(SAPI))/httpd.conf
+post-install-modulated: AP2EXTCONF=$(sysconfdir_$(SAPI))/extra
post-install-modulated: INIDEST=$(DESTDIR)/etc$(prefix)/php5/php.ini
post-install-modulated:
@rm -f $(DESTDIR)$(AP2SYSCONF)
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/checksums
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-11-11 12:08:00 UTC
(rev 25373)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/checksums 2015-11-11 15:54:28 UTC
(rev 25374)
@@ -1 +1 @@
-de4a8ff544986d9e0da90522fa66f195 php-5.6.13.tar.xz
+c726a86238017c2d9db0171b14d300e7 php-5.6.15.tar.xz
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
2015-11-11 12:08:00 UTC (rev 25373)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/0006-disable-zts-build
2015-11-11 15:54:28 UTC (rev 25374)
@@ -5,7 +5,7 @@
fi
else
- APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
-+ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'forked:.*no'`
++ APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'forked:.*no' | echo "I don't
want ZTS!`
if test -n "$APACHE_THREADED_MPM"; then
PHP_BUILD_THREAD_SAFE
fi
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
(rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.cswreleasenotes
2015-11-11 15:54:28 UTC (rev 25374)
@@ -0,0 +1,2 @@
+/usr/local references:
+ libexec/libphp5.so -> embeds 'magic' filetype info in the binary
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
(rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.postinstall
2015-11-11 15:54:28 UTC (rev 25374)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf
+
+# Configure mod_php5 in httpd.conf
+if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
+then
+ echo "Existing mod_php5 configuration detected"
+elif [ -n "`egrep '#Include etc/extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
+ echo "Re-enabling existing config"
+ perl -i -plne 's,^#(Include etc/extra/httpd-php5.conf),$1,' $AP2_CONFIG
+else
+ echo "Adding Include for extra/http-php5.conf to httpd.conf"
+ cat << END >> $AP2_CONFIG
+
+Include etc/extra/httpd-php5.conf
+END
+fi
+
+# Finito
+cat <<END
+
+NOTICE: mod_php5 is enabled in httpd.conf but the server was not restarted.
+Please examine your php5 configuration and restart apache.
+
+END
+
+exit 0
Added: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
(rev 0)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap2-modphp5.preremove
2015-11-11 15:54:28 UTC (rev 25374)
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+CSW_PREFIX=${PKG_INSTALL_ROOT}/opt/csw
+AP2_CONFIG=$CSW_PREFIX/apache2/etc/httpd.conf
+
+echo "Disabling httpd-php5.conf in httpd.conf"
+perl -i -plne 's,(?<!#)(Include etc/extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+
+cat <<END
+
+NOTICE: mod_php5 is disabled in httpd.conf but the server was not restarted.
+Please check your configuration and restart apache.
+
+END
+
+exit 0
Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW 2015-11-11
12:08:00 UTC (rev 25373)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/php.ini.CSW 2015-11-11
15:54:28 UTC (rev 25374)
@@ -657,6 +657,7 @@
;extension=pdo_pgsql.so
;extension=pdo_sqlite.so
;extension=pgsql.so
+;extension=phar.so
;extension=posix.so
;extension=pspell.so
;extension=readline.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
