[Pkg-php-commits] [php/debian-sid] New debian patch always_use_system_crypt.patch

[Ondřej Surý]

Author: Ondřej Surý <ondrej at sury.org>
Forwarded: no (upstream doesn't want it)

Description: Disable PHP own implementation of crypt function.  This
 can go back when PHP will only use it's own implementation for
 algorithms not available on the platform and will use system crypt()
 for everything else.
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=572601

Closes: #572601
---
 debian/patches/always_use_system_crypt.patch |   13 +++++++++++++
 debian/patches/series                        |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/always_use_system_crypt.patch

diff --git a/debian/patches/always_use_system_crypt.patch b/debian/patches/always_use_system_crypt.patch
new file mode 100644
index 0000000..cad1b53
--- /dev/null
+++ b/debian/patches/always_use_system_crypt.patch
@@ -0,0 +1,13 @@
+--- a/ext/standard/config.m4
++++ b/ext/standard/config.m4
+@@ -235,7 +235,9 @@ main() {
+ dnl
+ dnl If one of them is missing, use our own implementation, portable code is then possible
+ dnl
+-if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
++dnl Don't use PHP own implementation now.
++dnl if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
++if false; then
+ 
+   dnl
+   dnl Check for __alignof__ support in the compiler
diff --git a/debian/patches/series b/debian/patches/series
index 8e46dfe..6c21ac5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -47,3 +47,4 @@ zend_int_overflow.patch
 fix_var_dump_64bit.phpt.patch
 use_embedded_timezonedb_fixes.patch
 fix_broken_sha2_test.patch
+always_use_system_crypt.patch
-- 
1.6.3.3