From b1ddf8fe46668c025fe780ed22c7bc175937311bbcb256e8ff191470c978e556 Mon Sep 17 00:00:00 2001 From: Christian Wittmer Date: Wed, 28 Dec 2011 13:47:19 +0000 Subject: [PATCH] Accepting request 98374 from home:computersalat:devel:php update to 3.4.9, fix for bnc#738411 OBS-URL: https://build.opensuse.org/request/show/98374 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=28 --- phpMyAdmin-3.4.8-all-languages.tar.bz2 | 3 --- phpMyAdmin-3.4.9-all-languages.tar.bz2 | 3 +++ ...fig.patch => phpMyAdmin-3.4.9-config.patch | 20 +++++++++-------- phpMyAdmin.changes | 22 +++++++++++++++++++ phpMyAdmin.spec | 6 ++--- 5 files changed, 39 insertions(+), 15 deletions(-) delete mode 100644 phpMyAdmin-3.4.8-all-languages.tar.bz2 create mode 100644 phpMyAdmin-3.4.9-all-languages.tar.bz2 rename phpMyAdmin-3.4.1-config.patch => phpMyAdmin-3.4.9-config.patch (93%) diff --git a/phpMyAdmin-3.4.8-all-languages.tar.bz2 b/phpMyAdmin-3.4.8-all-languages.tar.bz2 deleted file mode 100644 index ad8c1fb..0000000 --- a/phpMyAdmin-3.4.8-all-languages.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:792a53d1904feed2bba0a613680af86fb4ca2ee8e94ba65ef92043c5c2d90604 -size 4610153 diff --git a/phpMyAdmin-3.4.9-all-languages.tar.bz2 b/phpMyAdmin-3.4.9-all-languages.tar.bz2 new file mode 100644 index 0000000..ade6ec8 --- /dev/null +++ b/phpMyAdmin-3.4.9-all-languages.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5251dc5c5c691c02dd4683692f282c72e8360f453dbb3edfa5f53d9461299f86 +size 4666051 diff --git a/phpMyAdmin-3.4.1-config.patch b/phpMyAdmin-3.4.9-config.patch similarity index 93% rename from phpMyAdmin-3.4.1-config.patch rename to phpMyAdmin-3.4.9-config.patch index 95f27a9..65f0298 100644 --- a/phpMyAdmin-3.4.1-config.patch +++ b/phpMyAdmin-3.4.9-config.patch @@ -1,6 +1,7 @@ -diff -ruN phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php phpMyAdmin-3.4.1-all-languages/config.sample.inc.php ---- phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php 2011-05-20 19:24:04.000000000 +0200 -+++ phpMyAdmin-3.4.1-all-languages/config.sample.inc.php 2011-05-24 18:21:28.000000000 +0200 +Index: config.sample.inc.php +=================================================================== +--- config.sample.inc.php.orig 2011-12-21 21:07:53.000000000 +0100 ++++ config.sample.inc.php 2011-12-28 14:33:11.000000000 +0100 @@ -10,55 +10,223 @@ * @package phpMyAdmin */ @@ -67,8 +68,8 @@ diff -ruN phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php phpMyAdmin-3 -$cfg['Servers'][$i]['host'] = 'localhost'; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; -$cfg['Servers'][$i]['compress'] = false; --/* Select mysqli if your server has it */ --$cfg['Servers'][$i]['extension'] = 'mysql'; +-/* 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'; @@ -256,9 +257,10 @@ diff -ruN phpMyAdmin-3.4.1-all-languages-orig/config.sample.inc.php phpMyAdmin-3 * End of servers configuration */ -diff -ruN phpMyAdmin-3.4.1-all-languages-orig/libraries/vendor_config.php phpMyAdmin-3.4.1-all-languages/libraries/vendor_config.php ---- phpMyAdmin-3.4.1-all-languages-orig/libraries/vendor_config.php 2011-05-20 19:24:04.000000000 +0200 -+++ phpMyAdmin-3.4.1-all-languages/libraries/vendor_config.php 2011-05-24 17:24:15.000000000 +0200 +Index: libraries/vendor_config.php +=================================================================== +--- libraries/vendor_config.php.orig 2011-12-21 21:07:53.000000000 +0100 ++++ libraries/vendor_config.php 2011-12-28 14:35:48.000000000 +0100 @@ -14,18 +14,18 @@ * Path to changelog file, can be gzip compressed. Useful when you want to * have documentation somewhere else, eg. /usr/share/doc. @@ -281,7 +283,7 @@ diff -ruN phpMyAdmin-3.4.1-all-languages-orig/libraries/vendor_config.php phpMyA /** * Whether setup requires writable directory where config -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ define('CONFIG_DIR', './'); /** * Filename of a configuration file. */ diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 5c20ac4..fc673d7 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Dec 28 13:41:55 UTC 2011 - chris@computersalat.de + +- update to 3.4.9 + - bug #3442028 [edit] Inline editing enum fields with null shows no dropdown + - bug #3442004 [interface] DB suggestion not correct for user with underscore + - bug #3438420 [core] Magic quotes removed in PHP 5.4 + - bug #3398788 [session] No feedback when result is empty (signon auth_type) + - bug #3384035 [display] Problems regarding ShowTooltipAliasTB + - bug #3306875 [edit] Can't rename a database that contains views + - bug #3452506 [edit] Unable to move tables with triggers + - bug #3449659 [navi] Fast filter broken with table tree + - bug #3448485 [GUI] Firefox favicon frameset regression + - [core] Better compatibility with mysql extension + - [security] Self-XSS on export options (export server/database/table), + see PMASA-2011-20 + - [security] Self-XSS in setup (host parameter), see PMASA-2011-19 +- fix for bnc#738411 + * PMASA-2011-19 (CVE-2011-4780) + * PMASA-2011-20 (CVE-2011-4782) +- rework config patch + ------------------------------------------------------------------- Fri Dec 16 08:34:11 UTC 2011 - chris@computersalat.de diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 8b05ca4..204ec5d 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -35,12 +35,12 @@ Name: phpMyAdmin Summary: Administration of MySQL over the web License: GPL-2.0+ Group: Productivity/Networking/Web/Frontends -Version: 3.4.8 +Version: 3.4.9 Release: 0 Url: http://www.phpMyAdmin.net Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: %{name}.http -Patch0: %{name}-3.4.1-config.patch +Patch0: %{name}-3.4.9-config.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: pwgen coreutils sed grep @@ -97,7 +97,7 @@ Currently phpMyAdmin can: %prep %setup -q -n %{name}-%{version}-all-languages -%patch0 -p1 +%patch0 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \;