diff --git a/srcpkgs/php-mcrypt b/srcpkgs/php-sodium similarity index 100% rename from srcpkgs/php-mcrypt rename to srcpkgs/php-sodium diff --git a/srcpkgs/php/patches/php.ini.patch b/srcpkgs/php/patches/php.ini.patch index 61b3d9930c9..48c55ae5013 100644 --- a/srcpkgs/php/patches/php.ini.patch +++ b/srcpkgs/php/patches/php.ini.patch @@ -27,91 +27,3 @@ ; On windows: ; extension_dir = "ext" -@@ -857,47 +857,46 @@ - ; If you only provide the name of the extension, PHP will look for it in its - ; default extension directory. - ; --; Windows Extensions --; Note that ODBC support is built in, so no dll is needed for it. --; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5+) --; extension folders as well as the separate PECL DLL download (PHP 5+). --; Be sure to appropriately set the extension_dir directive. --; --;extension=php_bz2.dll --;extension=php_curl.dll --;extension=php_fileinfo.dll --;extension=php_ftp.dll --;extension=php_gd2.dll --;extension=php_gettext.dll --;extension=php_gmp.dll --;extension=php_intl.dll --;extension=php_imap.dll --;extension=php_interbase.dll --;extension=php_ldap.dll --;extension=php_mbstring.dll --;extension=php_exif.dll ; Must be after mbstring as it depends on it --;extension=php_mysqli.dll --;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client --;extension=php_openssl.dll --;extension=php_pdo_firebird.dll --;extension=php_pdo_mysql.dll --;extension=php_pdo_oci.dll --;extension=php_pdo_odbc.dll --;extension=php_pdo_pgsql.dll --;extension=php_pdo_sqlite.dll --;extension=php_pgsql.dll --;extension=php_shmop.dll -- --; The MIBS data available in the PHP distribution must be installed. --; See http://www.php.net/manual/en/snmp.installation.php --;extension=php_snmp.dll -- --;extension=php_soap.dll --;extension=php_sockets.dll --;extension=php_sqlite3.dll --;extension=php_tidy.dll --;extension=php_xmlrpc.dll --;extension=php_xsl.dll -+;extension=bcmath.so -+;extension=bz2.so -+;extension=calendar.so -+extension=curl.so -+;extension=dba.so -+;extension=enchant.so -+;extension=exif.so -+;extension=ftp.so -+;extension=gd.so -+extension=gettext.so -+;extension=gmp.so -+;extension=iconv.so -+;extension=imap.so -+;extension=intl.so -+;extension=ldap.so -+;extension=mcrypt.so -+;extension=mysqli.so -+;extension=odbc.so -+;zend_extension=opcache.so -+;extension=openssl.so -+;extension=pdo_mysql.so -+;extension=pdo_odbc.so -+;extension=pdo_pgsql.so -+;extension=pdo_sqlite.so -+;extension=pgsql.so -+;extension=phar.so -+;extension=posix.so -+;extension=pspell.so -+;extension=shmop.so -+;extension=snmp.so -+;extension=soap.so -+;extension=sockets.so -+;extension=sqlite3.so -+;extension=sysvmsg.so -+;extension=sysvsem.so -+;extension=sysvshm.so -+;extension=tidy.so -+;extension=xmlrpc.so -+;extension=xsl.so -+;extension=zip.so - - ;;;;;;;;;;;;;;;;;;; - ; Module Settings ; diff --git a/srcpkgs/php/template b/srcpkgs/php/template index 11f64c02e09..8c47b9b6861 100644 --- a/srcpkgs/php/template +++ b/srcpkgs/php/template @@ -1,6 +1,6 @@ # Template build file for 'php' pkgname=php -version=7.1.12 +version=7.2.0 revision=1 short_desc="An HTML-embedded scripting language" maintainer="Steve Prybylski " @@ -9,13 +9,13 @@ homepage="http://www.php.net" hostmakedepends="pkg-config bison" makedepends="postgresql-libs-devel libldap-devel sqlite-devel unixodbc-devel freetds-devel net-snmp-devel libzip-devel enchant-devel - libmcrypt-devel libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel + libsodium-devel libltdl-devel libpng-devel libjpeg-turbo-devel icu-devel libcurl-devel libxslt-devel libressl-devel bzip2-devel zlib-devel db-devel gmp-devel gdbm-devel freetype-devel apache-devel libtidy5-devel readline-devel libmysqlclient-devel" conf_files="/etc/php/php.ini" distfiles="http://www.php.net/distributions/php-${version}.tar.xz" -checksum=a0118850774571b1f2d4e30b4fe7a4b958ca66f07d07d65ebdc789c54ba6eeb3 +checksum=87572a6b924670a5d4aac276aaa4a94321936283df391d702c845ffc112db095 # Needs (probably a lot of) work to make it cross compile nocross="https://build.voidlinux.eu/builders/armv7l-musl_builder/builds/16307/steps/shell_3/logs/stdio" @@ -42,7 +42,6 @@ do_build() { --enable-calendar=shared \ --enable-exif=shared \ --enable-ftp=shared \ - --enable-gd-native-ttf \ --enable-intl=shared \ --enable-mbstring \ --enable-opcache \ @@ -71,7 +70,7 @@ do_build() { --with-jpeg-dir=/usr \ --with-ldap=shared \ --with-ldap-sasl \ - --with-mcrypt=shared \ + --with-sodium=shared \ --with-mhash \ --with-mysql-sock=/run/mysqld/mysqld.sock \ --with-mysqli=shared,mysqlnd \ @@ -242,15 +241,6 @@ php-ldap_package() { } } -php-mcrypt_package() { - lib32disabled=yes - depends="php-${version}_${revision}" - short_desc+=' - mcrypt module' - pkg_install() { - vmove usr/lib/php/modules/mcrypt.so - } -} - php-mysql_package() { lib32disabled=yes depends="php-${version}_${revision}" @@ -313,3 +303,12 @@ php-xsl_package() { vmove usr/lib/php/modules/xsl.so } } + +php-sodium_package() { + lib32disabled=yes + depends="php-${version}_${revision}" + short_desc+=' - sodium module' + pkg_install() { + vmove usr/lib/php/modules/sodium.so + } +}