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

Accepting request 398771 from home:computersalat:devel:php

Browse Source 
rebase phpMyAdmin-config.patch

OBS-URL: https://build.opensuse.org/request/show/398771
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=260
This commit is contained in:
Christian Wittmer 2016-05-29 15:13:39 +00:00 committed by Git OBS Bridge
parent 7ed8b2119d
commit 620e24df45
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
phpMyAdmin-config.patch
View File

@ -1,6 +1,7 @@
diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin-4.6.2-all-languages/config.sample.inc.php Index: config.sample.inc.php
--- phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php 2016-05-25 19:07:44.000000000 +0200 ===================================================================
+++ phpMyAdmin-4.6.2-all-languages/config.sample.inc.php 2016-05-28 10:30:30.138092225 +0200 --- config.sample.inc.php.orig
+++ config.sample.inc.php
@@ -11,13 +11,56 @@ @@ -11,13 +11,56 @@
*/ */
@ -41,7 +42,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
+ * Default: en + * Default: en
+ */ + */
+/* $cfg['DefaultLang'] = 'de'; +/* $cfg['DefaultLang'] = 'de';
+ +
+/** +/**
* This is needed for cookie based authentication to encrypt password in * This is needed for cookie based authentication to encrypt password in
* cookie * cookie
@ -55,7 +56,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
* Servers configuration * Servers configuration
+ * + *
+ * for more info/explanation about these VARS have look at + * for more info/explanation about these VARS have look at
+ * libraries/config.default.php + * libraries/config.default.php
*/ */
$i = 0; $i = 0;
@ -104,12 +105,7 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
-// $cfg['Servers'][$i]['controlport'] = ''; -// $cfg['Servers'][$i]['controlport'] = '';
-// $cfg['Servers'][$i]['controluser'] = 'pma'; -// $cfg['Servers'][$i]['controluser'] = 'pma';
-// $cfg['Servers'][$i]['controlpass'] = 'pmapass'; -// $cfg['Servers'][$i]['controlpass'] = 'pmapass';
+$cfg['Servers'][$i]['controlhost'] = 'localhost'; -
+$cfg['Servers'][$i]['controlport'] = '';
+/*
+$cfg['Servers'][$i]['controluser'] = 'pma';
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
-/* Storage database and tables */ -/* Storage database and tables */
-// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin'; -// $cfg['Servers'][$i]['pmadb'] = 'phpmyadmin';
-// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark'; -// $cfg['Servers'][$i]['bookmarktable'] = 'pma__bookmark';
@ -133,6 +129,12 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
-// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates'; -// $cfg['Servers'][$i]['export_templates'] = 'pma__export_templates';
-/* 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';
+$cfg['Servers'][$i]['controlhost'] = 'localhost';
+$cfg['Servers'][$i]['controlport'] = '';
+/*
+$cfg['Servers'][$i]['controluser'] = 'pma';
+$cfg['Servers'][$i]['controlpass'] = 'pmapass';
+
+/** +/**
+ * The name of the database containing the phpMyAdmin configuration storage. + * The name of the database containing the phpMyAdmin configuration storage.
+ * + *
@ -249,9 +251,10 @@ diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/config.sample.inc.php phpMyAdmin
/** /**
* End of servers configuration * End of servers configuration
diff -Pdpru phpMyAdmin-4.6.2-all-languages.orig/libraries/vendor_config.php phpMyAdmin-4.6.2-all-languages/libraries/vendor_config.php Index: libraries/vendor_config.php
--- phpMyAdmin-4.6.2-all-languages.orig/libraries/vendor_config.php 2016-05-25 19:07:44.000000000 +0200 ===================================================================
+++ phpMyAdmin-4.6.2-all-languages/libraries/vendor_config.php 2016-05-28 10:33:10.089295600 +0200 --- libraries/vendor_config.php.orig
+++ libraries/vendor_config.php
@@ -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.

5
phpMyAdmin.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun May 29 15:07:43 UTC 2016 - chris@computersalat.de
- rebase phpMyAdmin-config.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 28 07:33:29 UTC 2016 - ecsos@opensuse.org Sat May 28 07:33:29 UTC 2016 - ecsos@opensuse.org

2
phpMyAdmin.spec
View File

@ -111,7 +111,7 @@ Currently phpMyAdmin can:
## rpmlint: ## rpmlint:
# wrong-file-end-of-line-encoding # wrong-file-end-of-line-encoding
perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php
%patch0 -p1 %patch0
%patch1 %patch1
# rpmlint: fix incorrect-fsf-address # rpmlint: fix incorrect-fsf-address