# HG changeset patch # User Hans-G?nter Theisgen # Date 1585751009 -3600 # Node ID bcea19bfa7afe7207a7c7474cd2f14cf3bc91c37 # Parent 550ebe21c230e04d88e0d0070091603276f1d85e updated php packages (7.3.16 -> 7.4.4) diff -r 550ebe21c230 -r bcea19bfa7af php-apache/receipt --- a/php-apache/receipt Wed Apr 01 11:42:26 2020 +0200 +++ b/php-apache/receipt Wed Apr 01 15:23:29 2020 +0100 @@ -1,42 +1,45 @@ # SliTaz package receipt. PACKAGE="php-apache" -VERSION="7.3.16" +VERSION="7.4.4" CATEGORY="development" SHORT_DESC="PHP module for apache." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.php.net/" + +PROVIDE="php:apache" +DEPENDS="apache libxml2 php-common zlib" WANTED="php" -PROVIDE="php:apache" - -DEPENDS="php-common apache libxml2 zlib" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share - cp -a $install/usr/share/apache $fs/usr/share + cp -a $install/usr/share/apache $fs/usr/share } # Post and pre install commans to stop # and restart Web server if needed. pre_install() { - if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then + if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ] + then /etc/init.d/apache stop fi } post_install() { - grep -q php5_module "$1/etc/apache/httpd.conf" || { + grep -q php5_module "$1/etc/apache/httpd.conf" || + { sed -e 's|mod_rewrite.so|mod_rewrite.so\nLoadModule php5_module share/apache/modules/libphp5.so|' \ -e 's|DirectoryIndex index.html|DirectoryIndex index.html index.php|' \ -e 's|mime.types|mime.types\n AddType application/x-httpd-php .php .php3 .php4 .php5\n AddType application/x-httpd-php-source .phps|' \ -i "$1/etc/apache/httpd.conf" } - [ -f "$1/etc/apache/conf.d/phpinfo" ] || \ + + [ -f "$1/etc/apache/conf.d/phpinfo" ] || cat > "$1/etc/apache/conf.d/phpinfo" < Alias /phpinfo /usr/share/phpinfo @@ -49,13 +52,15 @@ Allow from all EOT + # Restart Web server. - if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ]; then + if [ -z "$1" -a -f "/var/run/apache/httpd.pid" ] + then /etc/init.d/apache stop sleep 2 fi - if [ -z "$1" ]; then + if [ -z "$1" ] + then /etc/init.d/apache start fi } - diff -r 550ebe21c230 -r bcea19bfa7af php-cherokee/receipt --- a/php-cherokee/receipt Wed Apr 01 11:42:26 2020 +0200 +++ b/php-cherokee/receipt Wed Apr 01 15:23:29 2020 +0100 @@ -1,29 +1,32 @@ # SliTaz package receipt. PACKAGE="php-cherokee" -VERSION="7.3.16" +VERSION="7.4.4" CATEGORY="development" SHORT_DESC="PHP module for cherokee." MAINTAINER="shann@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.php.net/" + +PROVIDE="php:cherokee" +DEPENDS="cherokee libxml2 php-common zlib" WANTED="php" -PROVIDE="php:cherokee" - -DEPENDS="php-common cherokee libxml2 zlib" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin $fs/usr/share/php - cp -a $src/sapi/cgi/php-cgi $fs/usr/bin + mkdir -p $fs/usr/bin + mkdir -p $fs/usr/share/php + + cp -a $src/sapi/cgi/php-cgi $fs/usr/bin } # Post and pre install commands to stop # and restart Web server if needed. pre_install() { - if [ -z "$1" -a ! -f "/var/run/cherokee.pid" ]; then + if [ -z "$1" -a ! -f "/var/run/cherokee.pid" ] + then /etc/init.d/cherokee stop fi } @@ -48,8 +51,8 @@ # Start Web server. - if [ -z "$1" -a ! -f /var/run/cherokee.pid \ - -a -f /etc/init.d/cherokee ]; then + if [ -z "$1" -a ! -f /var/run/cherokee.pid -a -f /etc/init.d/cherokee ] + then /etc/init.d/cherokee start fi } diff -r 550ebe21c230 -r bcea19bfa7af php-cli/receipt --- a/php-cli/receipt Wed Apr 01 11:42:26 2020 +0200 +++ b/php-cli/receipt Wed Apr 01 15:23:29 2020 +0100 @@ -1,19 +1,19 @@ # SliTaz package receipt. PACKAGE="php-cli" -VERSION="7.3.16" +VERSION="7.4.4" CATEGORY="development" SHORT_DESC="PHP web programming language command line interpreter." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.php.net/" -WANTED="php" DEPENDS="php-common" +WANTED="php" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/bin - cp -a $install/usr/bin/php $fs/usr/bin + cp -a $install/usr/bin/php $fs/usr/bin } diff -r 550ebe21c230 -r bcea19bfa7af php-common/receipt --- a/php-common/receipt Wed Apr 01 11:42:26 2020 +0200 +++ b/php-common/receipt Wed Apr 01 15:23:29 2020 +0100 @@ -1,33 +1,39 @@ # SliTaz package receipt. PACKAGE="php-common" -VERSION="7.3.16" +VERSION="7.4.4" CATEGORY="development" SHORT_DESC="Common files for PHP modules." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.php.net/" + WANTED="php" + CONFIG_FILES="/etc/php.ini" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/etc \ - $fs/usr/share/applications \ - $fs/usr/share/pixmaps - cp -a $stuff/phpinfo $fs/usr/share - cp $stuff/php.desktop $fs/usr/share/applications - cp $stuff/php.png $fs/usr/share/pixmaps - cp $install/etc/php.ini $fs/etc - sed -i 's|.*\(extension_dir.*/usr/share/php.*\)$|\1|' $fs/etc/php.ini + mkdir -p $fs/etc + mkdir -p $fs/usr/share/applications + mkdir -p $fs/usr/share/pixmaps + + cp -a $stuff/phpinfo $fs/usr/share + cp $stuff/php.desktop $fs/usr/share/applications + cp $stuff/php.png $fs/usr/share/pixmaps + cp $install/etc/php.ini $fs/etc + + sed -i 's|.*\(extension_dir.*/usr/share/php.*\)$|\1|' \ + $fs/etc/php.ini } # Post and pre install commands pre_install() { # Backup existing php.ini - if [ -f "$1/etc/php.ini" ]; then + if [ -f "$1/etc/php.ini" ] + then echo echo -n "Creating php.ini backup..." cp "$1/etc/php.ini" "$1/etc/php.ini.bak" @@ -37,7 +43,8 @@ post_install() { # Restore original php.ini - if [ -f "$1/etc/php.ini.bak" ]; then + if [ -f "$1/etc/php.ini.bak" ] + then echo echo -n "Restoring php.ini backup..." mv -f "$1/etc/php.ini.bak" "$1/etc/php.ini" diff -r 550ebe21c230 -r bcea19bfa7af php-curl/receipt --- a/php-curl/receipt Wed Apr 01 11:42:26 2020 +0200 +++ b/php-curl/receipt Wed Apr 01 15:23:29 2020 +0100 @@ -1,32 +1,34 @@ # SliTaz package receipt. PACKAGE="php-curl" -VERSION="7.3.16" +VERSION="7.4.4" CATEGORY="development" SHORT_DESC="curl module for PHP web programming language." MAINTAINER="jozee@slitaz.org" LICENSE="BSD" WEB_SITE="https://www.php.net/" -WANTED="php" DEPENDS="curl php" +WANTED="php" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/share/php - cp $(find $install | grep curl.so) $fs/usr/share/php/ + cp $(find $install | grep curl.so) $fs/usr/share/php } # Post and pre install commans to stop # and restart Web server if needed. pre_install() { - while read daemon file; do - if [ -z "$1" -a -f "/var/run/$file" ]; then + while read daemon file + do + if [ -z "$1" -a -f "/var/run/$file" ] + then /etc/init.d/$daemon stop fi - done < "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \ - -e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n )))|' \ - -i "$1/etc/lighttpd/lighttpd.conf" - grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" || \ - sed -e 's|server.modules = (|server.modules = (\n "mod_fastcgi",|' \ - -i "$1/etc/lighttpd/lighttpd.conf" - grep -q php3 "$1/etc/lighttpd/lighttpd.conf" || \ - sed -e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \ - -i "$1/etc/lighttpd/lighttpd.conf" + sed -i -e 's|#fastcgi.server = ( ".php"|fastcgi.server = ( ".php"|' \ + -e 's|#"bin-path" => "/usr/bin/php-cgi"|"bin-path" => "/usr/bin/php-cgi"|' \ + -e 's|#"socket" => "/tmp/php.socket"|"socket" => "/tmp/php.socket"\n )))|' \ + "$1/etc/lighttpd/lighttpd.conf" + grep -q mod_fastcgi "$1/etc/lighttpd/lighttpd.conf" || + sed -e 's|server.modules = (|server.modules = (\n "mod_fastcgi",|' \ + -i "$1/etc/lighttpd/lighttpd.conf" + grep -q php3 "$1/etc/lighttpd/lighttpd.conf" || \ + sed -e 's|for PHP.*|for PHP.\nfastcgi.map-extensions = ( ".php3" => ".php", ".php4" => ".php", ".php5" => ".php" )|' \ + -i "$1/etc/lighttpd/lighttpd.conf" fi + # Start Web server. - if [ -z "$1" -a ! -f /var/run/lighttpd.pid \ - -a -f /etc/init.d/lighttpd ]; then + if [ -z "$1" -a ! -f /var/run/lighttpd.pid -a -f /etc/init.d/lighttpd ] + then /etc/init.d/lighttpd start fi }