Hello community,
here is the log from the commit of package phpMyAdmin
checked in at Tue Aug 15 18:29:02 CEST 2006.
--------
--- phpMyAdmin/phpMyAdmin.changes 2006-08-03 15:41:33.000000000 +0200
+++ phpMyAdmin/phpMyAdmin.changes 2006-08-15 17:07:22.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Aug 15 15:48:41 CEST 2006 - anosek@suse.cz
+
+- update to 2.8.2.2
+ * fixed config not loaded on install (MySQL error code 2002
+ or 2003)
+
+-------------------------------------------------------------------
Old:
----
phpMyAdmin-2.8.2.1.tar.bz2
New:
----
phpMyAdmin-2.8.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phpMyAdmin.spec ++++++
--- /var/tmp/diff_new_pack.tebqkH/_old 2006-08-15 18:28:45.000000000 +0200
+++ /var/tmp/diff_new_pack.tebqkH/_new 2006-08-15 18:28:45.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package phpMyAdmin (Version 2.8.2.1)
+# spec file for package phpMyAdmin (Version 2.8.2.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
Group: Productivity/Networking/Web/Frontends
Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session apache2
Autoreqprov: on
-Version: 2.8.2.1
+Version: 2.8.2.2
Release: 1
Source0: %{name}-%{version}.tar.bz2
Patch1: %{name}-blowfish_secret.patch
@@ -125,6 +125,10 @@
%verify(not md5 size mtime) %config(noreplace) %{serverroot}%{name}/libraries/blowfish_secret.inc.php
%changelog -n phpMyAdmin
+* Tue Aug 15 2006 - anosek@suse.cz
+- update to 2.8.2.2
+ * fixed config not loaded on install (MySQL error code 2002
+ or 2003)
* Thu Aug 03 2006 - mskibbe@suse.de
- update to 2.8.2.1
* XSS vulnerability from requests not containing a token
++++++ phpMyAdmin-2.8.2.1.tar.bz2 -> phpMyAdmin-2.8.2.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/ChangeLog new/phpMyAdmin-2.8.2.2/ChangeLog
--- old/phpMyAdmin-2.8.2.1/ChangeLog 2006-08-02 22:28:10.000000000 +0200
+++ new/phpMyAdmin-2.8.2.2/ChangeLog 2006-08-11 18:45:56.000000000 +0200
@@ -2,9 +2,13 @@
phpMyAdmin - Changelog
----------------------
-$Id: ChangeLog,v 2.1929.2.142.2.6 2006/08/02 20:28:10 lem9 Exp $
+$Id: ChangeLog,v 2.1929.2.142.2.7 2006/08/11 16:45:56 lem9 Exp $
$Source: /cvsroot/phpmyadmin/phpMyAdmin/ChangeLog,v $
+2006-08-11 Marc Delisle
+ * libraries/auth/config.auth.lib.php: bug #1536112, config not loaded
+ (MySQL error 2002 or 2003)
+
2006-08-02 Marc Delisle
### 2.8.2.1 released from MAINT_2_8_2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/Documentation.txt new/phpMyAdmin-2.8.2.2/Documentation.txt
--- old/phpMyAdmin-2.8.2.1/Documentation.txt 2006-08-02 22:30:26.000000000 +0200
+++ new/phpMyAdmin-2.8.2.2/Documentation.txt 2006-08-14 18:00:14.000000000 +0200
@@ -2416,7 +2416,7 @@
) TYPE=MyISAM;
INSERT INTO REL_towns VALUES ('S', 'Sherbrooke');
- INSERT INTO REL_towns VALUES ('M', 'Montre'al');
+ INSERT INTO REL_towns VALUES ('M', 'Montr?al');
To setup appropriate links and display information:
@@ -2493,7 +2493,7 @@
If you put a backslash before the underscore, it means that the database name
will have a real underscore.
-[6.11] What is the curious symbol o/ in the statistics pages?
+[6.11] What is the curious symbol ? in the statistics pages?
It means "average".
@@ -2543,7 +2543,7 @@
installed all the needed modules.
If you use the Validator, you should be aware that any SQL statement you submit
will be stored anonymously (database/table/column names, strings, numbers
-replaced with generic values). The Mimer SQL Validator itself, is (C) 2001
+replaced with generic values). The Mimer SQL Validator itself, is ? 2001
Upright Database Technology. We utilize it as free SOAP service.
[6.15] I want to add a BLOB field and put an index on it, but MySQL says "BLOB
@@ -2872,14 +2872,14 @@
* SQL analyser (most of it)
* current project maintainer
-- Olivier Mu:ller
+- Olivier M?ller
* started SourceForge phpMyAdmin project in March 2001
* sync'ed different existing CVS trees with new features and bugfixes
* multi-language improvements, dynamic language selection
* current project maintainer
* many bugfixes and improvements
-- Loi:c Chapeaux
+- Lo?c Chapeaux
* rewrote and optimized javascript, DHTML and DOM stuff
* rewrote the scripts so they fit the PEAR coding standards and
generate XHTML1.0 and CSS2 compliant codes
@@ -2941,7 +2941,7 @@
* various features and fixes
* Czech language file updates
-- Christophe Gesche' from the "MySQL Form Generator for PHPMyAdmin"
+- Christophe Gesch? from the "MySQL Form Generator for PHPMyAdmin"
(http://sourceforge.net/projects/phpmysqlformgen/)
* suggested the patch for multiple table printviews
@@ -2988,7 +2988,7 @@
* redesign for 2.6.0
* phpMyAdmin sailboat logo (June 2004)
-- Mathias Landha:usser
+- Mathias Landh?u?er
* Representation at conferences
- Sebastian Mendel
@@ -2999,13 +2999,13 @@
enhancements, bugfixes or support for a new language since version 2.1.0:
Bora Alioglu, Ricardo ?, Sven-Erik Andersen, Alessandro Astarita,
-Pe'ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow,
-Mats Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kla:ger,
+P?ter Bakondy, Borges Botelho, Olivier Bussier, Neil Darlow,
+Mats Engstrom, Ian Davidson, Laurent Dhima, Kristof Hamann, Thomas Kl?ger,
Lubos Klokner, Martin Marconcini, Girish Nair, David Nordenberg, Andreas Pauley,
Bernard M. Piller, Laurent Haas, "Sakamoto", Yuval Sarna,
www.securereality.com.au, Alexis Soulard, Alvar Soome, Siu Sun, Peter Svec,
Michael Tacelosky, Rachim Tamsjadi, Kositer Uros,
-Lui's V., Martijn W. van der Lee,
+Lu?s V., Martijn W. van der Lee,
Algis Vainauskas, Daniel Villanueva, Vinay, Ignacio Vazquez-Abrams, Chee Wai,
Jakub Wilk, Thomas Michael Winningham, Vilius Zigmantas, "Manuzhai".
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/RELEASE-DATE-2.8.2.1 new/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.1
--- old/phpMyAdmin-2.8.2.1/RELEASE-DATE-2.8.2.1 2006-08-02 22:30:26.000000000 +0200
+++ new/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.1 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Wed Aug 2 20:30:26 UTC 2006
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/RELEASE-DATE-2.8.2.2 new/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.2
--- old/phpMyAdmin-2.8.2.1/RELEASE-DATE-2.8.2.2 1970-01-01 01:00:00.000000000 +0100
+++ new/phpMyAdmin-2.8.2.2/RELEASE-DATE-2.8.2.2 2006-08-14 18:00:12.000000000 +0200
@@ -0,0 +1 @@
+Mon Aug 14 16:00:12 UTC 2006
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/libraries/Config.class.php new/phpMyAdmin-2.8.2.2/libraries/Config.class.php
--- old/phpMyAdmin-2.8.2.1/libraries/Config.class.php 2006-08-01 16:14:27.000000000 +0200
+++ new/phpMyAdmin-2.8.2.2/libraries/Config.class.php 2006-08-02 23:08:00.000000000 +0200
@@ -1,5 +1,5 @@
set('PMA_VERSION', '2.8.2.1');
+ $this->set('PMA_VERSION', '2.8.2.2-dev');
/**
* @deprecated
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/phpMyAdmin-2.8.2.1/libraries/auth/config.auth.lib.php new/phpMyAdmin-2.8.2.2/libraries/auth/config.auth.lib.php
--- old/phpMyAdmin-2.8.2.1/libraries/auth/config.auth.lib.php 2005-12-08 21:47:24.000000000 +0100
+++ new/phpMyAdmin-2.8.2.2/libraries/auth/config.auth.lib.php 2006-08-11 18:41:26.000000000 +0200
@@ -1,5 +1,5 @@
source_mtime == 0) {
- echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="scripts/setup.php">', '</a>') . '</p>' . "\n";
- } else {
- echo '<p>' . $GLOBALS['strAccessDeniedExplanation'] . '</p>' . "\n";
- }
+ // Check whether user has configured something
+ if ($_SESSION['PMA_Config']->source_mtime == 0) {
+ echo '<p>' . sprintf($GLOBALS['strAccessDeniedCreateConfig'], '<a href="scripts/setup.php">', '</a>') . '</p>' . "\n";
+ } elseif (!isset($GLOBALS['errno']) || (isset($GLOBALS['errno']) && $GLOBALS['errno'] != 2002) && $GLOBALS['errno'] != 2003) {
+ // if we display the "Server not responding" error, do not confuse users
+ // by telling them they have a settings problem
+ // (note: it's true that they could have a badly typed host name, but
+ // anyway the current $strAccessDeniedExplanation tells that the server
+ // rejected the connection, which is not really what happened)
+ // 2002 is the error given by mysqli
+ // 2003 is the error given by mysql
+ echo '<p>' . $GLOBALS['strAccessDeniedExplanation'] . '</p>' . "\n";
}
PMA_mysqlDie($conn_error, '');
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org