From 11442dd9e4ec1ab2926a9b3f82e151a7f0a7f252 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 8 Mar 2019 20:51:30 +0700 Subject: [PATCH] Drop php5 php5 has been completely removed from Sisyphus following its EOL: http://git.altlinux.org/tasks/archive/done/_214/219816/ --- features.in/server/config.mk | 2 +- pkg.in/groups/server/php5.directory | 10 ---------- pkg.in/lists/server/php5 | 22 ---------------------- pkg.in/lists/tagged/server+zabbix | 10 +++++----- 4 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 pkg.in/groups/server/php5.directory delete mode 100644 pkg.in/lists/server/php5 diff --git a/features.in/server/config.mk b/features.in/server/config.mk index cfc22311..26092a79 100644 --- a/features.in/server/config.mk +++ b/features.in/server/config.mk @@ -44,7 +44,7 @@ use/server/groups/services: use/server @$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail) @$(call add,MAIN_GROUPS,server/apache2 server/nginx) @$(call add,MAIN_GROUPS,server/mariadb server/pgsql) - @$(call add,MAIN_GROUPS,server/php5 server/php7) + @$(call add,MAIN_GROUPS,server/php7) @$(call add,MAIN_GROUPS,server/ftp server/rsync) @$(call add,MAIN_GROUPS,server/kvm) @$(call add,DEFAULT_SERVICES_DISABLE,php7-fpm) diff --git a/pkg.in/groups/server/php5.directory b/pkg.in/groups/server/php5.directory deleted file mode 100644 index 924d6b33..00000000 --- a/pkg.in/groups/server/php5.directory +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Directory -Name=PHP 5 support -X-Alterator-PackageList=server/php5 -X-Alterator-Required=no -X-Alterator-Conflicts=server/php7 -Name[ru_RU]=Поддержка PHP 5 -Categories=Server;Networking - diff --git a/pkg.in/lists/server/php5 b/pkg.in/lists/server/php5 deleted file mode 100644 index bcc84361..00000000 --- a/pkg.in/lists/server/php5 +++ /dev/null @@ -1,22 +0,0 @@ -apache2-mod_php5 -php5 -php5-cgi -php5-curl -php5-dba -php5-dom -php5-exif -php5-fileinfo -php5-fpm-fcgi -php5-gd2 -php5-imap -php5-ldap -php5-mbstring -php5-mcrypt -php5-memcache -php5-mhash -php5-mysql -php5-pgsql -php5-suhosin -php5-xmlrpc -php5-xsl -php5-zip diff --git a/pkg.in/lists/tagged/server+zabbix b/pkg.in/lists/tagged/server+zabbix index 160721d8..a446b5c5 100644 --- a/pkg.in/lists/tagged/server+zabbix +++ b/pkg.in/lists/tagged/server+zabbix @@ -1,5 +1,5 @@ zabbix-server-mysql -zabbix-phpfrontend-apache2-mod_php5 +zabbix-phpfrontend-apache2-mod_php7 zabbix-agent zabbix-preinstall @@ -7,10 +7,10 @@ zabbix-preinstall MySQL-server MySQL-client -php5-gd2 -php5-mbstring -php5-mysqli -php5-sockets +php7-gd2 +php7-mbstring +php7-mysqli +php7-sockets postfix mailx