diff options
| -rw-r--r-- | phpMyAdmin-phpseclib.patch | 56 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 15 |
2 files changed, 69 insertions, 2 deletions
diff --git a/phpMyAdmin-phpseclib.patch b/phpMyAdmin-phpseclib.patch new file mode 100644 index 0000000..87f254a --- /dev/null +++ b/phpMyAdmin-phpseclib.patch @@ -0,0 +1,56 @@ +From c6e76422c41e1c573c0c0163376a61d4556083b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com> +Date: Thu, 12 Jun 2014 10:06:20 +0200 +Subject: [PATCH] Allow to use system phpseclib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Michal Čihař <michal@cihar.com> +--- + doc/vendors.rst | 3 ++- + libraries/plugins/auth/AuthenticationCookie.class.php | 4 ++-- + libraries/vendor_config.php | 5 +++++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php +index 9683b78..88bd852 100644 +--- a/libraries/plugins/auth/AuthenticationCookie.class.php ++++ b/libraries/plugins/auth/AuthenticationCookie.class.php +@@ -718,7 +718,7 @@ public function blowfishEncrypt($data, $secret) + * if/then/else logic, however the include_once + * call is costly + */ +- include_once "./libraries/phpseclib/Crypt/AES.php"; ++ include_once PHPSECLIB_INC_DIR . '/Crypt/AES.php'; + $cipher = new Crypt_AES(CRYPT_AES_MODE_ECB); + $cipher->setKey($secret); + return base64_encode($cipher->encrypt($data)); +@@ -750,7 +750,7 @@ public function blowfishDecrypt($encdata, $secret) + $this->_blowfish_iv = base64_decode($_COOKIE['pma_mcrypt_iv'], true); + } + if (! function_exists('mcrypt_encrypt')) { +- include_once "./libraries/phpseclib/Crypt/AES.php"; ++ include_once PHPSECLIB_INC_DIR . '/Crypt/AES.php'; + $cipher = new Crypt_AES(CRYPT_AES_MODE_ECB); + $cipher->setKey($secret); + return $cipher->decrypt(base64_decode($encdata)); +diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php +index ea72b64..0ba36b0 100644 +--- a/libraries/vendor_config.php ++++ b/libraries/vendor_config.php +@@ -75,6 +75,11 @@ + define('TCPDF_INC', './libraries/tcpdf/tcpdf.php'); + + /** ++ * Path to the phpseclib. Useful when you want to use system phpseclib. ++ */ ++define('PHPSECLIB_INC_DIR', './libraries/phpseclib/'); ++ ++/** + * Avoid referring to nonexistent files (causes warnings when open_basedir + * is used) + */ +-- +1.9.3 + diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 1a6b70d..a192fee 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -14,7 +14,7 @@ Name: phpMyAdmin Version: 4.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Web based MySQL browser written in php Group: Applications/Internet @@ -23,6 +23,8 @@ URL: http://www.phpmyadmin.net/ Source0: http://downloads.sourceforge.net/sourceforge/phpmyadmin/%{name}-%{version}%{?prever:-%prever}-all-languages.tar.bz2 Source2: phpMyAdmin.htaccess +Patch0: %{name}-phpseclib.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: unzip @@ -42,7 +44,6 @@ Requires: php-iconv Requires: php-json Requires: php-libxml Requires: php-mbstring -Requires: php-mcrypt Requires: php-mysqli Requires: php-openssl Requires: php-pcre @@ -58,6 +59,7 @@ Requires: php-zlib Requires: php-php-gettext Requires: php-tcpdf Requires: php-tcpdf-dejavu-sans-fonts +Requires: php-phpseclib-crypt-aes Provides: phpmyadmin = %{version}-%{release} Obsoletes: phpMyAdmin3 @@ -74,6 +76,8 @@ is available in 50 languages %prep %setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages +%patch0 -p1 + # Minimal configuration file sed -e "/'extension'/s@'mysql'@'mysqli'@" \ -e "/'blowfish_secret'/s@''@'MUSTBECHANGEDONINSTALL'@" \ @@ -88,6 +92,7 @@ sed -e "/'CHANGELOG_FILE'/s@./ChangeLog@%{_pkgdocdir}/ChangeLog@" \ -e "/'SETUP_CONFIG_FILE'/s@./config/config.inc.php@%{_localstatedir}/lib/%{name}/config/config.inc.php@" \ -e "/'GETTEXT_INC'/s@./libraries/php-gettext/gettext.inc@%{_datadir}/php/gettext/gettext.inc@" \ -e "/'TCPDF_INC'/s@./libraries/tcpdf/tcpdf.php@%{_datadir}/php/tcpdf/tcpdf.php@" \ + -e "/'PHPSECLIB_INC_DIR'/s@./libraries/phpseclib@%{_datadir}/pear@" \ -i libraries/vendor_config.php # For debug @@ -104,6 +109,7 @@ find . -name \*.php -exec chmod -x {} \; # Remove bundled libraries rm -r libraries/php-gettext rm -r libraries/tcpdf +rm -r libraries/phpseclib # Remove sources of JavaScript librairies rm -r js/jquery/src @@ -164,6 +170,11 @@ sed -i -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$RANDOM$RANDOM$RANDOM$RAN %changelog +* Tue Jul 8 2014 Remi Collet <rpms@famillecollet.com> 4.2.5-2 +- apply upstream patch to use system phpseclib +- add dependency on php-phpseclib-crypt-aes +- drop dependency on php-mcrypt + * Thu Jun 26 2014 Remi Collet <rpms@famillecollet.com> 4.2.5-1 - update to 4.2.5 (Thu, 26 Jun 2014, bugfix) |