diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-28 13:54:43 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-03-28 18:38:20 +0200 |
| commit | 4272e802a1be191657becb739e6a248c1d0411a7 (patch) | |
| tree | a07a25b7c99d7da326957a88173ba49583cf6b2a /main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch | |
| parent | 3e272105092cd9804a5a022a188db929ebf440da (diff) | |
| download | aports-4272e802a1be191657becb739e6a248c1d0411a7.tar.bz2 aports-4272e802a1be191657becb739e6a248c1d0411a7.tar.xz | |
community/*: move php5 and dependent pkgs from main
There two main reasons for this change:
* Active support of PHP 5.x ended on January 2017, security support will
end on December 2018. Packages in the main repository should be
supported for at least 2 years, this means until first quarter of 2019
for the upcoming v3.6.
* php7 and its extensions are currently in the community repository, so
we can't use single abuild for both php5-* and php7-* packages (as we
do for Python and Lua packages).
This change was suggested by @vakartel, approved by @ncopa, @kaniini, and
@jirutka.
Diffstat (limited to 'main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch')
| -rw-r--r-- | main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch b/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch deleted file mode 100644 index d2fa12a477..0000000000 --- a/main/phpldapadmin/phpldapadmin-1.2.3_changed-preg_replace-to-preg_replace-callback.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b082cf1742b2310d69b2f278f33f6025e2544acb Mon Sep 17 00:00:00 2001 -From: Mohamad Elrashidin Bin Sajeli <archayl@gmail.com> -Date: Thu, 8 May 2014 20:40:57 +0800 -Subject: [PATCH] Changed preg_replace to preg_replace callback - ---- - lib/functions.php | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/lib/functions.php b/lib/functions.php -index ad9ee9f..d31e0c1 100644 ---- a/lib/functions.php -+++ b/lib/functions.php -@@ -2565,12 +2565,22 @@ function dn_unescape($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 ($r) { -+ return "''.chr(hexdec('$r[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 ($r) { -+ return "''.chr(hexdec('$r[1]')).''"; -+ }, -+ $dn -+ ); - } - } - |