wok-next rev 21402

updated php (7.4.4 -> 7.4.5)
author Hans-G?nter Theisgen
date Tue Apr 21 07:47:41 2020 +0100 (2020-04-21)
parents 65805ccdd8ad
children dea882b942f2
files php/receipt
line diff
     1.1 --- a/php/receipt	Sun Apr 19 07:38:57 2020 +0100
     1.2 +++ b/php/receipt	Tue Apr 21 07:47:41 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="php"
     1.7 -VERSION="7.4.4"
     1.8 +VERSION="7.4.5"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="PHP web programming language"
    1.11  MAINTAINER="maintainer@slitaz.org"
    1.12 @@ -20,8 +20,8 @@
    1.13  SPLIT="\
    1.14  $PACKAGE-apache    $PACKAGE-cherokee $PACKAGE-cli     $PACKAGE-common \
    1.15  $PACKAGE-curl      $PACKAGE-dba      $PACKAGE-dev     $PACKAGE-gd \
    1.16 -$PACKAGE-imap      $PACKAGE-ldap     $PACKAGE-mcrypt  $PACKAGE-mysqli \
    1.17 -$PACKAGE-mysql     $PACKAGE-odbc     $PACKAGE-openssl $PACKAGE-pdo-mysql \
    1.18 +$PACKAGE-imap      $PACKAGE-ldap     $PACKAGE-mcrypt  $PACKAGE-mysql \
    1.19 +$PACKAGE-mysqli    $PACKAGE-odbc     $PACKAGE-openssl $PACKAGE-pdo-mysql \
    1.20  $PACKAGE-pdo-pgsql $PACKAGE-pear     $PACKAGE-pgsql   $PACKAGE-snmp \
    1.21  $PACKAGE-soap      $PACKAGE-sqlite"
    1.22  
    1.23 @@ -103,19 +103,19 @@
    1.24  	case $PACKAGE in
    1.25  		php)
    1.26  			copy usr/bin/php-cgi
    1.27 -			DEPENDS="php-common lighttpd zlib libxml2 sqlite3 openssl"
    1.28 +			DEPENDS="libxml2 lighttpd openssl php-common sqlite3 zlib"
    1.29  			PROVIDE="php:lighttpd"
    1.30  			;;
    1.31  		php-apache)
    1.32  			copy usr/share/apache/
    1.33  			CAT="development|module for apache"
    1.34 -			DEPENDS="php-common apache libxml2 zlib"
    1.35 +			DEPENDS="apache libxml2 php-common zlib"
    1.36  			PROVIDE="php:apache"
    1.37  			;;
    1.38  		php-cherokee)
    1.39  			copy usr/bin/php-cgi # FIXME! the same file in "php" package
    1.40  			CAT="development|module for cherokee"
    1.41 -			DEPENDS="php-common cherokee libxml2 zlib"
    1.42 +			DEPENDS="cherokee libxml2 php-common zlib"
    1.43  			PROVIDE="php:cherokee"
    1.44  			;;
    1.45  		php-cli)
    1.46 @@ -141,29 +141,29 @@
    1.47  			;;
    1.48  		php-dev)
    1.49  			copy @dev
    1.50 -			DEPENDS="php cyrus-sasl libldap libmysqlclient libpng \
    1.51 -			libpostgresqlclient libunixODBC mhash openssl jpeg \
    1.52 -			libmcrypt libtool libkrb5 libcomerr3 net-snmp"
    1.53 +			DEPENDS="cyrus-sasl jpeg libcomerr3 libkrb5 libldap 
    1.54 +			libmcrypt libmysqlclient libpng libpostgresqlclient 
    1.55 +			libtool libunixODBC mhash net-snmp openssl php"
    1.56  			;;
    1.57  		php-gd)
    1.58  			copy gd.so
    1.59  			CAT="development|gd module"
    1.60 -			DEPENDS="libpng php jpeg libvpx"
    1.61 +			DEPENDS="jpeg libpng libvpx php"
    1.62  			;;
    1.63  		php-imap)
    1.64  			copy imap.so
    1.65  			CAT="development|imap module"
    1.66 -			DEPENDS="php openssl"
    1.67 +			DEPENDS="openssl php"
    1.68  			;;
    1.69  		php-ldap)
    1.70  			copy ldap.so
    1.71  			CAT="development|ldap module"
    1.72 -			DEPENDS="libldap php openssl cyrus-sasl libkrb5 libcomerr3"
    1.73 +			DEPENDS="cyrus-sasl libcomerr3 libkrb5 libldap openssl php"
    1.74  			;;
    1.75  		php-mcrypt)
    1.76  			copy mcrypt.so
    1.77  			CAT="development|mcrypt module"
    1.78 -			DEPENDS="libmcrypt php libtool"
    1.79 +			DEPENDS="libmcrypt libtool php"
    1.80  			;;
    1.81  		php-mysqli)
    1.82  			copy mysqli.so
    1.83 @@ -178,12 +178,12 @@
    1.84  		php-odbc)
    1.85  			copy odbc.so
    1.86  			CAT="development|ODBC module"
    1.87 -			DEPENDS="unixODBC php"
    1.88 +			DEPENDS="php unixODBC"
    1.89  			;;
    1.90  		php-openssl)
    1.91  			copy openssl.so
    1.92  			CAT="development|OpenSSL module"
    1.93 -			DEPENDS="php openssl"
    1.94 +			DEPENDS="openssl php"
    1.95  			;;
    1.96  		php-pdo-mysql)
    1.97  			copy pdo_mysql.so
    1.98 @@ -193,7 +193,7 @@
    1.99  		php-pdo-pgsql)
   1.100  			copy pdo_pgsql.so
   1.101  			CAT="development|PDO PgSQL module"
   1.102 -			DEPENDS="php php-mysql libpostgresqlclient"
   1.103 +			DEPENDS="libpostgresqlclient php php-mysql"
   1.104  			;;
   1.105  		php-pear)
   1.106  			copy etc/pear.conf usr/bin/pe* usr/share/php/
   1.107 @@ -203,17 +203,17 @@
   1.108  		php-pgsql)
   1.109  			copy pgsql.so
   1.110  			CAT="development|postgresql module"
   1.111 -			DEPENDS="postgresql php"
   1.112 +			DEPENDS="php postgresql"
   1.113  			;;
   1.114  		php-snmp)
   1.115  			copy snmp.so
   1.116  			CAT="development|snmp module"
   1.117 -			DEPENDS="net-snmp php openssl"
   1.118 +			DEPENDS="net-snmp openssl php"
   1.119  			;;
   1.120  		php-soap)
   1.121  			copy soap.so
   1.122  			CAT="development|soap module"
   1.123 -			DEPENDS="php libxml2"
   1.124 +			DEPENDS="libxml2 php"
   1.125  			;;
   1.126  		php-sqlite)
   1.127  			copy sqlite.so sqlite3.so pdo_sqlite.so
   1.128 @@ -559,7 +559,8 @@
   1.129  pre_install_php_imap()
   1.130  {
   1.131  	while read daemon file; do
   1.132 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.133 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.134 +		  then
   1.135  			/etc/init.d/$daemon stop
   1.136  		fi
   1.137  	done <<EOT
   1.138 @@ -574,16 +575,19 @@
   1.139  	sed -e 's|extension=msql.so|extension=msql.so\nextension=imap.so|' -i "$1/etc/php.ini"
   1.140  
   1.141  	# Start Web server.
   1.142 -	while read daemon file; do
   1.143 +	while read daemon file
   1.144 +	  do
   1.145  		[ -z "$1" ] || continue
   1.146 -		if [ -f "/var/run/$file" ]; then
   1.147 +		if [ -f "/var/run/$file" ]
   1.148 +		  then
   1.149  			/etc/init.d/$daemon stop
   1.150  			sleep 2
   1.151  		fi
   1.152 -		if [ -f /etc/init.d/$daemon ]; then
   1.153 +		if [ -f /etc/init.d/$daemon ]
   1.154 +		  then
   1.155  			/etc/init.d/$daemon start
   1.156  		fi
   1.157 -	done <<EOT
   1.158 +	  done <<EOT
   1.159  apache   apache/httpd.pid
   1.160  lighttpd lighttpd.pid
   1.161  EOT
   1.162 @@ -594,16 +598,19 @@
   1.163  	sed -i '/.*=imap.so.*/d' /etc/php.ini
   1.164  
   1.165  	# Start Web server.
   1.166 -	while read daemon file; do
   1.167 +	while read daemon file
   1.168 +	  do
   1.169  		[ -z "$1" ] || continue
   1.170 -		if [ -f "/var/run/$file" ]; then
   1.171 +		if [ -f "/var/run/$file" ]
   1.172 +		  then
   1.173  			/etc/init.d/$daemon stop
   1.174  			sleep 2
   1.175  		fi
   1.176 -		if [ -f /etc/init.d/$daemon ]; then
   1.177 +		if [ -f /etc/init.d/$daemon ]
   1.178 +		  then
   1.179  			/etc/init.d/$daemon start
   1.180  		fi
   1.181 -	done <<EOT
   1.182 +	  done <<EOT
   1.183  apache   apache/httpd.pid
   1.184  lighttpd lighttpd.pid
   1.185  EOT
   1.186 @@ -612,11 +619,13 @@
   1.187  # -----------------------------------------------------------------------------
   1.188  pre_install_php_ldap()
   1.189  {
   1.190 -	while read daemon file; do
   1.191 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.192 +	while read daemon file
   1.193 +	  do
   1.194 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.195 +		  then
   1.196  			/etc/init.d/$daemon stop
   1.197  		fi
   1.198 -	done <<EOT
   1.199 +	  done <<EOT
   1.200  apache   apache/httpd.pid
   1.201  lighttpd lighttpd.pid
   1.202  EOT
   1.203 @@ -628,16 +637,19 @@
   1.204  	sed -e 's|extension=msql.so|extension=msql.so\nextension=ldap.so|' -i "$1/etc/php.ini"
   1.205  
   1.206  	# Start Web server.
   1.207 -	while read daemon file; do
   1.208 +	while read daemon file
   1.209 +	  do
   1.210  		[ -z "$1" ] || continue
   1.211 -		if [ -f "/var/run/$file" ]; then
   1.212 +		if [ -f "/var/run/$file" ]
   1.213 +		  then
   1.214  			/etc/init.d/$daemon stop
   1.215  			sleep 2
   1.216  		fi
   1.217 -		if [ -f /etc/init.d/$daemon ]; then
   1.218 +		if [ -f /etc/init.d/$daemon ]
   1.219 +		  then
   1.220  			/etc/init.d/$daemon start
   1.221  		fi
   1.222 -	done <<EOT
   1.223 +	  done <<EOT
   1.224  apache   apache/httpd.pid
   1.225  lighttpd lighttpd.pid
   1.226  EOT
   1.227 @@ -648,16 +660,19 @@
   1.228  	sed -i '/.*=ldap.so.*/d' /etc/php.ini
   1.229  
   1.230  	# Start Web server.
   1.231 -	while read daemon file; do
   1.232 +	while read daemon file
   1.233 +	  do
   1.234  		[ -z "$1" ] || continue
   1.235 -		if [ -f "/var/run/$file" ]; then
   1.236 +		if [ -f "/var/run/$file" ]
   1.237 +		  then
   1.238  			/etc/init.d/$daemon stop
   1.239  			sleep 2
   1.240  		fi
   1.241 -		if [ -f /etc/init.d/$daemon ]; then
   1.242 +		if [ -f /etc/init.d/$daemon ]
   1.243 +		  then
   1.244  			/etc/init.d/$daemon start
   1.245  		fi
   1.246 -	done <<EOT
   1.247 +	  done <<EOT
   1.248  apache   apache/httpd.pid
   1.249  lighttpd lighttpd.pid
   1.250  EOT
   1.251 @@ -666,11 +681,13 @@
   1.252  # -----------------------------------------------------------------------------
   1.253  pre_install_php_mcrypt()
   1.254  {
   1.255 -	while read daemon file; do
   1.256 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.257 +	while read daemon file
   1.258 +	  do
   1.259 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.260 +		  then
   1.261  			/etc/init.d/$daemon stop
   1.262  		fi
   1.263 -	done <<EOT
   1.264 +	  done <<EOT
   1.265  apache   apache/httpd.pid
   1.266  lighttpd lighttpd.pid
   1.267  EOT
   1.268 @@ -679,19 +696,23 @@
   1.269  post_install_php_mcrypt()
   1.270  {
   1.271  	grep -q ^extension=mcrypt.so "$1/etc/php.ini" ||
   1.272 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' -i "$1/etc/php.ini"
   1.273 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mcrypt.so|' \
   1.274 +		-i "$1/etc/php.ini"
   1.275  
   1.276  	# Start Web server.
   1.277 -	while read daemon file; do
   1.278 +	while read daemon file
   1.279 +	  do
   1.280  		[ -z "$1" ] || continue
   1.281 -		if [ -f "/var/run/$file" ]; then
   1.282 +		if [ -f "/var/run/$file" ]
   1.283 +		  then
   1.284  			/etc/init.d/$daemon stop
   1.285  			sleep 2
   1.286  		fi
   1.287 -		if [ -f /etc/init.d/$daemon ]; then
   1.288 +		if [ -f /etc/init.d/$daemon ]
   1.289 +		  then
   1.290  			/etc/init.d/$daemon start
   1.291  		fi
   1.292 -	done <<EOT
   1.293 +	  done <<EOT
   1.294  apache   apache/httpd.pid
   1.295  lighttpd lighttpd.pid
   1.296  EOT
   1.297 @@ -702,16 +723,19 @@
   1.298  	sed -i '/.*=mcrypt.so.*/d' /etc/php.ini
   1.299  
   1.300  	# Start Web server.
   1.301 -	while read daemon file; do
   1.302 +	while read daemon file
   1.303 +	  do
   1.304  		[ -z "$1" ] || continue
   1.305 -		if [ -f "/var/run/$file" ]; then
   1.306 +		if [ -f "/var/run/$file" ]
   1.307 +		  then
   1.308  			/etc/init.d/$daemon stop
   1.309  			sleep 2
   1.310  		fi
   1.311 -		if [ -f /etc/init.d/$daemon ]; then
   1.312 +		if [ -f /etc/init.d/$daemon ]
   1.313 +		  then
   1.314  			/etc/init.d/$daemon start
   1.315  		fi
   1.316 -	done <<EOT
   1.317 +	  done <<EOT
   1.318  apache   apache/httpd.pid
   1.319  lighttpd lighttpd.pid
   1.320  EOT
   1.321 @@ -720,11 +744,13 @@
   1.322  # -----------------------------------------------------------------------------
   1.323  pre_install_php_mysqli()
   1.324  {
   1.325 -	while read daemon file; do
   1.326 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.327 +	while read daemon file
   1.328 +	  do
   1.329 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.330 +		  then
   1.331  			/etc/init.d/$daemon stop
   1.332  		fi
   1.333 -	done <<EOT
   1.334 +	  done <<EOT
   1.335  apache   apache/httpd.pid
   1.336  lighttpd lighttpd.pid
   1.337  EOT
   1.338 @@ -733,19 +759,23 @@
   1.339  post_install_php_mysqli()
   1.340  {
   1.341  	grep -q ^extension=mysqli.so "$1/etc/php.ini" ||
   1.342 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' -i "$1/etc/php.ini"
   1.343 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysqli.so|' \
   1.344 +		-i "$1/etc/php.ini"
   1.345  
   1.346  	# Start Web server.
   1.347 -	while read daemon file; do
   1.348 +	while read daemon file
   1.349 +	  do
   1.350  		[ -z "$1" ] || continue
   1.351 -		if [ -f "/var/run/$file" ]; then
   1.352 +		if [ -f "/var/run/$file" ]
   1.353 +		  then
   1.354  			/etc/init.d/$daemon stop
   1.355  			sleep 2
   1.356  		fi
   1.357 -		if [ -f /etc/init.d/$daemon ]; then
   1.358 +		if [ -f /etc/init.d/$daemon ]
   1.359 +		  then
   1.360  			/etc/init.d/$daemon start
   1.361  		fi
   1.362 -	done <<EOT
   1.363 +	  done <<EOT
   1.364  apache   apache/httpd.pid
   1.365  lighttpd lighttpd.pid
   1.366  EOT
   1.367 @@ -756,16 +786,19 @@
   1.368  	sed -i '/.*=mysqli.so.*/d' /etc/php.ini
   1.369  
   1.370  	# Start Web server.
   1.371 -	while read daemon file; do
   1.372 +	while read daemon file
   1.373 +	  do
   1.374  		[ -z "$1" ] || continue
   1.375 -		if [ -f "/var/run/$file" ]; then
   1.376 +		if [ -f "/var/run/$file" ]
   1.377 +		  then
   1.378  			/etc/init.d/$daemon stop
   1.379  			sleep 2
   1.380  		fi
   1.381 -		if [ -f /etc/init.d/$daemon ]; then
   1.382 +		if [ -f /etc/init.d/$daemon ]
   1.383 +		  then
   1.384  			/etc/init.d/$daemon start
   1.385  		fi
   1.386 -	done <<EOT
   1.387 +	  done <<EOT
   1.388  apache   apache/httpd.pid
   1.389  lighttpd lighttpd.pid
   1.390  EOT
   1.391 @@ -774,11 +807,13 @@
   1.392  # -----------------------------------------------------------------------------
   1.393  pre_install_php_mysql()
   1.394  {
   1.395 -	while read daemon file; do
   1.396 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.397 +	while read daemon file
   1.398 +	  do
   1.399 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.400 +		  then
   1.401  			/etc/init.d/$daemon stop
   1.402  		fi
   1.403 -	done <<EOT
   1.404 +	  done <<EOT
   1.405  apache   apache/httpd.pid
   1.406  lighttpd lighttpd.pid
   1.407  EOT
   1.408 @@ -787,19 +822,23 @@
   1.409  post_install_php_mysql()
   1.410  {
   1.411  	grep -q ^extension=mysql.so "$1/etc/php.ini" ||
   1.412 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' -i "$1/etc/php.ini"
   1.413 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=mysql.so|' \
   1.414 +		-i "$1/etc/php.ini"
   1.415  
   1.416  	# Start Web server.
   1.417 -	while read daemon file; do
   1.418 +	while read daemon file
   1.419 +	  do
   1.420  		[ -z "$1" ] || continue
   1.421 -		if [ -f "/var/run/$file" ]; then
   1.422 +		if [ -f "/var/run/$file" ]
   1.423 +		  then
   1.424  			/etc/init.d/$daemon stop
   1.425  			sleep 2
   1.426  		fi
   1.427 -		if [ -f /etc/init.d/$daemon ]; then
   1.428 +		if [ -f /etc/init.d/$daemon ]
   1.429 +		  then
   1.430  			/etc/init.d/$daemon start
   1.431  		fi
   1.432 -	done <<EOT
   1.433 +	  done <<EOT
   1.434  apache   apache/httpd.pid
   1.435  lighttpd lighttpd.pid
   1.436  EOT
   1.437 @@ -810,16 +849,19 @@
   1.438  	sed -i '/.*=mysql.so.*/d' /etc/php.ini
   1.439  
   1.440  	# Start Web server.
   1.441 -	while read daemon file; do
   1.442 +	while read daemon file
   1.443 +	  do
   1.444  		[ -z "$1" ] || continue
   1.445 -		if [ -f "/var/run/$file" ]; then
   1.446 +		if [ -f "/var/run/$file" ]
   1.447 +		  then
   1.448  			/etc/init.d/$daemon stop
   1.449  			sleep 2
   1.450  		fi
   1.451 -		if [ -f /etc/init.d/$daemon ]; then
   1.452 +		if [ -f /etc/init.d/$daemon ]
   1.453 +		  then
   1.454  			/etc/init.d/$daemon start
   1.455  		fi
   1.456 -	done <<EOT
   1.457 +	  done <<EOT
   1.458  apache   apache/httpd.pid
   1.459  lighttpd lighttpd.pid
   1.460  EOT
   1.461 @@ -828,11 +870,13 @@
   1.462  # -----------------------------------------------------------------------------
   1.463  pre_install_php_odbc()
   1.464  {
   1.465 -	while read daemon file; do
   1.466 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.467 +	while read daemon file
   1.468 +	  do
   1.469 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.470 +		  then
   1.471  			/etc/init.d/$daemon stop
   1.472  		fi
   1.473 -	done <<EOT
   1.474 +	  done <<EOT
   1.475  apache   apache/httpd.pid
   1.476  lighttpd lighttpd.pid
   1.477  EOT
   1.478 @@ -841,19 +885,23 @@
   1.479  post_install_php_odbc()
   1.480  {
   1.481  	grep -q ^extension=odbc.so "$1/etc/php.ini" ||
   1.482 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' -i "$1/etc/php.ini"
   1.483 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=odbc.so|' \
   1.484 +		-i "$1/etc/php.ini"
   1.485  
   1.486  	# Start Web server.
   1.487 -	while read daemon file; do
   1.488 +	while read daemon file
   1.489 +	  do
   1.490  		[ -z "$1" ] || continue
   1.491 -		if [ -f "/var/run/$file" ]; then
   1.492 +		if [ -f "/var/run/$file" ]
   1.493 +		  then
   1.494  			/etc/init.d/$daemon stop
   1.495  			sleep 2
   1.496  		fi
   1.497 -		if [ -f /etc/init.d/$daemon ]; then
   1.498 +		if [ -f /etc/init.d/$daemon ]
   1.499 +		  then
   1.500  			/etc/init.d/$daemon start
   1.501  		fi
   1.502 -	done <<EOT
   1.503 +	  done <<EOT
   1.504  apache   apache/httpd.pid
   1.505  lighttpd lighttpd.pid
   1.506  EOT
   1.507 @@ -864,16 +912,19 @@
   1.508  	sed -i '/.*=odbc.so.*/d' /etc/php.ini
   1.509  
   1.510  	# Start Web server.
   1.511 -	while read daemon file; do
   1.512 +	while read daemon file
   1.513 +	  do
   1.514  		[ -z "$1" ] || continue
   1.515 -		if [ -f "/var/run/$file" ]; then
   1.516 +		if [ -f "/var/run/$file" ]
   1.517 +		  then
   1.518  			/etc/init.d/$daemon stop
   1.519  			sleep 2
   1.520  		fi
   1.521 -		if [ -f /etc/init.d/$daemon ]; then
   1.522 +		if [ -f /etc/init.d/$daemon ]
   1.523 +		  then
   1.524  			/etc/init.d/$daemon start
   1.525  		fi
   1.526 -	done <<EOT
   1.527 +	  done <<EOT
   1.528  apache   apache/httpd.pid
   1.529  lighttpd lighttpd.pid
   1.530  EOT
   1.531 @@ -882,11 +933,13 @@
   1.532  # -----------------------------------------------------------------------------
   1.533  pre_install_php_openssl()
   1.534  {
   1.535 -	while read daemon file; do
   1.536 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.537 +	while read daemon file
   1.538 +	  do
   1.539 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.540 +		  then
   1.541  			/etc/init.d/$daemon stop
   1.542  		fi
   1.543 -	done <<EOT
   1.544 +	  done <<EOT
   1.545  apache   apache/httpd.pid
   1.546  lighttpd lighttpd.pid
   1.547  EOT
   1.548 @@ -895,19 +948,23 @@
   1.549  post_install_php_openssl()
   1.550  {
   1.551  	grep -q ^extension=openssl.so "$1/etc/php.ini" ||
   1.552 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' -i "$1/etc/php.ini"
   1.553 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=openssl.so|' \
   1.554 +		-i "$1/etc/php.ini"
   1.555  
   1.556  	# Start Web server.
   1.557 -	while read daemon file; do
   1.558 +	while read daemon file
   1.559 +	  do
   1.560  		[ -z "$1" ] || continue
   1.561 -		if [ -f "/var/run/$file" ]; then
   1.562 +		if [ -f "/var/run/$file" ]
   1.563 +		  then
   1.564  			/etc/init.d/$daemon stop
   1.565  			sleep 2
   1.566  		fi
   1.567 -		if [ -f /etc/init.d/$daemon ]; then
   1.568 +		if [ -f /etc/init.d/$daemon ]
   1.569 +		  then
   1.570  			/etc/init.d/$daemon start
   1.571  		fi
   1.572 -	done <<EOT
   1.573 +	  done <<EOT
   1.574  apache   apache/httpd.pid
   1.575  lighttpd lighttpd.pid
   1.576  EOT
   1.577 @@ -918,28 +975,34 @@
   1.578  	sed -i '/.*=openssl.so.*/d' /etc/php.ini
   1.579  
   1.580  	# Start Web server.
   1.581 -	while read daemon file; do
   1.582 +	while read daemon file
   1.583 +	  do
   1.584  		[ -z "$1" ] || continue
   1.585 -		if [ -f "/var/run/$file" ]; then
   1.586 +		if [ -f "/var/run/$file" ]
   1.587 +		  then
   1.588  			/etc/init.d/$daemon stop
   1.589  			sleep 2
   1.590  		fi
   1.591 -		if [ -f /etc/init.d/$daemon ]; then
   1.592 +		if [ -f /etc/init.d/$daemon ]
   1.593 +		  then
   1.594  			/etc/init.d/$daemon start
   1.595  		fi
   1.596 -	done <<EOT
   1.597 +	  done <<EOT
   1.598  apache   apache/httpd.pid
   1.599  lighttpd lighttpd.pid
   1.600  EOT
   1.601  }
   1.602  
   1.603  # -----------------------------------------------------------------------------
   1.604 -pre_install_pdo_mysql() {
   1.605 -	while read daemon file; do
   1.606 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.607 +pre_install_pdo_mysql()
   1.608 +{
   1.609 +	while read daemon file
   1.610 +	  do
   1.611 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.612 +		  then
   1.613  			/etc/init.d/$daemon stop
   1.614  		fi
   1.615 -	done <<EOT
   1.616 +	  done <<EOT
   1.617  apache   apache/httpd.pid
   1.618  lighttpd lighttpd.pid
   1.619  EOT
   1.620 @@ -948,19 +1011,23 @@
   1.621  post_install_pdo_mysql()
   1.622  {
   1.623  	grep -q ^extension=pdo_mysql.so "$1/etc/php.ini" ||
   1.624 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' -i "$1/etc/php.ini"
   1.625 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_mysql.so|' \
   1.626 +		-i "$1/etc/php.ini"
   1.627  
   1.628  	# Start Web server.
   1.629 -	while read daemon file; do
   1.630 +	while read daemon file
   1.631 +	  do
   1.632  		[ -z "$1" ] || continue
   1.633 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.634 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.635 +		  then
   1.636  			/etc/init.d/$daemon stop
   1.637  			sleep 2
   1.638  		fi
   1.639 -		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
   1.640 +		if [ -z "$1" -a -f /etc/init.d/$daemon ]
   1.641 +		  then
   1.642  			/etc/init.d/$daemon start
   1.643  		fi
   1.644 -	done <<EOT
   1.645 +	  done <<EOT
   1.646  apache   apache/httpd.pid
   1.647  lighttpd lighttpd.pid
   1.648  EOT
   1.649 @@ -971,16 +1038,19 @@
   1.650  	sed -i '/.*=pdo_mysql.so.*/d' /etc/php.ini
   1.651  
   1.652  	# Start Web server.
   1.653 -	while read daemon file; do
   1.654 +	while read daemon file
   1.655 +	  do
   1.656  		[ -z "$1" ] || continue
   1.657 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.658 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.659 +		  then
   1.660  			/etc/init.d/$daemon stop
   1.661  			sleep 2
   1.662  		fi
   1.663 -		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
   1.664 +		if [ -z "$1" -a -f /etc/init.d/$daemon ]
   1.665 +		  then
   1.666  			/etc/init.d/$daemon start
   1.667  		fi
   1.668 -	done <<EOT
   1.669 +	  done <<EOT
   1.670  apache   apache/httpd.pid
   1.671  lighttpd lighttpd.pid
   1.672  EOT
   1.673 @@ -989,11 +1059,13 @@
   1.674  # -----------------------------------------------------------------------------
   1.675  pre_install_pdo_pgsql()
   1.676  {
   1.677 -	while read daemon file; do
   1.678 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.679 +	while read daemon file
   1.680 +	  do
   1.681 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.682 +		  then
   1.683  			/etc/init.d/$daemon stop
   1.684  		fi
   1.685 -	done <<EOT
   1.686 +	  done <<EOT
   1.687  apache   apache/httpd.pid
   1.688  lighttpd lighttpd.pid
   1.689  EOT
   1.690 @@ -1002,19 +1074,23 @@
   1.691  post_install_pdo_pgsql()
   1.692  {
   1.693  	grep -q ^extension=pdo_pgsql.so "$1/etc/php.ini" ||
   1.694 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' -i "$1/etc/php.ini"
   1.695 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pdo_pgsql.so|' \
   1.696 +		-i "$1/etc/php.ini"
   1.697  
   1.698  	# Start Web server.
   1.699 -	while read daemon file; do
   1.700 +	while read daemon file
   1.701 +	  do
   1.702  		[ -z "$1" ] || continue
   1.703 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.704 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.705 +		  then
   1.706  			/etc/init.d/$daemon stop
   1.707  			sleep 2
   1.708  		fi
   1.709 -		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
   1.710 +		if [ -z "$1" -a -f /etc/init.d/$daemon ]
   1.711 +		  then
   1.712  			/etc/init.d/$daemon start
   1.713  		fi
   1.714 -	done <<EOT
   1.715 +	  done <<EOT
   1.716  apache   apache/httpd.pid
   1.717  lighttpd lighttpd.pid
   1.718  EOT
   1.719 @@ -1025,16 +1101,19 @@
   1.720  	sed -i '/.*=pdo_pgsql.so.*/d' /etc/php.ini
   1.721  
   1.722  	# Start Web server.
   1.723 -	while read daemon file; do
   1.724 +	while read daemon file
   1.725 +	  do
   1.726  		[ -z "$1" ] || continue
   1.727 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.728 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.729 +		  then
   1.730  			/etc/init.d/$daemon stop
   1.731  			sleep 2
   1.732  		fi
   1.733 -		if [ -z "$1" -a -f /etc/init.d/$daemon ]; then
   1.734 +		if [ -z "$1" -a -f /etc/init.d/$daemon ]
   1.735 +		  then
   1.736  			/etc/init.d/$daemon start
   1.737  		fi
   1.738 -	done <<EOT
   1.739 +	  done <<EOT
   1.740  apache   apache/httpd.pid
   1.741  lighttpd lighttpd.pid
   1.742  EOT
   1.743 @@ -1043,11 +1122,13 @@
   1.744  # -----------------------------------------------------------------------------
   1.745  pre_install_php_pear()
   1.746  {
   1.747 -	while read daemon file; do
   1.748 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.749 +	while read daemon file
   1.750 +	  do
   1.751 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.752 +		  then
   1.753  			/etc/init.d/$daemon stop
   1.754  		fi
   1.755 -	done <<EOT
   1.756 +	  done <<EOT
   1.757  apache   apache/httpd.pid
   1.758  lighttpd lighttpd.pid
   1.759  EOT
   1.760 @@ -1056,18 +1137,22 @@
   1.761  post_install_php_pear()
   1.762  {
   1.763  	grep ^include_path "$1/etc/php.ini"
   1.764 -	sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' "$1/etc/php.ini"
   1.765 +	sed -i 's|/php/includes"|/php/includes"\ninclude_path = ".:/usr/share/php"|' \
   1.766 +		"$1/etc/php.ini"
   1.767  	# Restart Web server.
   1.768 -	while read daemon file; do
   1.769 +	while read daemon file
   1.770 +	  do
   1.771  		[ -z "$1" ] || continue
   1.772 -		if [ -f "/var/run/$file" ]; then
   1.773 +		if [ -f "/var/run/$file" ]
   1.774 +		  then
   1.775  			/etc/init.d/$daemon stop
   1.776  			sleep 2
   1.777  		fi
   1.778 -		if [ -f /etc/init.d/$daemon ]; then
   1.779 +		if [ -f /etc/init.d/$daemon ]
   1.780 +		  then
   1.781  			/etc/init.d/$daemon start
   1.782  		fi
   1.783 -	done <<EOT
   1.784 +	  done <<EOT
   1.785  apache   apache/httpd.pid
   1.786  lighttpd lighttpd.pid
   1.787  EOT
   1.788 @@ -1076,11 +1161,13 @@
   1.789  # -----------------------------------------------------------------------------
   1.790  pre_install_php_pgsql()
   1.791  {
   1.792 -	while read daemon file; do
   1.793 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.794 +	while read daemon file
   1.795 +	  do
   1.796 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.797 +		  then
   1.798  			/etc/init.d/$daemon stop
   1.799  		fi
   1.800 -	done <<EOT
   1.801 +	  done <<EOT
   1.802  apache   apache/httpd.pid
   1.803  lighttpd lighttpd.pid
   1.804  EOT
   1.805 @@ -1089,19 +1176,23 @@
   1.806  post_install_php_pgsql()
   1.807  {
   1.808  	grep -q ^extension=pgsql.so "$1/etc/php.ini" ||
   1.809 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' -i "$1/etc/php.ini"
   1.810 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=pgsql.so|' \
   1.811 +		-i "$1/etc/php.ini"
   1.812  
   1.813  	# Start Web server.
   1.814 -	while read daemon file; do
   1.815 +	while read daemon file
   1.816 +	  do
   1.817  		[ -z "$1" ] || continue
   1.818 -		if [ -f "/var/run/$file" ]; then
   1.819 +		if [ -f "/var/run/$file" ]
   1.820 +		  then
   1.821  			/etc/init.d/$daemon stop
   1.822  			sleep 2
   1.823  		fi
   1.824 -		if [ -f /etc/init.d/$daemon ]; then
   1.825 +		if [ -f /etc/init.d/$daemon ]
   1.826 +		  then
   1.827  			/etc/init.d/$daemon start
   1.828  		fi
   1.829 -	done <<EOT
   1.830 +	  done <<EOT
   1.831  apache   apache/httpd.pid
   1.832  lighttpd lighttpd.pid
   1.833  EOT
   1.834 @@ -1112,16 +1203,19 @@
   1.835  	sed -i '/.*=pgsql.so.*/d' /etc/php.ini
   1.836  
   1.837  	# Start Web server.
   1.838 -	while read daemon file; do
   1.839 +	while read daemon file
   1.840 +	  do
   1.841  		[ -z "$1" ] || continue
   1.842 -		if [ -f "/var/run/$file" ]; then
   1.843 +		if [ -f "/var/run/$file" ]
   1.844 +		  then
   1.845  			/etc/init.d/$daemon stop
   1.846  			sleep 2
   1.847  		fi
   1.848 -		if [ -f /etc/init.d/$daemon ]; then
   1.849 +		if [ -f /etc/init.d/$daemon ]
   1.850 +		  then
   1.851  			/etc/init.d/$daemon start
   1.852  		fi
   1.853 -	done <<EOT
   1.854 +	  done <<EOT
   1.855  apache   apache/httpd.pid
   1.856  lighttpd lighttpd.pid
   1.857  EOT
   1.858 @@ -1130,11 +1224,13 @@
   1.859  # -----------------------------------------------------------------------------
   1.860  pre_install_php_snmp()
   1.861  {
   1.862 -	while read daemon file; do
   1.863 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.864 +	while read daemon file
   1.865 +	  do
   1.866 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.867 +		  then
   1.868  			/etc/init.d/$daemon stop
   1.869  		fi
   1.870 -	done <<EOT
   1.871 +	  done <<EOT
   1.872  apache   apache/httpd.pid
   1.873  lighttpd lighttpd.pid
   1.874  EOT
   1.875 @@ -1143,19 +1239,23 @@
   1.876  post_install_php_snmp()
   1.877  {
   1.878  	grep -q ^extension=snmp.so "$1/etc/php.ini" ||
   1.879 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' -i "$1/etc/php.ini"
   1.880 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=snmp.so|' \
   1.881 +		-i "$1/etc/php.ini"
   1.882  
   1.883  	# Start Web server.
   1.884 -	while read daemon file; do
   1.885 +	while read daemon file
   1.886 +	  do
   1.887  		[ -z "$1" ] || continue
   1.888 -		if [ -f "/var/run/$file" ]; then
   1.889 +		if [ -f "/var/run/$file" ]
   1.890 +		  then
   1.891  			/etc/init.d/$daemon stop
   1.892  			sleep 2
   1.893  		fi
   1.894 -		if [ -f /etc/init.d/$daemon ]; then
   1.895 +		if [ -f /etc/init.d/$daemon ]
   1.896 +		  then
   1.897  			/etc/init.d/$daemon start
   1.898  		fi
   1.899 -	done <<EOT
   1.900 +	  done <<EOT
   1.901  apache   apache/httpd.pid
   1.902  lighttpd lighttpd.pid
   1.903  EOT
   1.904 @@ -1166,16 +1266,19 @@
   1.905  	sed -i '/.*=snmp.so.*/d' /etc/php.ini
   1.906  
   1.907  	# Start Web server.
   1.908 -	while read daemon file; do
   1.909 +	while read daemon file
   1.910 +	  do
   1.911  		[ -z "$1" ] || continue
   1.912 -		if [ -f "/var/run/$file" ]; then
   1.913 +		if [ -f "/var/run/$file" ]
   1.914 +		  then
   1.915  			/etc/init.d/$daemon stop
   1.916  			sleep 2
   1.917  		fi
   1.918 -		if [ -f /etc/init.d/$daemon ]; then
   1.919 +		if [ -f /etc/init.d/$daemon ]
   1.920 +		  then
   1.921  			/etc/init.d/$daemon start
   1.922  		fi
   1.923 -	done <<EOT
   1.924 +	  done <<EOT
   1.925  apache   apache/httpd.pid
   1.926  lighttpd lighttpd.pid
   1.927  EOT
   1.928 @@ -1184,11 +1287,13 @@
   1.929  # -----------------------------------------------------------------------------
   1.930  pre_install_php_soap()
   1.931  {
   1.932 -	while read daemon file; do
   1.933 -		if [ -z "$1" -a -f "/var/run/$file" ]; then
   1.934 +	while read daemon file
   1.935 +	  do
   1.936 +		if [ -z "$1" -a -f "/var/run/$file" ]
   1.937 +		  then
   1.938  			/etc/init.d/$daemon stop
   1.939  		fi
   1.940 -	done <<EOT
   1.941 +	  done <<EOT
   1.942  apache   apache/httpd.pid
   1.943  lighttpd lighttpd.pid
   1.944  EOT
   1.945 @@ -1197,19 +1302,23 @@
   1.946  post_install_php_soap()
   1.947  {
   1.948  	grep -q ^extension=soap.so "$1/etc/php.ini" ||
   1.949 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' -i "$1/etc/php.ini"
   1.950 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=soap.so|' \
   1.951 +		-i "$1/etc/php.ini"
   1.952  
   1.953  	# Start Web server.
   1.954 -	while read daemon file; do
   1.955 +	while read daemon file
   1.956 +	  do
   1.957  		[ -z "$1" ] || continue
   1.958 -		if [ -f "/var/run/$file" ]; then
   1.959 +		if [ -f "/var/run/$file" ]
   1.960 +		  then
   1.961  			/etc/init.d/$daemon stop
   1.962  			sleep 2
   1.963  		fi
   1.964 -		if [ -f /etc/init.d/$daemon ]; then
   1.965 +		if [ -f /etc/init.d/$daemon ]
   1.966 +		  then
   1.967  			/etc/init.d/$daemon start
   1.968  		fi
   1.969 -	done <<EOT
   1.970 +	  done <<EOT
   1.971  apache   apache/httpd.pid
   1.972  lighttpd lighttpd.pid
   1.973  EOT
   1.974 @@ -1220,16 +1329,19 @@
   1.975  	sed -i '/.*=soap.so.*/d' /etc/php.ini
   1.976  
   1.977  	# Start Web server.
   1.978 -	while read daemon file; do
   1.979 +	while read daemon file
   1.980 +	  do
   1.981  		[ -z "$1" ] || continue
   1.982 -		if [ -f "/var/run/$file" ]; then
   1.983 +		if [ -f "/var/run/$file" ]
   1.984 +		  then
   1.985  			/etc/init.d/$daemon stop
   1.986  			sleep 2
   1.987  		fi
   1.988 -		if [ -f /etc/init.d/$daemon ]; then
   1.989 +		if [ -f /etc/init.d/$daemon ]
   1.990 +		  then
   1.991  			/etc/init.d/$daemon start
   1.992  		fi
   1.993 -	done <<EOT
   1.994 +	  done <<EOT
   1.995  apache   apache/httpd.pid
   1.996  lighttpd lighttpd.pid
   1.997  EOT
   1.998 @@ -1239,19 +1351,23 @@
   1.999  post_install_php_sqlite()
  1.1000  {
  1.1001  	grep -q ^extension=sqlite3.so "$1/etc/php.ini" ||
  1.1002 -	sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' -i "$1/etc/php.ini"
  1.1003 +	sed -e 's|extension=msql.so|extension=msql.so\nextension=sqlite3.so|' \
  1.1004 +		-i "$1/etc/php.ini"
  1.1005  
  1.1006  	# Start Web server.
  1.1007 -	while read daemon file; do
  1.1008 +	while read daemon file
  1.1009 +	  do
  1.1010  		[ -z "$1" ] || continue
  1.1011 -		if [ -f "/var/run/$file" ]; then
  1.1012 +		if [ -f "/var/run/$file" ]
  1.1013 +		  then
  1.1014  			/etc/init.d/$daemon stop
  1.1015  			sleep 2
  1.1016  		fi
  1.1017 -		if [ -f /etc/init.d/$daemon ]; then
  1.1018 +		if [ -f /etc/init.d/$daemon ]
  1.1019 +		  then
  1.1020  			/etc/init.d/$daemon start
  1.1021  		fi
  1.1022 -	done <<EOT
  1.1023 +	  done <<EOT
  1.1024  apache   apache/httpd.pid
  1.1025  lighttpd lighttpd.pid
  1.1026  EOT
  1.1027 @@ -1262,16 +1378,19 @@
  1.1028  	sed -i '/.*=sqlite3.so.*/d' /etc/php.ini
  1.1029  
  1.1030  	# Start Web server.
  1.1031 -	while read daemon file; do
  1.1032 +	while read daemon file
  1.1033 +	  do
  1.1034  		[ -z "$1" ] || continue
  1.1035 -		if [ -f "/var/run/$file" ]; then
  1.1036 +		if [ -f "/var/run/$file" ]
  1.1037 +		  then
  1.1038  			/etc/init.d/$daemon stop
  1.1039  			sleep 2
  1.1040  		fi
  1.1041 -		if [ -f /etc/init.d/$daemon ]; then
  1.1042 +		if [ -f /etc/init.d/$daemon ]
  1.1043 +		  then
  1.1044  			/etc/init.d/$daemon start
  1.1045  		fi
  1.1046 -	done <<EOT
  1.1047 +	  done <<EOT
  1.1048  apache   apache/httpd.pid
  1.1049  lighttpd lighttpd.pid
  1.1050  EOT