Hello community, here is the log from the commit of package phpMyAdmin checked in at Thu Dec 7 21:22:21 CET 2006. -------- --- phpMyAdmin/phpMyAdmin.changes 2006-11-23 17:10:36.000000000 +0100 +++ /mounts/work_src_done/STABLE/phpMyAdmin/phpMyAdmin.changes 2006-12-01 22:50:15.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 1 22:48:15 CET 2006 - mmarek@suse.cz + +- fix previous update which wrongly moved the config.inc.php + file to the libraries subdirectory [#223721] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.NkuoUK/_old 2006-12-07 21:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.NkuoUK/_new 2006-12-07 21:21:07.000000000 +0100 @@ -17,7 +17,7 @@ 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.1.1 -Release: 1 +Release: 3 Source0: %{name}-%{version}-all-languages.tar.bz2 Source1: phpmyadmin.conf Patch1: %{name}-%{version}-blowfish_secret.patch @@ -75,9 +75,9 @@ %install install -m 755 -d $RPM_BUILD_ROOT%{serverroot}%{name} -cp libraries/config.default.php libraries/config.inc.php cp -dR docs.css *.php *.html themes lang libraries css js \ $RPM_BUILD_ROOT%{serverroot}%{name} +touch $RPM_BUILD_ROOT%{serverroot}%{name}/config.inc.php # generate file list find $RPM_BUILD_ROOT%{serverroot}%{name} -mindepth 1 -maxdepth 1 -type d | sed -e "s@$RPM_BUILD_ROOT@@" > FILELIST @@ -88,36 +88,18 @@ rm -rf $RPM_BUILD_ROOT %post -old_config="%{serverroot}%{name}/config.inc.php" -new_config="%{serverroot}%{name}/libraries/config.inc.php" -blowfish_secret="%{serverroot}%{name}/libraries/blowfish_secret.inc.php" -# handle upgrade from a version that had /config.inc.php (<=10.0) -# now it's /libraries/config.inc.php (>=10.1) -if test -f "$old_config"; then - echo "phpMyAdmin's config file location has changed from " >&2 - echo "$old_config to" >&2 - echo "$new_config" >&2 - echo "it will be automatically moved" >&2 - # emulate rpm behaviour when upgrading a %%config(noreplace) file - mv -f "$new_config" "$new_config.rpmnew" - mv -f "$old_config" "$new_config" -fi # generate blowfish secret -# in <=10.0, this used to be directly in config.inc.php, -# which made it hard to detect whether the file was changed by the user or not -if grep -q "\\\$cfg\['blowfish_secret'\]" "$new_config" ; then - # if this is an upgrade from <=10.0, move the secret - # to blowfish_secret.inc.php - # this is hopefully the last time we change this config file in %%post - (echo "<?php" - grep "\\\$cfg\['blowfish_secret'\]" "$new_config" - echo "?>") >"$blowfish_secret" - sed -i "s/.*\\\$cfg\['blowfish_secret'\].*/include_once 'blowfish_secret.inc.php';/" "$new_config" -fi +blowfish_secret="%{serverroot}%{name}/libraries/blowfish_secret.inc.php" if grep -q "\\\$cfg\['blowfish_secret'\] = ''" "$blowfish_secret" ; then echo "Generating blowfish secret for phpMyAdmin..." sed -i "s/\\\$cfg\['blowfish_secret'\] = ''/\$cfg['blowfish_secret'] = '`pwgen -s -1 46`'/" "$blowfish_secret" fi +# workaround for https://bugzilla.novell.com/show_bug.cgi?id=223725 +# we (wrongly) moved the config to libraries/ +if test -f %{serverroot}%{name}/libraries/config.inc.php -a ! \ + -f %{serverroot}%{name}/config.inc.php; then + mv %{serverroot}%{name}/libraries/config.inc.php %{serverroot}%{name}/ +fi %files -f FILELIST %defattr(-, root, root) @@ -125,11 +107,16 @@ %doc LICENSE README RELEASE-DATE* TODO translators.html %doc scripts/*.sql %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 +# we don't need to install config.inc.php, but we have to keep it +# in the filelist so that an update doesn't delete it +%ghost %{serverroot}%{name}/config.inc.php %changelog -n phpMyAdmin +* Fri Dec 01 2006 - mmarek@suse.cz +- fix previous update which wrongly moved the config.inc.php + file to the libraries subdirectory [#223721] * Thu Nov 23 2006 - anosek@suse.cz - security update to version 2.9.1.1 [#222594] [#222622] * Wed Nov 08 2006 - anosek@suse.cz ++++++ phpMyAdmin-2.9.1.1-blowfish_secret.patch ++++++ --- /var/tmp/diff_new_pack.NkuoUK/_old 2006-12-07 21:21:07.000000000 +0100 +++ /var/tmp/diff_new_pack.NkuoUK/_new 2006-12-07 21:21:07.000000000 +0100 @@ -1,11 +1,11 @@ --- libraries/config.default.php +++ libraries/config.default.php -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ $cfg['PmaNoRelation_DisableWarning'] = * passphrase that will be used by blowfish. The maximum length seems to be 46 * characters. */ -$cfg['blowfish_secret'] = ''; -+include_once 'blowfish_secret.inc.php'; ++include_once './libraries/blowfish_secret.inc.php'; /** * Server(s) configuration ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org