Date: Thursday, February 2, 2017 @ 17:04:42 Author: spupykin Revision: 209719
archrelease: copy trunk to community-any Added: phpldapadmin/repos/community-any/PKGBUILD (from rev 209718, phpldapadmin/trunk/PKGBUILD) phpldapadmin/repos/community-any/disable-mcrypt.patch (from rev 209718, phpldapadmin/trunk/disable-mcrypt.patch) phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch (from rev 209718, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch) Deleted: phpldapadmin/repos/community-any/PKGBUILD phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch ---------------------------------+ PKGBUILD | 74 ++++++++------- disable-mcrypt.patch | 36 +++++++ phpldapadmin-1.2.3-php5_5.patch | 176 +++++++++++++++++++------------------- 3 files changed, 163 insertions(+), 123 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-02-02 17:04:29 UTC (rev 209718) +++ PKGBUILD 2017-02-02 17:04:42 UTC (rev 209719) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> - -pkgname=phpldapadmin -pkgver=1.2.3 -pkgrel=7 -pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW" -arch=('any') -url="http://phpldapadmin.sourceforge.net/" -license=('GPL') -depends=('libldap' 'php' 'php-ldap') -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') - -build() { - cd $srcdir/phpldapadmin-${pkgver}/ - 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 -} - -package() { - _instdir=$pkgdir/usr/share/webapps/phpldapadmin - mkdir -p ${_instdir} $pkgdir/etc/webapps/phpldapadmin - cd ${_instdir} - - cp -ra $srcdir/phpldapadmin-${pkgver}/* . - - ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php - cp ${_instdir}/config/config.php.example $pkgdir/etc/webapps/phpldapadmin/config.php -} Copied: phpldapadmin/repos/community-any/PKGBUILD (from rev 209718, phpldapadmin/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-02-02 17:04:42 UTC (rev 209719) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=phpldapadmin +pkgver=1.2.3 +pkgrel=8 +pkgdesc="A PHP and hence web-based tool to administrate LDAP over the WWW" +arch=('any') +url="http://phpldapadmin.sourceforge.net/" +license=('GPL') +depends=('libldap' 'php' 'php-ldap') +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 + disable-mcrypt.patch) +sha256sums=('aecaf8c3ce77ba3899dd31ee5ee183555b2f9349eb8e196dcd33d8a3c485ed58' + 'ecafce992e8b68426eacdc3702268f2cb57d9ebed662b0edcc614a6e24623c76' + 'b31774abab4dd603ec9acbeda49adb188890173ee93042a811b5724e01edd837') + +build() { + cd "$srcdir"/phpldapadmin-${pkgver}/ + 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() { + _instdir="$pkgdir"/usr/share/webapps/phpldapadmin + mkdir -p ${_instdir} "$pkgdir"/etc/webapps/phpldapadmin + cd ${_instdir} + + cp -ra "$srcdir"/phpldapadmin-${pkgver}/* . + + ln -s /etc/webapps/phpldapadmin/config.php ${_instdir}/config/config.php + cp ${_instdir}/config/config.php.example "$pkgdir"/etc/webapps/phpldapadmin/config.php +} Copied: phpldapadmin/repos/community-any/disable-mcrypt.patch (from rev 209718, phpldapadmin/trunk/disable-mcrypt.patch) =================================================================== --- disable-mcrypt.patch (rev 0) +++ disable-mcrypt.patch 2017-02-02 17:04:42 UTC (rev 209719) @@ -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'; Deleted: phpldapadmin-1.2.3-php5_5.patch =================================================================== --- phpldapadmin-1.2.3-php5_5.patch 2017-02-02 17:04:29 UTC (rev 209718) +++ phpldapadmin-1.2.3-php5_5.patch 2017-02-02 17:04:42 UTC (rev 209719) @@ -1,88 +0,0 @@ -diff -Nrbu phpldapadmin-1.2.3/lib/PageRender.php phpldapadmin-1.2.3-OK/lib/PageRender.php ---- phpldapadmin-1.2.3/lib/PageRender.php 2012-10-01 10:54:14.000000000 +0400 -+++ phpldapadmin-1.2.3-OK/lib/PageRender.php 2013-11-12 03:44:40.518144839 +0400 -@@ -287,7 +287,7 @@ - break; - - default: -- $vals[$i] = password_hash($passwordvalue,$enc); -+ $vals[$i] = pla_password_hash($passwordvalue,$enc); - } - - $vals = array_unique($vals); -diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php ---- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.000000000 +0400 -+++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-11-12 03:40:56.638343739 +0400 -@@ -1117,12 +1117,14 @@ - if (is_array($dn)) { - $a = array(); - foreach ($dn as $key => $rdn) -- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); -+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($matches) { return chr(hexdec($matches[1])); }, $rdn); - - return $a; - - } else -- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); -+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($matches) { return chr(hexdec($matches[1])); }, $dn); - } - - public function getRootDSE($method=null) { -diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php ---- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000 +0400 -+++ phpldapadmin-1.2.3-OK/lib/functions.php 2013-11-12 03:44:17.298065264 +0400 -@@ -2127,7 +2127,7 @@ - * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear. - * @return string The hashed password. - */ --function password_hash($password_clear,$enc_type) { -+function pla_password_hash($password_clear,$enc_type) { - if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) - debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); - -@@ -2318,7 +2318,7 @@ - - # SHA crypted passwords - case 'sha': -- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) -+ if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2327,7 +2327,7 @@ - - # MD5 crypted passwords - case 'md5': -- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) -+ if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2392,7 +2392,7 @@ - - # SHA512 crypted passwords - case 'sha512': -- if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) -+ if (strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) - return true; - else - return false; -@@ -2565,12 +2565,14 @@ - $a = array(); - - foreach ($dn as $key => $rdn) -- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); -+ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($matches) { return chr(hexdec($matches[1])); }, $rdn ); - - return $a; - - } else { -- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); -+ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', -+ function ($matches) { return chr(hexdec($matches[1])); }, $dn); - } - } - Copied: phpldapadmin/repos/community-any/phpldapadmin-1.2.3-php5_5.patch (from rev 209718, phpldapadmin/trunk/phpldapadmin-1.2.3-php5_5.patch) =================================================================== --- phpldapadmin-1.2.3-php5_5.patch (rev 0) +++ phpldapadmin-1.2.3-php5_5.patch 2017-02-02 17:04:42 UTC (rev 209719) @@ -0,0 +1,88 @@ +diff -Nrbu phpldapadmin-1.2.3/lib/PageRender.php phpldapadmin-1.2.3-OK/lib/PageRender.php +--- phpldapadmin-1.2.3/lib/PageRender.php 2012-10-01 10:54:14.000000000 +0400 ++++ phpldapadmin-1.2.3-OK/lib/PageRender.php 2013-11-12 03:44:40.518144839 +0400 +@@ -287,7 +287,7 @@ + break; + + default: +- $vals[$i] = password_hash($passwordvalue,$enc); ++ $vals[$i] = pla_password_hash($passwordvalue,$enc); + } + + $vals = array_unique($vals); +diff -Nrbu phpldapadmin-1.2.3/lib/ds_ldap.php phpldapadmin-1.2.3-OK/lib/ds_ldap.php +--- phpldapadmin-1.2.3/lib/ds_ldap.php 2012-10-01 10:54:14.000000000 +0400 ++++ phpldapadmin-1.2.3-OK/lib/ds_ldap.php 2013-11-12 03:40:56.638343739 +0400 +@@ -1117,12 +1117,14 @@ + if (is_array($dn)) { + $a = array(); + foreach ($dn as $key => $rdn) +- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); ++ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($matches) { return chr(hexdec($matches[1])); }, $rdn); + + return $a; + + } else +- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); ++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($matches) { return chr(hexdec($matches[1])); }, $dn); + } + + public function getRootDSE($method=null) { +diff -Nrbu phpldapadmin-1.2.3/lib/functions.php phpldapadmin-1.2.3-OK/lib/functions.php +--- phpldapadmin-1.2.3/lib/functions.php 2012-10-01 10:54:14.000000000 +0400 ++++ phpldapadmin-1.2.3-OK/lib/functions.php 2013-11-12 03:44:17.298065264 +0400 +@@ -2127,7 +2127,7 @@ + * crypt, ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, sha512, or clear. + * @return string The hashed password. + */ +-function password_hash($password_clear,$enc_type) { ++function pla_password_hash($password_clear,$enc_type) { + if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) + debug_log('Entered (%%)',1,0,__FILE__,__LINE__,__METHOD__,$fargs); + +@@ -2318,7 +2318,7 @@ + + # SHA crypted passwords + case 'sha': +- if (strcasecmp(password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) ++ if (strcasecmp(pla_password_hash($plainpassword,'sha'),'{SHA}'.$cryptedpassword) == 0) + return true; + else + return false; +@@ -2327,7 +2327,7 @@ + + # MD5 crypted passwords + case 'md5': +- if( strcasecmp(password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) ++ if( strcasecmp(pla_password_hash($plainpassword,'md5'),'{MD5}'.$cryptedpassword) == 0) + return true; + else + return false; +@@ -2392,7 +2392,7 @@ + + # SHA512 crypted passwords + case 'sha512': +- if (strcasecmp(password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) ++ if (strcasecmp(pla_password_hash($plainpassword,'sha512'),'{SHA512}'.$cryptedpassword) == 0) + return true; + else + return false; +@@ -2565,12 +2565,14 @@ + $a = array(); + + foreach ($dn as $key => $rdn) +- $a[$key] = preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$rdn); ++ $a[$key] = preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($matches) { return chr(hexdec($matches[1])); }, $rdn ); + + return $a; + + } else { +- return preg_replace('/\\\([0-9A-Fa-f]{2})/e',"''.chr(hexdec('\\1')).''",$dn); ++ return preg_replace_callback('/\\\([0-9A-Fa-f]{2})/', ++ function ($matches) { return chr(hexdec($matches[1])); }, $dn); + } + } +