Hello community, here is the log from the commit of package phpMyAdmin checked in at Wed Nov 8 14:06:29 CET 2006. -------- --- phpMyAdmin/phpMyAdmin.changes 2006-10-17 17:13:50.000000000 +0200 +++ /mounts/work_src_done/NOARCH/phpMyAdmin/phpMyAdmin.changes 2006-11-08 13:44:39.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Nov 8 12:30:32 CET 2006 - anosek@suse.cz + +- added suggestions from [#216213] + * phpMyAdmin now uses mysqli extension not mysql (mysqli.patch) + * added Required: php5-mbstring + * phpMyAdmin now uses open_basedir for increased security + +------------------------------------------------------------------- Old: ---- phpMyAdmin-blowfish_secret.patch New: ---- phpMyAdmin-2.9.0.2-blowfish_secret.patch phpMyAdmin-2.9.0.2-mysqli.patch phpmyadmin.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.AkSfzb/_old 2006-11-08 14:05:38.000000000 +0100 +++ /var/tmp/diff_new_pack.AkSfzb/_new 2006-11-08 14:05:38.000000000 +0100 @@ -14,12 +14,14 @@ BuildRequires: apache2-devel libapr-util1-devel pcre-devel pwgen License: GNU General Public License (GPL) - all versions Group: Productivity/Networking/Web/Frontends -Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session apache2 +Requires: mod_php_any php-mysql php-bz2 php-gd php-zlib php-iconv php-mcrypt php-session apache2 php5-mbstring Autoreqprov: on Version: 2.9.0.2 -Release: 1 +Release: 11 Source0: %{name}-%{version}-all-languages.tar.bz2 -Patch1: %{name}-blowfish_secret.patch +Source1: phpmyadmin.conf +Patch1: %{name}-%{version}-blowfish_secret.patch +Patch2: %{name}-%{version}-mysqli.patch URL: http://www.phpMyAdmin.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Administration of MySQL over the web @@ -63,6 +65,7 @@ %prep %setup -q -n %{name}-%{version}-all-languages %patch1 +%patch2 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; find . -type f -name '*.orig' -exec rm {} \; @@ -79,6 +82,7 @@ # generate file list find $RPM_BUILD_ROOT%{serverroot}%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST find $RPM_BUILD_ROOT%{serverroot}%{name} -maxdepth 1 -type f | grep -v 'config.inc.php' | sed -e "s@$RPM_BUILD_ROOT@@" >> FILELIST +install -m 644 -D $RPM_SOURCE_DIR/phpmyadmin.conf $RPM_BUILD_ROOT/etc/apache2/conf.d/phpmyadmin.conf %clean rm -rf $RPM_BUILD_ROOT @@ -123,8 +127,14 @@ %dir %{serverroot}%{name} %config(noreplace) %{serverroot}%{name}/libraries/config.inc.php %attr(0640, wwwrun, www) %verify(not md5 size mtime) %config(noreplace) %{serverroot}%{name}/libraries/blowfish_secret.inc.php +%config(noreplace) /etc/apache2/conf.d/phpmyadmin.conf %changelog -n phpMyAdmin +* Wed Nov 08 2006 - anosek@suse.cz +- added suggestions from [#216213] + * phpMyAdmin now uses mysqli extension not mysql (mysqli.patch) + * added Required: php5-mbstring + * phpMyAdmin now uses open_basedir for increased security * Tue Oct 17 2006 - postadal@suse.cz - updated to 2.9.0.2 * Improved readability of setup panels @@ -278,11 +288,11 @@ okay as phpMyAdmin supports loading of old config files) * Mon Sep 08 2003 - mcihar@suse.cz - updated to 2.5.3: -- many bugs fixed -- messages about missing variables were displayed wrongly -- more export bugs -- confirmation of some dangerous SQL (TRUNCATE,DROP DATABASE) -- new nice icons for actions + - many bugs fixed + - messages about missing variables were displayed wrongly + - more export bugs + - confirmation of some dangerous SQL (TRUNCATE,DROP DATABASE) + - new nice icons for actions * Thu Sep 04 2003 - mcihar@suse.cz - include documentation stylesheet * Fri Aug 29 2003 - mcihar@suse.cz @@ -331,9 +341,9 @@ - update to version 2.2.3 * Tue Sep 04 2001 - rvasice@suse.cz - update to version 2.2.0 final -- dynamic multiple language support, with automatic detection -- database usage statistics -- table maintenance features (repair, check, optimize) + - dynamic multiple language support, with automatic detection + - database usage statistics + - table maintenance features (repair, check, optimize) - made package noarch * Thu Aug 02 2001 - rvasice@suse.cz - update to version 2.2.0rc3 ++++++ phpMyAdmin-2.9.0.2-blowfish_secret.patch ++++++ --- libraries/config.default.php +++ libraries/config.default.php @@ -42,7 +42,7 @@ * passphrase that will be used by blowfish. The maximum length seems to be 46 * characters. */ -$cfg['blowfish_secret'] = ''; +include_once 'blowfish_secret.inc.php'; /** * Server(s) configuration --- /dev/null +++ libraries/blowfish_secret.inc.php @@ -0,0 +1,3 @@ +<?php +$cfg['blowfish_secret'] = ''; +?> ++++++ phpMyAdmin-2.9.0.2-mysqli.patch ++++++ --- config.sample.inc.php +++ config.sample.inc.php @@ -33,7 +33,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; /* Select mysqli if your server has it */ -$cfg['Servers'][$i]['extension'] = 'mysql'; +$cfg['Servers'][$i]['extension'] = 'mysqli'; /* User for advanced features */ $cfg['Servers'][$i]['controluser'] = 'pmausr'; $cfg['Servers'][$i]['controlpass'] = 'pmapass'; --- libraries/config.default.php +++ libraries/config.default.php @@ -58,7 +58,7 @@ $cfg['Servers'][$i]['port'] = ''; // MySQL port - leave blank for default port $cfg['Servers'][$i]['socket'] = ''; // Path to the socket - leave blank for default socket $cfg['Servers'][$i]['connect_type'] = 'tcp'; // How to connect to MySQL server ('tcp' or 'socket') -$cfg['Servers'][$i]['extension'] = 'mysql'; // The php MySQL extension to use ('mysql' or 'mysqli') +$cfg['Servers'][$i]['extension'] = 'mysqli'; // The php MySQL extension to use ('mysql' or 'mysqli') $cfg['Servers'][$i]['compress'] = FALSE; // Use compressed protocol for the MySQL connection // (requires PHP >= 4.3.0) $cfg['Servers'][$i]['controluser'] = ''; // MySQL control user settings ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org