Accepting request 127379 from home:computersalat:devel:php

update to 3.5.2

OBS-URL: https://build.opensuse.org/request/show/127379
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=40
This commit is contained in:
Christian Wittmer 2012-07-08 15:58:28 +00:00 committed by Git OBS Bridge
parent c019a758c1
commit edfec16bef
5 changed files with 52 additions and 22 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c4938855ad43c41a2c94b2f74c75a24819e01f55d800a347c8373557988b2da3
size 4724343

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ef5fb0d6390c0bd1cdb81aafcfc71afe8d19da966a5f6e5c6f6e145b0f93eebf
size 4795602

View File

@ -2,11 +2,18 @@ Index: config.sample.inc.php
===================================================================
--- config.sample.inc.php.orig
+++ config.sample.inc.php
@@ -10,59 +10,286 @@
* @package PhpMyAdmin
@@ -1,6 +1,6 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
+/*
* phpMyAdmin sample configuration, you can use it as base for
* manual configuration. For easier setup you can use setup/
*
@@ -11,57 +11,285 @@
*/
+/**
/*
+ * Your phpMyAdmin url
+ *
+ * Complete the variable below with the full url ie
@ -26,32 +33,32 @@ Index: config.sample.inc.php
+ */
+$cfg['PmaAbsoluteUri'] = '';
+
/*
+/*
* This is needed for cookie based authentication to encrypt password in
* cookie
*/
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+/* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+ * YOU MUST FILL IN THIS FOR COOKIE AUTH!
+ */
+$cfg['blowfish_secret'] = '';
+
+/**
+/*
+ * Disable the default warning about $cfg['PmaAbsoluteUri'] not being set
+ * You should use this if and ONLY if the PmaAbsoluteUri auto-detection
+ * works perfectly.
+ */
+$cfg['PmaAbsoluteUri_DisableWarning'] = false;
+
+/**
+/*
+ * Disable the default warning that is displayed on the DB Details Structure page if
+ * any of the required Tables for the relationfeatures could not be found
+ */
+$cfg['PmaNoRelation_DisableWarning'] = false;
+
+/**
+/*
+ * Disable the default warning that is displayed if Suhosin is detected
+ *
+ * @global boolean $cfg['SuhosinDisableWarning']
+ */
*/
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['SuhosinDisableWarning'] = true;
/*
@ -159,7 +166,6 @@ Index: config.sample.inc.php
-// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
-// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma_recent';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs';
+$cfg['Servers'][$i]['controlhost'] = '';
+
+// MySQL control user settings (this user must have read-only
@ -259,7 +265,7 @@ Index: config.sample.inc.php
+ * Second Server
+ */
+
+/**
+/*
+$i++;
+$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['port'] = '';
@ -281,12 +287,12 @@ Index: config.sample.inc.php
+$cfg['Servers'][$i]['verbose_check'] = true;
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
/*
+
+/*
+ * phpMyAdmin configuration storage settings.
+ */
+
+/**
/*
+$cfg['Servers'][$i]['controlhost'] = '';
+$cfg['Servers'][$i]['controluser'] = '';
+$cfg['Servers'][$i]['controlpass'] = '';
@ -304,7 +310,7 @@ Index: config.sample.inc.php
+$cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
+$cfg['Servers'][$i]['recent'] = 'pma_recent';
+$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf';
+ */
+*/
+
+// If you have more than one server configured, you can set $cfg['ServerDefault']
+// to any one of them to autoconnect to that server when phpMyAdmin is started,

View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sun Jul 8 15:52:13 UTC 2012 - chris@computersalat.de
- udpate to 3.5.2 (2012-07-07)
* bug sf#3521416 [interface] JS error when editing index
* bug sf#3521313 [core] Call to undefined function __()
* bug sf#3521016 [edit] NOW() function incorrectly selected
* bug [GUI] Invalid HTML code on transformation_overview.php
* bug sf#3522930 [browse] Missing validation in Ajax mode
* bug Fix popup message on build SQL of import
* bug sf#3523499 [core] Make X-WebKit-CSP work better
* replace Highcharts with jqplot for query profiling, zoom search
* bug sf#3531584 [interface] No form validation in change password
dialog
* bug sf#3531585 [interface] Broken password validation in copy user
form
* bug sf#3531586 [unterface] Add user form prints JSON when user
presses enter
* bug sf#3534121 [config] duplicate line in config.sample.inc.php
* bug sf#3534311 [interface] Grid editing incorrectly parses
ENUM/SET values
* bug sf#3510196 [core] More clever URL rewriting with ForceSSL
- rebase config patch
-------------------------------------------------------------------
Sun Jun 3 22:00:45 UTC 2012 - chris@computersalat.de

View File

@ -34,7 +34,7 @@ Name: phpMyAdmin
Summary: Administration of MySQL over the web
License: GPL-2.0+
Group: Productivity/Networking/Web/Frontends
Version: 3.5.1
Version: 3.5.2
Release: 0
Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2