SF.net SVN: gar:[25404] csw/mgar/pkg/php5/branches/php-5.6.x/files

cgrzemba at users.sourceforge.net cgrzemba at users.sourceforge.net
Tue Nov 24 12:47:57 CET 2015


Revision: 25404
          http://sourceforge.net/p/gar/code/25404
Author:   cgrzemba
Date:     2015-11-24 11:47:57 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
php5/branches/php-5.6.x: extend postinstall|preremove scripts for replace apxs because this can't manage file extra/modules.load

Modified Paths:
--------------
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
    csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-24 10:01:41 UTC (rev 25403)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.postinstall	2015-11-24 11:47:57 UTC (rev 25404)
@@ -2,6 +2,7 @@
 
 CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
 AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
+AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load
 
 # Configure mod_php5 in httpd.conf
 if [ -n "`egrep 'IfModule (mod_php|php_module)' $AP2_CONFIG`" ]
@@ -10,18 +11,22 @@
 elif [ -n "`egrep '#Include extra/httpd-php5.conf' $AP2_CONFIG`" ]; then
     echo "Re-enabling existing config"
     perl -i -plne 's,^#(Include extra/httpd-php5.conf),$1,' $AP2_CONFIG
+    perl -i -plne 's,^#(LoadModule php5.*),$1,' $AP2_MODULE
 else
     echo "Adding Include for extra/http-php5.conf to httpd.conf"
     cat << END >> $AP2_CONFIG
 
 Include extra/httpd-php5.conf
 END
+    cat << END >> $AP2_MODULE
+LoadModule php5_module lib/apache2/modules/libphp5.so
+END
 fi
 
 # Finito
 cat <<END
 
-NOTICE: mod_php5 is enabled in httpd.conf but the server was not restarted.
+NOTICE: php5_module is enabled in httpd.conf but the server was not restarted.
 Please examine your php5 configuration and restart apache.
 
 END

Modified: csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove
===================================================================
--- csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-24 10:01:41 UTC (rev 25403)
+++ csw/mgar/pkg/php5/branches/php-5.6.x/files/CSWap24-modphp5.preremove	2015-11-24 11:47:57 UTC (rev 25404)
@@ -2,9 +2,11 @@
 
 CSW_PREFIX=${PKG_INSTALL_ROOT}/etc/opt/csw
 AP2_CONFIG=$CSW_PREFIX/apache2/httpd.conf
+AP2_MODULE=$CSW_PREFIX/apache2/extra/modules.load
 
 echo "Disabling httpd-php5.conf in httpd.conf"
 perl -i -plne 's,(?<!#)(Include extra/httpd-php5.conf),#$1,' $AP2_CONFIG
+perl -i -plne 's,(?<!#)(LoadModule php5_module .*),#$1,' $AP2_MODULE
 
 cat <<END
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list