commit b23d4eb31bc735233db21baa29963b03edbe3df4
Author: Elan Ruusamäe <g...@pld-linux.org>
Date: Mon Jul 10 09:16:47 2017 +0300
mcrypt ext removed from core
https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts#extmcrypt
https://wiki.php.net/rfc/mcrypt-viking-funeral
mcrypt-libs.patch | 19 -------------------
php.spec | 31 -------------------------------
2 files changed, 50 deletions(-)
---
diff --git a/php.spec b/php.spec
index 85bab66..063e440 100644
--- a/php.spec
+++ b/php.spec
@@ -67,7 +67,6 @@
%bcond_without json # without json extension module
%bcond_without ldap # without LDAP extension module
%bcond_without mbstring # without mbstring extension module
-%bcond_without mcrypt # without mbcrypt extension module
%bcond_without mhash # without mhash extension (supported by hash
extension)
%bcond_without mysqli # without mysqli support (Requires mysql >= 4.1)
%bcond_without mysqlnd # without mysqlnd support in mysql related
extensions
@@ -211,7 +210,6 @@ Patch53: fix-test-run.patch
Patch55: bug-52078-fileinode.patch
Patch59: %{orgname}-systzdata.patch
Patch60: %{orgname}-oracle-instantclient.patch
-Patch62: mcrypt-libs.patch
Patch65: system-libzip.patch
Patch66: php-db.patch
Patch67: mysql-lib-ver-mismatch.patch
@@ -248,7 +246,6 @@ BuildRequires: gmp-devel >= 4.2
%{?with_intl:BuildRequires: libicu-devel >= 4.4}
BuildRequires: libjpeg-devel
BuildRequires: libltdl-devel >= 1.4
-BuildRequires: libmcrypt-devel >= 2.5.6
BuildRequires: libpng-devel >= 1.0.8
%{?with_intl:BuildRequires: libstdc++-devel}
%{?with_webp:BuildRequires: libwebp-devel}
@@ -1116,23 +1113,6 @@ string support.
%description mbstring -l pl.UTF-8
Moduł PHP dodający obsługę ciągów znaków wielobajtowych.
-%package mcrypt
-Summary: mcrypt extension module for PHP
-Summary(pl.UTF-8): Moduł mcrypt dla PHP
-Group: Libraries
-URL: http://php.net/manual/en/book.mcrypt.php
-Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: libmcrypt >= 2.5.6
-Provides: php(mcrypt)
-Obsoletes: php-mcrypt < 4:5.3.28-7
-
-%description mcrypt
-This is a dynamic shared object (DSO) for PHP that will add mcrypt
-support.
-
-%description mcrypt -l pl.UTF-8
-Moduł PHP dodający możliwość szyfrowania poprzez bibliotekę mcrypt.
-
%package mysqli
Summary: MySQLi module for PHP
Summary(pl.UTF-8): Moduł MySQLi dla PHP
@@ -2018,7 +1998,6 @@ cp -p php.ini-production php.ini
%patch55 -p1
%patch59 -p1
%patch60 -p1
-%patch62 -p1
%{?with_system_libzip:%patch65 -p1}
%patch66 -p1
%patch67 -p1
@@ -2374,7 +2353,6 @@ for sapi in $sapis; do
%{?with_interbase:--with-interbase=shared%{!?with_interbase_inst:,/usr}} \
--with-jpeg-dir=/usr \
%{?with_ldap:--with-ldap=shared --with-ldap-sasl} \
- %{__with_without mcrypt mcrypt shared} \
%{?with_mm:--with-mm} \
%{?with_mysqlnd:--enable-mysqlnd=shared} \
%{?with_mysqli:--with-mysqli=shared,%{!?with_mysqlnd:/usr/bin/mysql_config}%{?with_mysqlnd:mysqlnd}}
\
@@ -2849,7 +2827,6 @@ fi \
%extension_scripts json
%extension_scripts ldap
%extension_scripts mbstring
-%extension_scripts mcrypt
%extension_scripts mysqli
%extension_scripts mysqlnd
%extension_scripts oci8
@@ -3190,14 +3167,6 @@ fi
%attr(755,root,root) %{php_extensiondir}/mbstring.so
%endif
-%if %{with mcrypt}
-%files mcrypt
-%defattr(644,root,root,755)
-%doc ext/mcrypt/{CREDITS,TODO}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mcrypt.ini
-%attr(755,root,root) %{php_extensiondir}/mcrypt.so
-%endif
-
%if %{with mysqli}
%files mysqli
%defattr(644,root,root,755)
diff --git a/mcrypt-libs.patch b/mcrypt-libs.patch
deleted file mode 100644
index 2bc029c..0000000
--- a/mcrypt-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- php-5.3.6/ext/mcrypt/config.m4~ 2010-01-15 23:02:20.000000000 +0200
-+++ php-5.3.6/ext/mcrypt/config.m4 2011-04-09 16:18:07.634572726 +0300
-@@ -36,7 +36,6 @@
-
- PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
- [
-- PHP_ADD_LIBRARY(ltdl,, MCRYPT_SHARED_LIBADD)
- AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
- ],[
- PHP_CHECK_LIBRARY(mcrypt, mcrypt_module_open,
-@@ -48,7 +47,7 @@
- -L$MCRYPT_DIR/$PHP_LIBDIR
- ])
- ],[
-- -L$MCRYPT_DIR/$PHP_LIBDIR -lltdl
-+ -L$MCRYPT_DIR/$PHP_LIBDIR
- ])
-
- PHP_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/$PHP_LIBDIR,
MCRYPT_SHARED_LIBADD)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/b23d4eb31bc735233db21baa29963b03edbe3df4
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
