Accepting request 233203 from server:php:applications
update to 4.2.0 (forwarded request 233202 from ecsos) OBS-URL: https://build.opensuse.org/request/show/233203 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/phpMyAdmin?expand=0&rev=62
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
8b7a86ea0b
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ba56e5b3e547713285c1d0c358107e0602209d9cdae35a45f2ab41dc8a664be0
|
||||
size 6415133
|
||||
3
phpMyAdmin-4.2.0-all-languages.tar.bz2
Normal file
3
phpMyAdmin-4.2.0-all-languages.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:46a1847c5576c9d591c1e22a39c8229db9aa1c785a06265a47ba16b978383c3e
|
||||
size 6194585
|
||||
@ -1,11 +1,11 @@
|
||||
Index: config.sample.inc.php
|
||||
===================================================================
|
||||
--- config.sample.inc.php.orig
|
||||
+++ config.sample.inc.php
|
||||
@@ -11,10 +11,51 @@
|
||||
diff -Pdpru phpMyAdmin-4.2.0-all-languages.orig/config.sample.inc.php phpMyAdmin-4.2.0-all-languages/config.sample.inc.php
|
||||
--- phpMyAdmin-4.2.0-all-languages.orig/config.sample.inc.php 2014-05-08 13:23:36.000000000 +0200
|
||||
+++ phpMyAdmin-4.2.0-all-languages/config.sample.inc.php 2014-05-08 22:20:06.671673724 +0200
|
||||
@@ -10,11 +10,51 @@
|
||||
* @package PhpMyAdmin
|
||||
*/
|
||||
|
||||
/*
|
||||
+/*
|
||||
+ * Your phpMyAdmin url
|
||||
+ *
|
||||
+ * Complete the variable below with the full url ie
|
||||
@ -25,13 +25,6 @@ Index: config.sample.inc.php
|
||||
+ */
|
||||
+$cfg['PmaAbsoluteUri'] = '';
|
||||
+
|
||||
+/*
|
||||
* This is needed for cookie based authentication to encrypt password in
|
||||
* cookie
|
||||
+ * 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
|
||||
@ -49,13 +42,19 @@ Index: config.sample.inc.php
|
||||
+ * Disable the default warning that is displayed if Suhosin is detected
|
||||
+ *
|
||||
+ * @global boolean $cfg['SuhosinDisableWarning']
|
||||
+ */
|
||||
+$cfg['SuhosinDisableWarning'] = true;
|
||||
+
|
||||
/*
|
||||
* This is needed for cookie based authentication to encrypt password in
|
||||
* cookie
|
||||
*/
|
||||
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
|
||||
+$cfg['SuhosinDisableWarning'] = true;
|
||||
+$cfg['blowfish_secret'] = ''; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
|
||||
|
||||
/*
|
||||
* Servers configuration
|
||||
@@ -25,47 +66,247 @@ $i = 0;
|
||||
@@ -25,51 +65,256 @@ $i = 0;
|
||||
* First server
|
||||
*/
|
||||
$i++;
|
||||
@ -65,8 +64,6 @@ Index: config.sample.inc.php
|
||||
-$cfg['Servers'][$i]['host'] = 'localhost';
|
||||
-$cfg['Servers'][$i]['connect_type'] = 'tcp';
|
||||
-$cfg['Servers'][$i]['compress'] = false;
|
||||
-/* Select mysql if your server does not have mysqli */
|
||||
-$cfg['Servers'][$i]['extension'] = 'mysqli';
|
||||
-$cfg['Servers'][$i]['AllowNoPassword'] = false;
|
||||
+// MySQL hostname or IP address
|
||||
+$cfg['Servers'][$i]['host'] = 'localhost';
|
||||
@ -79,7 +76,7 @@ Index: config.sample.inc.php
|
||||
+
|
||||
+// Use SSL for connecting to MySQL server?
|
||||
+$cfg['Servers'][$i]['ssl'] = false;
|
||||
+
|
||||
|
||||
+// How to connect to MySQL server ('tcp' or 'socket')
|
||||
+$cfg['Servers'][$i]['connect_type'] = 'socket';
|
||||
+
|
||||
@ -130,12 +127,17 @@ Index: config.sample.inc.php
|
||||
+
|
||||
+// Host authentication rules, leave blank for defaults
|
||||
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
|
||||
|
||||
+
|
||||
/*
|
||||
* phpMyAdmin configuration storage settings.
|
||||
*/
|
||||
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
|
||||
+
|
||||
|
||||
-/* User used to manipulate with storage */
|
||||
-// $cfg['Servers'][$i]['controlhost'] = '';
|
||||
-// $cfg['Servers'][$i]['controlport'] = '';
|
||||
-// $cfg['Servers'][$i]['controluser'] = 'pma';
|
||||
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
||||
+// MySQL control user settings (this user must have read-only
|
||||
+// access to the "mysql/user" and "mysql/db" tables).
|
||||
+// The controluser is also used for all relational features (pmadb)
|
||||
@ -233,13 +235,10 @@ Index: config.sample.inc.php
|
||||
+// You can hide/show items in the navigation tree.
|
||||
+// DEFAULT: 'pma_navigationhiding'
|
||||
+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
||||
+
|
||||
+//
|
||||
+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
||||
|
||||
-/* User used to manipulate with storage */
|
||||
-// $cfg['Servers'][$i]['controlhost'] = '';
|
||||
-// $cfg['Servers'][$i]['controlport'] = '';
|
||||
-// $cfg['Servers'][$i]['controluser'] = 'pma';
|
||||
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
|
||||
-
|
||||
-/* Storage database and tables */
|
||||
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
|
||||
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
|
||||
@ -254,9 +253,11 @@ 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]['favorite'] = 'pma__favorite';
|
||||
-// $cfg['Servers'][$i]['users'] = 'pma__users';
|
||||
-// $cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
||||
-// $cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
||||
-// $cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
||||
/* Contrib / Swekey authentication */
|
||||
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
|
||||
+// The name of the file containing Swekey ids and login names for
|
||||
@ -269,8 +270,9 @@ Index: config.sample.inc.php
|
||||
+/***************************************
|
||||
+ * Second Server
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
|
||||
/*
|
||||
- * End of servers configuration
|
||||
+$i++;
|
||||
+$cfg['Servers'][$i]['host'] = 'localhost';
|
||||
+$cfg['Servers'][$i]['port'] = '';
|
||||
@ -293,12 +295,12 @@ Index: config.sample.inc.php
|
||||
+$cfg['Servers'][$i]['AllowDeny']['order'] = '';
|
||||
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
|
||||
+*/
|
||||
|
||||
/*
|
||||
+ * phpMyAdmin configuration storage settings.
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * phpMyAdmin configuration storage settings.
|
||||
*/
|
||||
|
||||
/*
|
||||
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
|
||||
+$cfg['Servers'][$i]['controluser'] = '';
|
||||
+$cfg['Servers'][$i]['controlpass'] = '';
|
||||
@ -318,6 +320,7 @@ Index: config.sample.inc.php
|
||||
+$cfg['Servers'][$i]['users'] = 'pma__users';
|
||||
+$cfg['Servers'][$i]['usergroups'] = 'pma__usergroups';
|
||||
+$cfg['Servers'][$i]['navigationhiding'] = 'pma__navigationhiding';
|
||||
+$cfg['Servers'][$i]['savedsearches'] = 'pma__savedsearches';
|
||||
+$cfg['Servers'][$i]['auth_swekey_config'] = '/etc/phpMyAdmin/swekey-pma_02.conf';
|
||||
+*/
|
||||
+
|
||||
@ -332,14 +335,18 @@ Index: config.sample.inc.php
|
||||
+$cfg['Server'] = '0';
|
||||
+unset($cfg['Servers'][0]);
|
||||
+
|
||||
+/***************************************
|
||||
* End of servers configuration
|
||||
+/*
|
||||
+ * End of servers configuration
|
||||
+ ****************************************/
|
||||
+
|
||||
+
|
||||
+/*
|
||||
* Directories for saving/loading files from server
|
||||
*/
|
||||
|
||||
Index: libraries/vendor_config.php
|
||||
===================================================================
|
||||
--- libraries/vendor_config.php.orig
|
||||
+++ libraries/vendor_config.php
|
||||
$cfg['UploadDir'] = '';
|
||||
diff -Pdpru phpMyAdmin-4.2.0-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.2.0-all-languages/libraries/vendor_config.php
|
||||
--- phpMyAdmin-4.2.0-all-languages.orig/libraries/vendor_config.php 2014-05-08 13:23:37.000000000 +0200
|
||||
+++ phpMyAdmin-4.2.0-all-languages/libraries/vendor_config.php 2014-05-08 22:05:00.222659219 +0200
|
||||
@@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
|
||||
* Path to changelog file, can be gzip compressed. Useful when you want to
|
||||
* have documentation somewhere else, eg. /usr/share/doc.
|
||||
@ -362,12 +369,12 @@ Index: libraries/vendor_config.php
|
||||
|
||||
/**
|
||||
* Whether setup requires writable directory where config
|
||||
@@ -46,7 +46,7 @@ define('CONFIG_DIR', './');
|
||||
/**
|
||||
* Filename of a configuration file.
|
||||
@@ -41,7 +41,7 @@ define('SETUP_DIR_WRITABLE', true);
|
||||
* It is not used directly in code, just a convenient
|
||||
* define used further in this file.
|
||||
*/
|
||||
-define('CONFIG_FILE', CONFIG_DIR . 'config.inc.php');
|
||||
+define('CONFIG_FILE', SETUP_CONFIG_FILE );
|
||||
-define('CONFIG_DIR', './');
|
||||
+define('CONFIG_DIR', '@sysconfdir@/');
|
||||
|
||||
/**
|
||||
* Filename of custom header file.
|
||||
* Filename of a configuration file.
|
||||
|
||||
@ -1,3 +1,58 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 8 14:29:34 UTC 2014 - ecsos@schirra.net
|
||||
|
||||
- update to 4.2.0 (2014-05-08)
|
||||
+ rfe #1403 Export only triggers
|
||||
+ rfe #1483 Export Server/Database/Table without triggers
|
||||
+ rfe #1662 Add table comment tool tip in database structure page
|
||||
+ rfe #1447 Single table for display Character Sets and Collations
|
||||
+ rfe #1455 Display icons/text/both for the table row actions
|
||||
+ rfe #1473 Transformation to convert Boolean value to text
|
||||
- sf#4157 Changing users password will delete it
|
||||
+ rfe #1474 Text transformation combines Append and Prepend
|
||||
+ Added warning about the mysql extension being deprecated
|
||||
and removed the extension directive
|
||||
+ Added support for scatter charts
|
||||
+ rfe #1478 Make Column Headings Sticky
|
||||
+ rfe #1480 Enhance privileges initials table
|
||||
+ rfe #1472 [interface] Break "Edit privileges" with sub-menus
|
||||
+ rfe #1466 Minor refactoring required
|
||||
+ rfe #1004 Create indexes at the end in SQL export
|
||||
+ rfe #1479 Relations edit form for larger monitors
|
||||
+ rfe #1475 Inline query box vertical resize
|
||||
+ rfe #1500 [interface] Add bottom border to top menu container
|
||||
+ rfe #1498 Add datepicker for 'TIME' type
|
||||
- sf#4237 HTTP Referer disclosure in SQL links
|
||||
+ rfe Show full names on navigation hover
|
||||
+ rfe #1505 Behaviour on click on a routine in nav panel
|
||||
+ rfe #1418 Support more than one separating character on CSV import
|
||||
+ rfe #569 Load/Save Query By Example
|
||||
- sf#4281 Grid edit ENUM field, dialog disappears when trying to select
|
||||
- sf#4304 DB export using zip compression generates an empty archive
|
||||
+ rfe #1508 confirmation message at the top
|
||||
- sf#4306 breadcrubs wrong on table create
|
||||
+ rfe #1511 better validate database name for copying
|
||||
+ rfe #1510 Database tab "Drop" button should be a link
|
||||
+ rfe #1513 Highlight required form fields after failed submission
|
||||
+ rfe #1460 Redirect to login page after session has expired
|
||||
- sf#4316 Grid edit: can't change month on date fields
|
||||
+ rfe #1501 add maxlength by field with length-spec
|
||||
+ rfe #1512 Import happily doesn't do anything with no file name provided
|
||||
+ rfe #1514 Add function to all the insert boxes automatically
|
||||
+ rfe #1515 Option to skip tables larger than n
|
||||
+ rfe #1486 Possibility of disabling database expansion
|
||||
+ rfe #1476 Favourite tables select box
|
||||
+ rfe #420 $cfg['CharEditing']='textarea' for structure edit
|
||||
+ rfe #1329 Avoid editing of fields which are part of relation
|
||||
+ rfe [interface] Highlight active left menu item in setup
|
||||
+ rfe Filter on-screen rows during Browse
|
||||
Removed support for SQL Validator (SOAP service no longer offered)
|
||||
- sf#4352 Settings > Manage: incorrect messages
|
||||
- sf#4337 "More" in Actions area doesn't collapse to fit available space
|
||||
- sf#4375 Group two DB, one's name is the prefix of the other one
|
||||
- sf#4070 Confusing database/table grouping
|
||||
- sf#4366 Creating Index doesn't update index-list
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Apr 26 20:56:34 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ Name: phpMyAdmin
|
||||
Summary: Administration of MySQL over the web
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Networking/Web/Frontends
|
||||
Version: 4.1.14
|
||||
Version: 4.2.0
|
||||
Release: 0
|
||||
Url: http://www.phpMyAdmin.net
|
||||
Source0: http://sourceforge.net/projects/phpmyadmin/files/%{name}-%{version}-all-languages.tar.bz2
|
||||
@ -100,7 +100,7 @@ Currently phpMyAdmin can:
|
||||
## rpmlint:
|
||||
# wrong-file-end-of-line-encoding
|
||||
%{__perl} -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php
|
||||
%patch0
|
||||
%patch0 -p1
|
||||
|
||||
find . -type d -exec chmod 755 {} \;
|
||||
find . -type f -exec chmod 644 {} \;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user