[arch-commits] Commit in phpldapadmin/trunk (PKGBUILD disable-mcrypt.patch)

[Sergej Pupykin]

    Date: Thursday, February 2, 2017 @ 17:04:29
  Author: spupykin
Revision: 209718

upgpkg: phpldapadmin 1.2.3-8

upd

Added:
  phpldapadmin/trunk/disable-mcrypt.patch
Modified:
  phpldapadmin/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   12 ++++++++----
 disable-mcrypt.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2017-02-02 16:22:24 UTC (rev 209717)
+++ PKGBUILD    2017-02-02 17:04:29 UTC (rev 209718)
@@ -3,7 +3,7 @@
 
 pkgname=phpldapadmin
 pkgver=1.2.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW"
 arch=('any')
 url="http://phpldapadmin.sourceforge.net/";
@@ -12,9 +12,11 @@
 makedepends=('optipng')
 backup=("etc/webapps/phpldapadmin/config.php")
 
source=(http://downloads.sourceforge.net/project/phpldapadmin/phpldapadmin-php5/$pkgver/phpldapadmin-$pkgver.tgz
-        phpldapadmin-1.2.3-php5_5.patch )
-md5sums=('59a49054039ceb852c2da377d8742360'
-         '45ebc875c588ff6756369b949ffe7401')
+        phpldapadmin-1.2.3-php5_5.patch
+        disable-mcrypt.patch)
+sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58'
+            'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76'
+            'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837')
 
 build() {
   cd "$srcdir"/phpldapadmin-${pkgver}/
@@ -21,6 +23,8 @@
   find -name '*.png' -exec optipng -quiet -force -fix {} \;
   # patch from http://pkgs.fedoraproject.org/cgit/phpldapadmin.git/tree/
   patch -p1 -i "$srcdir"/phpldapadmin-1.2.3-php5_5.patch
+  # php >7 deprecates mcrypt. TODO: replace it with openssl?
+  patch -p1 -i "$srcdir"/disable-mcrypt.patch
 }
 
 package() {

Added: disable-mcrypt.patch
===================================================================
--- disable-mcrypt.patch                                (rev 0)
+++ disable-mcrypt.patch        2017-02-02 17:04:29 UTC (rev 209718)
@@ -0,0 +1,36 @@
+diff -wbBur phpldapadmin-1.2.3/lib/functions.php 
phpldapadmin-1.2.3.my/lib/functions.php
+--- phpldapadmin-1.2.3/lib/functions.php       2012-10-01 10:54:14.000000000 
+0400
++++ phpldapadmin-1.2.3.my/lib/functions.php    2017-02-02 20:02:14.424245233 
+0300
+@@ -745,6 +745,7 @@
+       if (! trim($secret))
+               return $data;
+ 
++/*
+       if (function_exists('mcrypt_module_open') && ! empty($data)) {
+               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -754,7 +755,7 @@
+ 
+               return $encrypted_data;
+       }
+-
++*/
+       if (file_exists(LIBDIR.'blowfish.php'))
+               require_once LIBDIR.'blowfish.php';
+       else
+@@ -801,6 +802,7 @@
+       if (! trim($secret))
+               return $encdata;
+ 
++/*
+       if (function_exists('mcrypt_module_open') && ! empty($encdata)) {
+               $td = mcrypt_module_open(MCRYPT_BLOWFISH,'',MCRYPT_MODE_ECB,'');
+               $iv = 
mcrypt_create_iv(mcrypt_enc_get_iv_size($td),MCRYPT_DEV_URANDOM);
+@@ -810,6 +812,7 @@
+ 
+               return $decrypted_data;
+       }
++*/
+ 
+       if (file_exists(LIBDIR.'blowfish.php'))
+               require_once LIBDIR.'blowfish.php';