pool/phpMyAdmin
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 175727 from home:ecsos

Browse Source 
update to 4.0.1

OBS-URL: https://build.opensuse.org/request/show/175727
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=54
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2013-05-17 08:03:09 +00:00 committed by Git OBS Bridge
parent d4047cc175
commit 10bf1bb8c8
6 changed files with 187 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpMyAdmin-3.5.8.1-all-languages.tar.bz2
View File

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

3
phpMyAdmin-4.0.1-all-languages.tar.bz2 Normal file
View File

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

93
phpMyAdmin-config.patch
View File

@ -1,16 +1,6 @@
Index: config.sample.inc.php --- config.sample.inc.php.orig 2013-05-03 14:16:36.000000000 +0200
=================================================================== +++ config.sample.inc.php 2013-05-03 20:13:46.549034257 +0200
--- config.sample.inc.php.orig @@ -11,10 +11,51 @@
+++ config.sample.inc.php
@@ -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 @@
*/ */
/* /*
@ -32,12 +22,13 @@ Index: config.sample.inc.php
+ * $cfg['PmaAbsoluteUri_DisableWarning'] variable below. + * $cfg['PmaAbsoluteUri_DisableWarning'] variable below.
+ */ + */
+$cfg['PmaAbsoluteUri'] = ''; +$cfg['PmaAbsoluteUri'] = '';
+ +
+/* +/*
* This is needed for cookie based authentication to encrypt password in * This is needed for cookie based authentication to encrypt password in
* cookie * cookie
+ * YOU MUST FILL IN THIS FOR COOKIE AUTH! + * YOU MUST FILL IN THIS FOR COOKIE AUTH!
+ */ */
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['blowfish_secret'] = ''; +$cfg['blowfish_secret'] = '';
+ +
+/* +/*
@ -57,17 +48,12 @@ Index: config.sample.inc.php
+ * Disable the default warning that is displayed if Suhosin is detected + * Disable the default warning that is displayed if Suhosin is detected
+ * + *
+ * @global boolean $cfg['SuhosinDisableWarning'] + * @global boolean $cfg['SuhosinDisableWarning']
*/ + */
-$cfg['blowfish_secret'] = 'a8b7c6d'; /* YOU MUST FILL IN THIS FOR COOKIE AUTH! */
+$cfg['SuhosinDisableWarning'] = true; +$cfg['SuhosinDisableWarning'] = true;
/* /*
* Servers configuration * Servers configuration
*/ @@ -25,43 +66,230 @@ $i = 0;
$i = 0;
-/*
+/***************************************
* First server * First server
*/ */
$i++; $i++;
@ -146,33 +132,31 @@ Index: config.sample.inc.php
/* /*
* phpMyAdmin configuration storage settings. * phpMyAdmin configuration storage settings.
*/ */
+$cfg['Servers'][$i]['controlhost'] = '';
-/* User used to manipulate with storage */ -/* User used to manipulate with storage */
-// $cfg['Servers'][$i]['controlhost'] = ''; -// $cfg['Servers'][$i]['controlhost'] = '';
-// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
-
-/* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma_bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma_relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma_table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma_table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma_pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma_column_info';
-// $cfg['Servers'][$i]['history'] = 'pma_history';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs';
-// $cfg['Servers'][$i]['tracking'] = 'pma_tracking';
-// $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords';
-// $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma_recent';
+$cfg['Servers'][$i]['controlhost'] = '';
+
+// MySQL control user settings (this user must have read-only +// MySQL control user settings (this user must have read-only
+// access to the "mysql/user" and "mysql/db" tables). +// access to the "mysql/user" and "mysql/db" tables).
+// The controluser is also used for all relational features (pmadb) +// The controluser is also used for all relational features (pmadb)
+$cfg['Servers'][$i]['controluser'] = ''; +$cfg['Servers'][$i]['controluser'] = '';
+
-/* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
-// $cfg['Servers'][$i]['relation'] = 'pma__relation';
-// $cfg['Servers'][$i]['table_info'] = 'pma__table_info';
-// $cfg['Servers'][$i]['table_coords'] = 'pma__table_coords';
-// $cfg['Servers'][$i]['pdf_pages'] = 'pma__pdf_pages';
-// $cfg['Servers'][$i]['column_info'] = 'pma__column_info';
-// $cfg['Servers'][$i]['history'] = 'pma__history';
-// $cfg['Servers'][$i]['table_uiprefs'] = 'pma__table_uiprefs';
-// $cfg['Servers'][$i]['tracking'] = 'pma__tracking';
-// $cfg['Servers'][$i]['designer_coords'] = 'pma__designer_coords';
-// $cfg['Servers'][$i]['userconfig'] = 'pma__userconfig';
-// $cfg['Servers'][$i]['recent'] = 'pma__recent';
+// 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'] = '';
@ -251,7 +235,7 @@ Index: config.sample.inc.php
+// used tables, but it will disappear after you logout. +// used tables, but it will disappear after you logout.
+// DEFAULT: 'pma_recent' +// DEFAULT: 'pma_recent'
+$cfg['Servers'][$i]['recent'] = 'pma_recent'; +$cfg['Servers'][$i]['recent'] = 'pma_recent';
+ +
/* Contrib / Swekey authentication */ /* Contrib / Swekey authentication */
-// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf'; -// $cfg['Servers'][$i]['auth_swekey_config'] = '/etc/swekey-pma.conf';
+// The name of the file containing Swekey ids and login names for +// The name of the file containing Swekey ids and login names for
@ -266,10 +250,10 @@ Index: config.sample.inc.php
+ */ + */
+ +
+/* +/*
+$i++; ++$i++;
+$cfg['Servers'][$i]['host'] = 'localhost'; ++$cfg['Servers'][$i]['host'] = 'localhost';
+$cfg['Servers'][$i]['port'] = ''; ++$cfg['Servers'][$i]['port'] = '';
+$cfg['Servers'][$i]['socket'] = ''; ++$cfg['Servers'][$i]['socket'] = '';
+$cfg['Servers'][$i]['ssl'] = false; +$cfg['Servers'][$i]['ssl'] = false;
+$cfg['Servers'][$i]['connect_type'] = 'socket'; +$cfg['Servers'][$i]['connect_type'] = 'socket';
+$cfg['Servers'][$i]['extension'] = 'mysqli'; +$cfg['Servers'][$i]['extension'] = 'mysqli';
@ -287,12 +271,13 @@ Index: config.sample.inc.php
+$cfg['Servers'][$i]['verbose_check'] = true; +$cfg['Servers'][$i]['verbose_check'] = true;
+$cfg['Servers'][$i]['AllowDeny']['order'] = ''; +$cfg['Servers'][$i]['AllowDeny']['order'] = '';
+$cfg['Servers'][$i]['AllowDeny']['rules'] = array(); +$cfg['Servers'][$i]['AllowDeny']['rules'] = array();
+ +*/
+/*
+ * phpMyAdmin configuration storage settings.
+ */
/* /*
+ * phpMyAdmin configuration storage settings.
+ */
+
+/*
+$cfg['Servers'][$i]['controlhost'] = ''; +$cfg['Servers'][$i]['controlhost'] = '';
+$cfg['Servers'][$i]['controluser'] = ''; +$cfg['Servers'][$i]['controluser'] = '';
+$cfg['Servers'][$i]['controlpass'] = ''; +$cfg['Servers'][$i]['controlpass'] = '';
@ -327,11 +312,9 @@ Index: config.sample.inc.php
* End of servers configuration * End of servers configuration
*/ */
Index: libraries/vendor_config.php --- libraries/vendor_config.php.orig 2013-05-03 14:16:36.000000000 +0200
=================================================================== +++ libraries/vendor_config.php 2013-05-03 19:57:54.344938439 +0200
--- libraries/vendor_config.php.orig @@ -17,18 +17,18 @@ if (! defined('PHPMYADMIN')) {
+++ libraries/vendor_config.php
@@ -14,18 +14,18 @@
* 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.
*/ */
@ -353,7 +336,7 @@ Index: libraries/vendor_config.php
/** /**
* Whether setup requires writable directory where config * Whether setup requires writable directory where config
@@ -43,7 +43,7 @@ define('CONFIG_DIR', './'); @@ -46,7 +46,7 @@ define('CONFIG_DIR', './');
/** /**
* Filename of a configuration file. * Filename of a configuration file.
*/ */

2
phpMyAdmin-rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
addFilter("files-duplicated-waste")
addFilter("files-duplicate")

140
phpMyAdmin.changes
View File

@ -1,3 +1,143 @@
-------------------------------------------------------------------
Wed May 15 08:00:00 UTC 2013 - ecsos@schirra.net
- update to 4.0.1.0 (2013-05-14)
- sf#3879 Import broken for CSV using LOAD DATA
- sf#3889 When login fails and error display is active, login data is displayed
- sf#3890 [import] Web server upload directory import fails
- sf#3891 [import] Server upload folder import file name missing in success message
+ rfe #1421 [auth] Add retry button on connection failure with config auth
- sf#3894 [interface] Provide feedback if no columns selected for multi-submit
- sf#3799 [interface] Incorrect select field change on ctrl key navigation in Firefox
- sf#3885 [browse] display_binary_as_hex option causes unexpected behavior
- sf#3899 Git commit links to Github missing
- sf#3900 CSP WARN in Firefox console
- sf#3901 Setup script warning for config auth (stored login data) shows link BBcode
- sf#3895 [browse] Fixed getting BLOB data
- sf#3905 [export] Custom Exporting exports all databases
- sf#3909 [import] Import of CSV FIle to selected table doesn't work
- sf#3904 Browsing an empty table should not display its Structure
- sf#3908 Calendar widget improperly redirects to home
- sf#3918 Greyed out tabs when there are no rows fixed
- sf#3916 [interface] Missing scrollbar (original theme)
+ [vendor] add tcpdf path to vendor_config.php
- bug fix compat with tcpdf >= 6.0 (tested with 6.0.012)
-------------------------------------------------------------------
Fri May 3 17:32:42 UTC 2013 - ecsos@schirra.net
- update to 4.0.0 (2013-05-03)
+ Patch #3481047 for rfe #3480477 Insert as new row enhancement
+ Patch #3480999 Activate codemirror in the query window
- Patch #3495284 XML Import - fix message and redirect
+ rfe #3484063 Null checkbox behavior
+ Patch #3497179 Contest-5: Add user: Allow create DB w/same name + grant u_%
+ Patch #3498201 Contest-6: Export all privileges
+ Patch #3502814 for rfe #3187077 Change password buttons should match
+ rfe #3488640 Expand table-group in non-light navigation frame if only one
+ Patch #3509360 Contest-3: Option "Truncate table" before "insert"
+ Patch #3506552 Contest-2: Show index information in the data dictionary
+ Patch #3510656 Contest-1: Ignoring foreign keys while dropping tables
- sf#3509686 Reverting sort on joined column does not work
+ New transformation: append string
+ rfe #3507804 Session upload progress (PHP 5.4)
+ rfe #3488185 draggable columns vs copy column name
+ Patch #3507001 Contest-4: Textarea for large character columns
+ Removed the PHP version of the ENUM editor
+ Patch #3507111 Display distinct results, linked to corresponding data rows
- sf#3507917 [export] JSON has unescaped values for allegedly numeric columns
+ rfe #3516187 show tables creation, last update, last check timestamps in db_structure
- sf#3059806 Supporting running from CIFS/Samba shares
- sf#3516341 [export] Open Document Text, Word and Texy! Text show table structure twice
- sf [export] Texy! Text: Columns containing Pipe Character don't export properly
+ [export] Show triggers in Open Document Text, Word and Texy! Text
- Patch #3415061 [auth] Login screen appears under the page
+ rfe #3517354 [interface] Allow disabling CodeMirror with $cfg['CodemirrorEnable'] = false
+ rfe #3475567 [interface] New directive $cfg['HideStructureActions']
- sf#3468272 [import] Fixed import of ODS with more paragraphs in a cell
- sf#3510196 [core] Improved redirecting with ForceSSL option
+ rfe #3518852 [edit] edit blob but not other binary, new option $cfg['ProtectBinary'] = 'noblob'
+ Hide language select box if there are no locales installed
+ Removed some directives: verbose_check, SuggestDBName, LightTabs,
VerboseMultiSubmit, ReplaceHelpImg
- Patch #3500882 Fixing checkbox behaviour while editing identical rows
+ rfe #3441722 [interface] Display description of datatypes
+ rfe #3517835 [structure] Move columns easily
+ Ajaxified "Create View" functionality
+ [import] New plugin: import mediawiki
+ New navigation system
+ Discontinued the use of a frame-based layout
+ rfe #3528994 [interface] Allow wrapping possibly long values in replication-status table
+ [interface] Autoselect username input on cookie login page
- sf#3563799 [interface] Grid editing destroying huge amount of data
+ [import] Remove support for the unactive docSQL import format
- sf#3577443 [edit] "Browse foreign values" does not show on ajax edit
+ rfe #3522109 [browse] Grid editing: action to trigger it (or disable)
- sf#3526598 [interface] SQL query not shown when creating table
+ Dropped configuration directive: AllowThirdPartyFraming
+ Dropped configuration directive: LeftFrameLight
+ Dropped configuration directive: DisplayDatabasesList
+ Dropped configuration directives: ShowTooltipAliasDB and ShowTooltipAliasTB
+ Dropped configuration directive: NaviDatabaseNameColor
+ Added configuration directive: MaxNavigationItems
+ Renamed configuration directive: LeftFrameDBTree => NavigationTreeEnableGrouping
+ Renamed configuration directive: LeftFrameDBSeparator => NavigationTreeDbSeparator
+ Renamed configuration directive: LeftFrameTableSeparator => NavigationTreeTableSeparator
+ Renamed configuration directive: LeftFrameTableLevel => NavigationTreeTableLevel
+ Renamed configuration directive: LeftPointerEnable => NavigationTreePointerEnable
+ Renamed configuration directive: LeftDefaultTabTable => NavigationTreeDefaultTabTable
+ Renamed configuration directive: LeftDisplayTableFilterMinimum => NavigationTreeDisplayTableFilterMinimum
+ Renamed configuration directive: LeftDisplayLogo => NavigationDisplayLogo
+ Renamed configuration directive: LeftLogoLink => NavigationLogoLink
+ Renamed configuration directive: LeftLogoLinkWindow => NavigationLogoLinkWindow
+ Renamed configuration directive: LeftDisplayServers => NavigationDisplayServers
+ Renamed configuration directive: LeftRecentTable => NumRecentTables
+ Renamed configuration directive: LeftDisplayDatabaseFilterMinimum => NavigationTreeDisplayDbFilterMinimum
+ Removed the "Mark row on click" feature; must now click the checkbox to mark
+ Removed the "Synchronize" feature
+ Improved layout of server variables page
+ rfe #1052091 [config] Double-underscores in PMA table names
+ Improved the "More" dropdown on the table structure page
+ [interface] Added "scroll to top" link in menubar
+ [designer] Fullscreen mode for the designer
+ Upgraded jquery to v1.8.3 and jquery-ui to v1.9.2
+ Patch #3597529 [status] Add raw value as title on server status page
+ Support MySQL 5.6 partitioning
+ Removed the AjaxEnable directive
+ rfe #3542567 Accept IPv6 ranges and IPv6 CIDR notations in $cfg['Servers'][$i]['AllowDeny']['rules']
- sf#3576788 Grid editing shows the value before silent truncation
- Upgraded jqPlot to 1.0.4 r1121
- Upgraded to jquery-ui-timepicker-addon 1.1.1
+ rfe #3599046 [interface] Added comments for indexes
- Replaced qtip with jQuery UI tooltip
- Upgraded CodeMirror to 2.37
- sf#2951 [export] Correctly export decimal fields.
- sf#3762 [core] Make Advisor work on Windows withou COM extension.
- sf#3519 [export] Prevent infinite recursion in PDF export.
- sf#3827 Table specific privileges not displayed for db name containing underscore
- rfe #1386 Add IF NOT EXISTS clause when copying database
- No longer package .travis.yml configuration file when creating a release.
- sf#3830 Can't export custom query because it lowercases table names
- sf#3829 Enabling query profiling crashes javascript based navigation
+ rfe #879 Reserved word warning
+ Remove the database ordering sub-feature of the only_db directive
- sf#3840 When exporting to gzip format, the data is compressed 2 times
+ rfe #1319 Permit to create index when creating foreign key
- sf#3703 Incorrect updating of the list of users
- sf#3853 Blowfish implementation might be broken (replace with phpseclib)
- sf#3865 Using like operator on each backslash needs 4 backslash protection
- sf#3860 Displayed git revision info is not set
- sf#3871 Check referential integrity broken across databases
- sf#3874 [export] No preselected option when exporting table
- sf#3873 Can't copy table to target database if table exists there
- sf#3683 Incorrect listing of records from to count
- sf#3876 [import] PHP 5.2 - unexpected T_PAAMAYIM_NEKUDOTAYIM
- [security] Local file inclusion vulnerability, reported by Janek Vind
(see PMASA-2013-4)
- [security] Global variables overwrite in export.php, reported by Janek Vind
(see PMASA-2013-5)
- sf#3892 [export] SQL Export files are empty
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 24 22:41:50 UTC 2013 - ecsos@schirra.net Wed Apr 24 22:41:50 UTC 2013 - ecsos@schirra.net

8
phpMyAdmin.spec
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: 3.5.8.1 Version: 4.0.1
Release: 0 Release: 0
Url: http://www.phpMyAdmin.net Url: http://www.phpMyAdmin.net
Source0: %{name}-%{version}-all-languages.tar.bz2 Source0: %{name}-%{version}-all-languages.tar.bz2
@ -112,7 +112,7 @@ find . -type f -name '*.orig' -exec rm {} \;
%install %install
#%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name} #%%{__install} -d -m0750 $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}
%{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name} %{__install} -d -m0755 $RPM_BUILD_ROOT%{ap_docroot}/%{name}
%{__cp} -dR *.css *.php *.html *.ico js libraries locale themes \ %{__cp} -dR *.css *.php *.ico js libraries locale themes \
$RPM_BUILD_ROOT%{ap_docroot}/%{name} $RPM_BUILD_ROOT%{ap_docroot}/%{name}
# install config to config dir # install config to config dir
%{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \ %{__install} -D -m0640 $RPM_BUILD_ROOT%{ap_docroot}/%{name}/config.sample.inc.php \
@ -155,9 +155,9 @@ find $RPM_BUILD_ROOT%{ap_docroot}/%{name} -maxdepth 1 -type f | grep -v 'config.
%files -f FILELIST %files -f FILELIST
%defattr(644,root,root,755) %defattr(644,root,root,755)
%doc ChangeLog Documentation.* docs.css %doc ChangeLog
%doc LICENSE README RELEASE-DATE* %doc LICENSE README RELEASE-DATE*
%doc examples %doc examples doc
%dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name} %dir %attr(0750,root,%{ap_grp}) %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/config.inc.php %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php
%dir %{ap_docroot}/%{name} %dir %{ap_docroot}/%{name}