Accepting request 266045 from server:php:applications

1

OBS-URL: https://build.opensuse.org/request/show/266045
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=85
This commit is contained in:
Dominique Leuenberger 2014-12-22 11:54:23 +00:00 committed by Git OBS Bridge
commit 6aef8b5dc4
5 changed files with 47 additions and 43 deletions

View File

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

View File

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

View File

@ -1,11 +1,11 @@
diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin-4.3.0-all-languages/config.sample.inc.php diff -Pdpru phpMyAdmin-4.3.3-all-languages.orig/config.sample.inc.php phpMyAdmin-4.3.3-all-languages/config.sample.inc.php
--- phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php 2014-12-05 16:13:09.000000000 +0100 --- phpMyAdmin-4.3.3-all-languages.orig/config.sample.inc.php 2014-12-21 12:40:25.000000000 +0100
+++ phpMyAdmin-4.3.0-all-languages/config.sample.inc.php 2014-12-06 10:29:20.097321377 +0100 +++ phpMyAdmin-4.3.3-all-languages/config.sample.inc.php 2014-12-21 14:03:33.519929409 +0100
@@ -10,11 +10,51 @@ @@ -10,6 +10,46 @@
* @package PhpMyAdmin * @package PhpMyAdmin
*/ */
+ /* +/*
+ * Your phpMyAdmin url + * Your phpMyAdmin url
+ * + *
+ * Complete the variable below with the full url ie + * Complete the variable below with the full url ie
@ -48,13 +48,7 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
/* /*
* This is needed for cookie based authentication to encrypt password in * This is needed for cookie based authentication to encrypt password in
* cookie * cookie
*/ @@ -25,45 +65,265 @@ $i = 0;
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
/*
* Servers configuration
@@ -25,48 +65,261 @@ $i = 0;
* First server * First server
*/ */
$i++; $i++;
@ -65,6 +59,7 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
-$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['connect_type'] = 'tcp';
-$cfg['Servers'][$i]['compress'] = false; -$cfg['Servers'][$i]['compress'] = false;
-$cfg['Servers'][$i]['AllowNoPassword'] = false; -$cfg['Servers'][$i]['AllowNoPassword'] = false;
+
+// MySQL hostname or IP address +// MySQL hostname or IP address
+$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['host'] = 'localhost';
+ +
@ -146,6 +141,7 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
+// The password needed for the controluser to login +// The password needed for the controluser to login
+// (see $cfg['Servers'][$i]['controluser']) +// (see $cfg['Servers'][$i]['controluser'])
+$cfg['Servers'][$i]['controlpass'] = ''; +$cfg['Servers'][$i]['controlpass'] = '';
+
/* Storage database and tables */ /* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
@ -277,6 +273,11 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
+// see _docdir/examples/swekey.sample.conf +// see _docdir/examples/swekey.sample.conf
+//$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma.conf'; +//$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma.conf';
+ +
+
+/*
+ * Second Server
+ */
+
+/* +/*
+$i++; +$i++;
+$cfg['Servers'][$i]['host'] = 'localhost'; +$cfg['Servers'][$i]['host'] = 'localhost';
@ -330,6 +331,7 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
+$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf'; +$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'] +// 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, +// to any one of them to autoconnect to that server when phpMyAdmin is started,
+// or set it to 0 to be given a list of servers without logging in +// or set it to 0 to be given a list of servers without logging in
@ -343,29 +345,9 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/config.sample.inc.php phpMyAdmin
/* /*
* End of servers configuration * End of servers configuration
+ *************************************** diff -Pdpru phpMyAdmin-4.3.3-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.3.3-all-languages/libraries/vendor_config.php
*/ --- phpMyAdmin-4.3.3-all-languages.orig/libraries/vendor_config.php 2014-12-21 12:40:25.000000000 +0100
+++ phpMyAdmin-4.3.3-all-languages/libraries/vendor_config.php 2014-12-21 13:40:18.587272010 +0100
/*
diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/.directory phpMyAdmin-4.3.0-all-languages/.directory
--- phpMyAdmin-4.3.0-all-languages.orig/.directory 1970-01-01 01:00:00.000000000 +0100
+++ phpMyAdmin-4.3.0-all-languages/.directory 2014-12-06 09:52:17.262708923 +0100
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2014,12,6,9,52,17
+Version=3
+ViewMode=2
diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/examples/.directory phpMyAdmin-4.3.0-all-languages/examples/.directory
--- phpMyAdmin-4.3.0-all-languages.orig/examples/.directory 1970-01-01 01:00:00.000000000 +0100
+++ phpMyAdmin-4.3.0-all-languages/examples/.directory 2014-12-06 10:21:24.576650595 +0100
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2014,12,6,10,21,24
+Version=3
+ViewMode=1
diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.3.0-all-languages/libraries/vendor_config.php
--- phpMyAdmin-4.3.0-all-languages.orig/libraries/vendor_config.php 2014-12-05 16:13:09.000000000 +0100
+++ phpMyAdmin-4.3.0-all-languages/libraries/vendor_config.php 2014-12-06 10:31:05.851047096 +0100
@@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) { @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
* Path to changelog file, can be gzip compressed. Useful when you want to * Path to changelog file, can be gzip compressed. Useful when you want to
* have documentation somewhere else, eg. /usr/share/doc. * have documentation somewhere else, eg. /usr/share/doc.
@ -388,7 +370,7 @@ diff -Pdpru phpMyAdmin-4.3.0-all-languages.orig/libraries/vendor_config.php phpM
/** /**
* Whether setup requires writable directory where config * Whether setup requires writable directory where config
@@ -41,7 +41,7 @@ define('SETUP_DIR_WRITABLE', true); @@ -47,7 +47,7 @@ define('EXAMPLES_DIR', './examples/');
* It is not used directly in code, just a convenient * It is not used directly in code, just a convenient
* define used further in this file. * define used further in this file.
*/ */

View File

@ -1,17 +1,39 @@
-------------------------------------------------------------------
Sun Dec 21 12:27:09 UTC 2014 - ecsos@opensuse.org
- update to 4.3.3 (2014-12-21)
- fix bug The "Recently used tables" setting should be with
Nav panel
- sf#4647 Can't disable Favorites
- sf#4646 Version Check Broken
- sf#4630 AJAX request infinite loop
- sf#4649 Attributes field size smaller than others
- sf#4622 Cannot remove table ordering on a Mac
- fix bug Fix initial replication configuration
- fix bug Undefined index central_columnswork
- sf#4657 Don't have default blowfish_secret
- sf#4656 Some error popups fade away too quickly
- sf#4648 Consistency in borders
- fix bug $cfg['Error_Handler']['display'] no longer necessary
- sf#4659 Leading and trailing whitespace in column name
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 12 15:27:17 UTC 2014 - ecsos@opensuse.org Fri Dec 12 15:27:17 UTC 2014 - ecsos@opensuse.org
- update to 4.3.2 (2014-12-12) - update to 4.3.2 (2014-12-12)
- sf#4628 PHP error while exporting schema as PDF - sf#4628 PHP error while exporting schema as PDF
- sf#4631 Server selector submits two server parameter values - sf#4631 Server selector submits two server parameter values
- sf#4629 Problem with custom SQL queries using cookie authentication - sf#4629 Problem with custom SQL queries using cookie
authentication
- fix bug Undefined index central_columnswork - fix bug Undefined index central_columnswork
- sf#4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query - sf#4632 Notice in ./libraries/Util.class.php#1916
Undefined index: query
- sf#4633 Wrong parameter in fetchValue - sf#4633 Wrong parameter in fetchValue
- sf#4634 Error reporting creates an infinite loop - sf#4634 Error reporting creates an infinite loop
- sf#4635 Token mismatch while creating configuration storage - sf#4635 Token mismatch while creating configuration storage
- sf#4640 Incorrect reference to PHP 6 - sf#4640 Incorrect reference to PHP 6
- sf#3794 failure to handle repeating empty columns when importing ODS - sf#3794 failure to handle repeating empty columns when
importing ODS
- sf#4638 Default Export Method setting broken - sf#4638 Default Export Method setting broken
- sf#4639 Export SQL missing indentation first field - sf#4639 Export SQL missing indentation first field
- sf#4637 Field Alignment - sf#4637 Field Alignment

View File

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