diff options
author | Alex Legler <a3li@gentoo.org> | 2010-10-22 17:29:21 +0000 |
---|---|---|
committer | Alex Legler <a3li@gentoo.org> | 2010-10-22 17:29:21 +0000 |
commit | f8e88ad1755b675d982f053c9b8ba4a33b3e4eb7 (patch) | |
tree | e7fe1f364306aa5f1ed1dbf31f87ca4d814ce6ca /dev-db/phpmyadmin/files | |
parent | stable x86, bug 341555 (diff) | |
download | gentoo-2-f8e88ad1755b675d982f053c9b8ba4a33b3e4eb7.tar.gz gentoo-2-f8e88ad1755b675d982f053c9b8ba4a33b3e4eb7.tar.bz2 gentoo-2-f8e88ad1755b675d982f053c9b8ba4a33b3e4eb7.zip |
Removing vulnerable older versions (bug #336462 et. al.)
(Portage version: 2.2_rc99/cvs/Linux x86_64)
Diffstat (limited to 'dev-db/phpmyadmin/files')
-rw-r--r-- | dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch | 14 | ||||
-rw-r--r-- | dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt | 35 | ||||
-rw-r--r-- | dev-db/phpmyadmin/files/reconfig-2.8 | 16 |
3 files changed, 0 insertions, 65 deletions
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch b/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch deleted file mode 100644 index 9e75b8d877b0..000000000000 --- a/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php -=================================================================== ---- phpMyAdmin-2.11.5-all-languages-utf-8-only.orig/libraries/dbi/mysqli.dbi.lib.php -+++ phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php -@@ -97,6 +97,9 @@ function PMA_DBI_connect($user, $passwor - /* Optionally enable SSL */ - if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) { - $client_flags |= MYSQLI_CLIENT_SSL; -+ if ($GLOBALS['cfg']['Server']['ssl-key'] && $GLOBALS['cfg']['Server']['ssl-cert'] && $GLOBALS['cfg']['Server']['ssl-ca']) { -+ mysqli_ssl_set($link, $GLOBALS['cfg']['Server']['ssl-key'], $GLOBALS['cfg']['Server']['ssl-cert'], $GLOBALS['cfg']['Server']['ssl-ca'], null, null); -+ } - } - - $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags); diff --git a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt deleted file mode 100644 index d297c7b46220..000000000000 --- a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt +++ /dev/null @@ -1,35 +0,0 @@ -If this is a new installation: - -1. Configure ${PN}: - -a) Create config.inc.php. You can use the web-based installer: - - mkdir ${MY_INSTALLDIR}/config - chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config - - then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php - - once you've saved the configuration: - - cp ${MY_INSTALLDIR}/config/config.inc.php ${MY_INSTALLDIR}/config.inc.php - rm -rf ${MY_INSTALLDIR}/config - -b) Alternatively, use an existing configuration: - - cp <path to existing config.inc.php file> ${MY_INSTALLDIR}/ - -c) Alternatively, use the sample config file: - - cp ${MY_INSTALLDIR}/config.sample.inc.php ${MY_INSTALLDIR}/config.inc.php - -2. Be sure that the libraries/ directory is not visible. You can use the - provided .htaccess file. - -================================================================= - -If you are upgrading from an earlier version: - -1. If you are using ${PN}'s features for master/foreign tables, be sure to read - http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com - - You will need to perform the ALTER TABLE step yourself. diff --git a/dev-db/phpmyadmin/files/reconfig-2.8 b/dev-db/phpmyadmin/files/reconfig-2.8 deleted file mode 100644 index a73d90f088bf..000000000000 --- a/dev-db/phpmyadmin/files/reconfig-2.8 +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -die() { - echo "#####" - echo $1 - echo "#####" - exit 1 -} - -if [ $1 = "install" ]; then - cd ${MY_INSTALLDIR}/libraries - sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.default.php || die "sed failed" - -elif [ $1 = "clean" ]; then - echo $1 -fi |