December 2011 - openSUSE Commits - openSUSE Mailing Lists

commit tar for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package tar for openSUSE:12.1:Update:Test checked in at 2011-12-29 11:16:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/tar (Old) and /work/SRC/openSUSE:12.1:Update:Test/.tar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tar", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/tar/tar.changes 2011-12-29 11:16:07.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.tar.new/tar.changes 2011-12-29 11:16:07.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 19 13:43:45 UTC 2011 - tcech(a)suse.cz + +- tar-1.26-remove_O_NONBLOCK.patch: + don't use O_NONBLOCK as a flag for read, + when file is offline, read with O_NONBLOCK returns EAGAIN, + but tar doesn't handle it + (bnc#737331) + +------------------------------------------------------------------- New: ---- tar-1.26-remove_O_NONBLOCK.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.CUy9nH/_old 2011-12-29 11:16:07.000000000 +0100 +++ /var/tmp/diff_new_pack.CUy9nH/_new 2011-12-29 11:16:07.000000000 +0100 @@ -21,15 +21,16 @@ Name: tar Version: 1.26 -Release: 1 -License: GPLv3+ +Release: 0 Summary: GNU implementation of tar ((t)ape (ar)chiver) -Url: http://www.gnu.org/software/tar/ +License: GPL-3.0+ Group: System/Base +Url: http://www.gnu.org/software/tar/ Source0: %{name}-%{version}.tar.bz2 # Patch3: tar-wildcards.patch Patch6: tar-backup-spec-fix-paths.patch +Patch7: tar-1.26-remove_O_NONBLOCK.patch %if 0%{?suse_version} >= %min_suse_ver BuildRequires: help2man Recommends: tar-lang = %{version} @@ -49,7 +50,6 @@ package. %package backup-scripts -License: GPLv3+ Summary: Backup scripts Group: Productivity/Archiving/Backup Requires: %{name} = %{version} @@ -63,6 +63,7 @@ %setup -q %patch3 -p1 %patch6 -p1 +%patch7 -p1 %build %define my_cflags -W -Wall -Wpointer-arith -Wstrict-prototypes -Wformat-security -Wno-unused-parameter ++++++ tar-1.26-remove_O_NONBLOCK.patch ++++++ Index: tar-1.26/src/tar.c =================================================================== --- tar-1.26.orig/src/tar.c +++ tar-1.26/src/tar.c @@ -2467,10 +2467,14 @@ decode_options (int argc, char **argv) /* Flags for accessing files to be read from or copied into. POSIX says O_NONBLOCK has unspecified effect on most types of files, but in - practice it never harms and sometimes helps. */ + practice it never harms and sometimes helps. + + It seems in fact that in practice it never helps and sometimes harms. + Removing again. + */ { int base_open_flags = - (O_BINARY | O_CLOEXEC | O_NOCTTY | O_NONBLOCK + (O_BINARY | O_CLOEXEC | O_NOCTTY | (dereference_option ? 0 : O_NOFOLLOW) | (atime_preserve_option == system_atime_preserve ? O_NOATIME : 0)); open_read_flags = O_RDONLY | base_open_flags; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit phpMyAdmin for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package phpMyAdmin for openSUSE:12.1:Update:Test checked in at 2011-12-29 11:15:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/phpMyAdmin (Old) and /work/SRC/openSUSE:12.1:Update:Test/.phpMyAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpMyAdmin", Maintainer is "CrRodriguez(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/phpMyAdmin/phpMyAdmin.changes 2011-12-16 16:45:30.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.phpMyAdmin.new/phpMyAdmin.changes 2011-12-29 11:15:57.000000000 +0100 @@ -1,0 +2,22 @@ +Wed Dec 28 13:41:55 UTC 2011 - chris(a)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 + +------------------------------------------------------------------- Old: ---- phpMyAdmin-3.4.1-config.patch phpMyAdmin-3.4.8-all-languages.tar.bz2 New: ---- phpMyAdmin-3.4.9-all-languages.tar.bz2 phpMyAdmin-3.4.9-config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpMyAdmin.spec ++++++ --- /var/tmp/diff_new_pack.s8REVr/_old 2011-12-29 11:15:57.000000000 +0100 +++ /var/tmp/diff_new_pack.s8REVr/_new 2011-12-29 11:15:57.000000000 +0100 @@ -35,12 +35,12 @@ 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 @@ %prep %setup -q -n %{name}-%{version}-all-languages -%patch0 -p1 +%patch0 find . -type d -exec chmod 755 {} \; find . -type f -exec chmod 644 {} \; ++++++ phpMyAdmin-3.4.8-all-languages.tar.bz2 -> phpMyAdmin-3.4.9-all-languages.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/ChangeLog new/phpMyAdmin-3.4.9-all-languages/ChangeLog --- old/phpMyAdmin-3.4.8-all-languages/ChangeLog 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/ChangeLog 2011-12-21 21:07:53.000000000 +0100 @@ -1,6 +1,20 @@ phpMyAdmin - ChangeLog ====================== +3.4.9.0 (2011-12-21) +- 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 + 3.4.8.0 (2011-12-01) - bug #3425230 [interface] enum data split at space char (more space to edit) - bug #3426840 [interface] ENUM/SET editor can't handle commas in values diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/Documentation.html new/phpMyAdmin-3.4.9-all-languages/Documentation.html --- old/phpMyAdmin-3.4.8-all-languages/Documentation.html 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/Documentation.html 2011-12-21 21:07:53.000000000 +0100 @@ -9,7 +9,7 @@ <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <title>phpMyAdmin 3.4.8 - Documentation</title> + <title>phpMyAdmin 3.4.9 - Documentation</title> <link rel="stylesheet" type="text/css" href="docs.css" /> </head> @@ -17,7 +17,7 @@ <div id="header"> <h1> <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a> - 3.4.8 + 3.4.9 Documentation </h1> </div> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/Documentation.txt new/phpMyAdmin-3.4.9-all-languages/Documentation.txt --- old/phpMyAdmin-3.4.8-all-languages/Documentation.txt 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/Documentation.txt 2011-12-21 21:07:53.000000000 +0100 @@ -1,4 +1,4 @@ -phpMyAdmin 3.4.8 Documentation +phpMyAdmin 3.4.9 Documentation * Top * Requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/README new/phpMyAdmin-3.4.9-all-languages/README --- old/phpMyAdmin-3.4.8-all-languages/README 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/README 2011-12-21 21:07:53.000000000 +0100 @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 3.4.8 +Version 3.4.9 A set of PHP-scripts to manage MySQL over the web. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.8 new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.8 --- old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.8 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.8 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Thu Dec 1 17:19:47 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.9 new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.9 --- old/phpMyAdmin-3.4.8-all-languages/RELEASE-DATE-3.4.9 1970-01-01 01:00:00.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/RELEASE-DATE-3.4.9 2011-12-21 21:07:53.000000000 +0100 @@ -0,0 +1 @@ +Wed Dec 21 20:06:46 UTC 2011 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/config.sample.inc.php new/phpMyAdmin-3.4.9-all-languages/config.sample.inc.php --- old/phpMyAdmin-3.4.8-all-languages/config.sample.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/config.sample.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -31,8 +31,8 @@ $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; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/db_operations.php new/phpMyAdmin-3.4.9-all-languages/db_operations.php --- old/phpMyAdmin-3.4.8-all-languages/db_operations.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/db_operations.php 2011-12-21 21:07:53.000000000 +0100 @@ -124,7 +124,6 @@ } unset($sql_constraints, $sql_drop_foreign_keys, $sql_structure); - foreach ($tables_full as $each_table => $tmp) { // to be able to rename a db containing views, // first all the views are collected and a stand-in is created @@ -133,11 +132,17 @@ $views[] = $each_table; // Create stand-in definition to resolve view dependencies $sql_view_standin = PMA_getTableDefStandIn($db, $each_table, "\n"); + PMA_DBI_select_db($newname); PMA_DBI_query($sql_view_standin); $GLOBALS['sql_query'] .= "\n" . $sql_view_standin . ';'; - continue; } + } + foreach ($tables_full as $each_table => $tmp) { + // skip the views; we have creted stand-in definitions + if (PMA_Table::isView($db, $each_table)) { + continue; + } $back = $sql_query; $sql_query = ''; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/js/navigation.js new/phpMyAdmin-3.4.9-all-languages/js/navigation.js --- old/phpMyAdmin-3.4.8-all-languages/js/navigation.js 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/js/navigation.js 2011-12-21 21:07:53.000000000 +0100 @@ -3,5 +3,5 @@ function PMA_saveFrameSize(){if(typeof pma_saveframesize_timeout=="number"){window.clearTimeout(pma_saveframesize_timeout);pma_saveframesize_timeout=null}pma_saveframesize_timeout=window.setTimeout(PMA_saveFrameSizeReal,2E3)} function PMA_setFrameSize(){pma_navi_width=PMA_getCookie("pma_navi_width");if(pma_navi_width!=null&&parent.document!=document)if(parent.text_dir=="ltr")parent.document.getElementById("mainFrameset").cols=pma_navi_width+",*";else parent.document.getElementById("mainFrameset").cols="*,"+pma_navi_width} function PMA_getCookie(a){var d=document.cookie.indexOf(a+"="),b=d+a.length+1;if(!d&&a!=document.cookie.substring(0,a.length))return null;if(d==-1)return null;a=document.cookie.indexOf(";",b);if(a==-1)a=document.cookie.length;return unescape(document.cookie.substring(b,a))}function PMA_setCookie(a,d,b,c,e,f){document.cookie=a+"="+escape(d)+(b?";expires="+b.toGMTString():"")+(c?";path="+c:"")+(e?";domain="+e:"")+(f?";secure":"")} -function fast_filter(a){lowercase_value=a.toLowerCase();$("#subel0 a[class!='tableicon']").each(function(d,b){$elem=$(b);a&&$elem.html().toLowerCase().indexOf(lowercase_value)==-1?$elem.parent().hide():$elem.parent().show()})}function clear_fast_filter(){var a=$("#NavFilter input");a.val("");fast_filter("");a.focus()} +function fast_filter(a){lowercase_value=a.toLowerCase();$("#subel0 a[class!='tableicon']").each(function(d,b){$elem=$(b);a&&$elem.html().toLowerCase().indexOf(lowercase_value)==-1?$elem.parent().hide():$elem.parents("li").show()})}function clear_fast_filter(){var a=$("#NavFilter input");a.val("");fast_filter("");a.focus()} $(document).ready(function(){$("#NavFilter").css("display","inline");$('input[id="fast_filter"]').focus(function(){$(this).attr("value")==="filter tables by name"&&clear_fast_filter()});$("#clear_fast_filter").click(clear_fast_filter);$("#fast_filter").focus(function(a){a.target.select()});$("#fast_filter").keyup(function(a){fast_filter(a.target.value)})}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/js/update-location.js new/phpMyAdmin-3.4.9-all-languages/js/update-location.js --- old/phpMyAdmin-3.4.8-all-languages/js/update-location.js 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/js/update-location.js 2011-12-21 21:07:53.000000000 +0100 @@ -1,2 +1,2 @@ -var hash_to_set="",hash_init_done=0;function setURLHash(a){if(!jQuery.browser.webkit)if(window.parent!=window&&window.parent.setURLHash)window.parent.setURLHash(a);else{var b=window.location.pathname;if(b.substring(b.length-9,b.length)=="index.php")if(hash_init_done)window.location.hash="PMAURL:"+a;else hash_to_set="PMAURL:"+a}} -$(document).ready(function(){if(!(window.parent!=window&&window.parent.setURLHash))if(window.location.hash.substring(0,8)=="#PMAURL:")window.location="index.php?"+window.location.hash.substring(8);else{if(hash_to_set!=""){window.location.hash=hash_to_set;hash_to_set=""}hash_init_done=1}}); +var hash_to_set="",hash_init_done=0;function setURLHash(a){if(!jQuery.browser.webkit)if(window.parent!=window&&window.parent.setURLHash)window.parent.setURLHash(a);else{var b=window.location.pathname;if(b.substring(b.length-9,b.length)=="index.php")if(hash_init_done){window.location.hash="PMAURL:"+a;fix_favicon()}else hash_to_set="PMAURL:"+a}}function fix_favicon(){jQuery.browser.mozilla&&$("head > link[href=\\.\\/favicon\\.ico]").appendTo("head")} +$(document).ready(function(){if(!(window.parent!=window&&window.parent.setURLHash))if(window.location.hash.substring(0,8)=="#PMAURL:")window.location="index.php?"+window.location.hash.substring(8);else{if(hash_to_set!=""){window.location.hash=hash_to_set;hash_to_set="";fix_favicon()}hash_init_done=1}}); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/Config.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/Config.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/Config.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/Config.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -96,7 +96,7 @@ */ function checkSystem() { - $this->set('PMA_VERSION', '3.4.8'); + $this->set('PMA_VERSION', '3.4.9'); /** * @deprecated */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/Table.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/Table.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/Table.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/Table.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -1033,6 +1033,17 @@ return false; } + // If the table is moved to a different database drop its triggers first + $triggers = PMA_DBI_get_triggers($this->getDbName(), $this->getName(), ''); + $handle_triggers = $this->getDbName() != $new_db && $triggers; + if ($handle_triggers) { + foreach ($triggers as $trigger) { + $sql = 'DROP TRIGGER IF EXISTS ' . PMA_backquote($this->getDbName()) . '.' + . PMA_backquote($trigger['name']) . ';'; + PMA_DBI_query($sql); + } + } + /* * tested also for a view, in MySQL 5.0.92, 5.1.55 and 5.5.13 */ @@ -1041,6 +1052,13 @@ TO ' . $new_table->getFullName(true) . ';'; // I don't think a specific error message for views is necessary if (! PMA_DBI_query($GLOBALS['sql_query'])) { + // Restore triggers in the old database + if ($handle_triggers) { + PMA_DBI_select_db($this->getDbName()); + foreach ($triggers as $trigger) { + PMA_DBI_query($trigger['create']); + } + } $this->errors[] = sprintf(__('Error renaming table %1$s to %2$s'), $this->getFullName(), $new_table->getFullName()); return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/check_user_privileges.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/check_user_privileges.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/check_user_privileges.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/check_user_privileges.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -128,8 +128,11 @@ && substr(PMA_DBI_getError(), 1, 4) != 1044) ) { if ($GLOBALS['cfg']['SuggestDBName']) { - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '_/', '\\1?', $show_grants_dbname); - $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $GLOBALS['db_to_create']); + /** + * Do not handle the underscore wildcard + * (this case must be rare anyway) + */ + $GLOBALS['db_to_create'] = preg_replace('/' . $re0 . '%/', '\\1...', $show_grants_dbname); $GLOBALS['db_to_create'] = preg_replace('/' . $re1 . '(%|_)/', '\\1\\3', $GLOBALS['db_to_create']); } $GLOBALS['is_create_db_priv'] = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/common.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/common.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/common.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/common.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -69,11 +69,15 @@ } /** - * Avoid problems with magic_quotes_runtime - * (in the future, this setting will be removed but it's not yet - * known in which PHP version) + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. */ -@ini_set('magic_quotes_runtime', false); +if (version_compare(phpversion(), '5.4', 'lt')) { + /** + * Avoid problems with magic_quotes_runtime + */ + @ini_set('magic_quotes_runtime', false); +} /** * for verification in all procedural scripts under libraries @@ -253,12 +257,18 @@ } // end check if a subform is submitted -// remove quotes added by php -if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { - PMA_arrayWalkRecursive($_GET, 'stripslashes', true); - PMA_arrayWalkRecursive($_POST, 'stripslashes', true); - PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); - PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); +/** + * This setting was removed in PHP 5.4. But at this point PMA_PHP_INT_VERSION + * is not yet defined so we use another way to find out the PHP version. + */ +if (version_compare(phpversion(), '5.4', 'lt')) { + // remove quotes added by PHP + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { + PMA_arrayWalkRecursive($_GET, 'stripslashes', true); + PMA_arrayWalkRecursive($_POST, 'stripslashes', true); + PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); + PMA_arrayWalkRecursive($_REQUEST, 'stripslashes', true); + } } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/common.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/common.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/common.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/common.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -811,8 +811,8 @@ if ($GLOBALS['cfg']['ShowTooltipAliasTB'] && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { // switch tooltip and name - $table['Comment'] = $table['Name']; $table['disp_name'] = $table['Comment']; + $table['Comment'] = $table['Name']; } else { $table['disp_name'] = $table['Name']; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/config/ConfigFile.class.php new/phpMyAdmin-3.4.9-all-languages/libraries/config/ConfigFile.class.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/config/ConfigFile.class.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/config/ConfigFile.class.php 2011-12-21 21:07:53.000000000 +0100 @@ -425,7 +425,7 @@ return htmlspecialchars($verbose); } $host = $this->get("Servers/$id/host"); - return empty($host) ? 'localhost' : $host; + return empty($host) ? 'localhost' : htmlspecialchars($host); } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/db_info.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/db_info.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/db_info.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/db_info.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -87,7 +87,7 @@ } if ($GLOBALS['cfg']['ShowTooltipAliasTB'] - && $GLOBALS['cfg']['ShowTooltipAliasTB'] != 'nested') { + && $GLOBALS['cfg']['ShowTooltipAliasTB'] !== 'nested') { $tooltip_truename[$table['Name']] = $table['Comment']; $tooltip_aliasname[$table['Name']] = $table['Name']; } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/dbi/mysql.dbi.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/dbi/mysql.dbi.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/dbi/mysql.dbi.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -175,8 +175,8 @@ $r = mysql_query($query, $link); } - if ($cache_affected_rows) { - $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); + if ($cache_affected_rows) { + $GLOBALS['cached_affected_rows'] = PMA_DBI_affected_rows($link, $get_from_cache = false); } if ($GLOBALS['cfg']['DBG']['sql']) { @@ -406,7 +406,7 @@ * @uses $GLOBALS['userlink'] * @uses mysql_affected_rows() * @param object mysql $link the mysql object - * @param boolean $get_from_cache + * @param boolean $get_from_cache * @return string integer */ function PMA_DBI_affected_rows($link = null, $get_from_cache = true) @@ -427,14 +427,18 @@ } /** - * @todo add missing keys like in from mysqli_query (orgname, orgtable, flags, decimals) + * @todo add missing keys like in from mysqli_query (decimals) */ function PMA_DBI_get_fields_meta($result) { $fields = array(); $num_fields = mysql_num_fields($result); for ($i = 0; $i < $num_fields; $i++) { - $fields[] = mysql_fetch_field($result, $i); + $field = mysql_fetch_field($result, $i); + $field->flags = mysql_field_flags($result, $i); + $field->orgtable = mysql_field_table($result, $i); + $field->orgname = mysql_field_name($result, $i); + $fields[] = $field; } return $fields; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/display_export.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/display_export.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/display_export.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/display_export.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -150,10 +150,10 @@ echo '<label for ="radio_allrows_0">' . __('Dump some row(s)') . '</label>'; ?> <ul> <li><label for="limit_to"><?php echo __('Number of rows:') . '</label> <input type="text" id="limit_to" name="limit_to" size="5" value="' - . ((isset($_GET['limit_to'])) ? $_GET['limit_to'] : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) + . ((isset($_GET['limit_to'])) ? htmlspecialchars($_GET['limit_to']) : ((isset($unlim_num_rows) ? $unlim_num_rows : PMA_Table::countRecords($db, $table)))) . '" onfocus="this.select()" />' ?></li> <li><label for="limit_from"><?php echo __('Row to begin at:') . '</label> <input type="text" id="limit_from" name="limit_from" value="' - . ((isset($_GET['limit_from'])) ? $_GET['limit_from'] : '0') + . ((isset($_GET['limit_from'])) ? htmlspecialchars($_GET['limit_from']) : '0') . '" size="5" onfocus="this.select()" />'; ?></li> </ul> </li> @@ -242,7 +242,7 @@ <?php echo ' value="'; if(isset($_GET['filename_template'])) { - echo $_GET['filename_template']; + echo htmlspecialchars($_GET['filename_template']); } else { if ($export_type == 'database') { echo htmlspecialchars($GLOBALS['PMA_Config']->getUserValue( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/display_tbl.lib.php new/phpMyAdmin-3.4.9-all-languages/libraries/display_tbl.lib.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/display_tbl.lib.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/display_tbl.lib.php 2011-12-21 21:07:53.000000000 +0100 @@ -996,14 +996,16 @@ /** * Prepares the display for a null value * - * @param string $class - * @param string $condition_field + * @param string $class class of table cell + * @param bool $condition_field whether to add CSS class condition + * @param object $meta the meta-information about this field + * @param string $align cell allignment * * @return string the td */ -function PMA_buildNullDisplay($class, $condition_field) { +function PMA_buildNullDisplay($class, $condition_field, $meta, $align = '') { // the null class is needed for inline editing - return '<td align="right"' . ' class="' . $class . ($condition_field ? ' condition' : '') . ' null"><i>NULL</i></td>'; + return '<td ' . $align . ' class="' . PMA_addClass($class, $condition_field, $meta, '') . ' null"><i>NULL</i></td>'; } /** @@ -1359,7 +1361,7 @@ // so use the $pointer if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta, 'align="right"'); } elseif ($row[$i] != '') { $nowrap = ' nowrap'; @@ -1382,7 +1384,7 @@ if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } else { // for blobstreaming // if valid BS reference exists @@ -1398,7 +1400,7 @@ // not binary: } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // if a transform function for blob is set, none of these replacements will be made if (PMA_strlen($row[$i]) > $GLOBALS['cfg']['LimitChars'] && $_SESSION['tmp_user_values']['display_text'] == 'P') { @@ -1426,7 +1428,7 @@ // n o t n u m e r i c a n d n o t B L O B } else { if (!isset($row[$i]) || is_null($row[$i])) { - $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field); + $vertical_display['data'][$row_no][$i] = PMA_buildNullDisplay($class, $condition_field, $meta); } elseif ($row[$i] != '') { // support blanks in the key $relation_id = $row[$i]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/language_stats.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/language_stats.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/language_stats.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/language_stats.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -30,7 +30,7 @@ 'hi' => 77, 'hr' => 48, 'hu' => 83, - 'id' => 48, + 'id' => 73, 'it' => 99, 'ja' => 99, 'ka' => 64, @@ -43,9 +43,9 @@ 'ms' => 18, 'nb' => 88, 'nl' => 99, - 'pl' => 82, - 'pt_BR' => 67, - 'pt' => 31, + 'pl' => 83, + 'pt_BR' => 70, + 'pt' => 37, 'ro' => 52, 'ru' => 99, 'si' => 74, @@ -61,7 +61,7 @@ 'tr' => 99, 'tt' => 35, 'ug' => 22, - 'uk' => 35, + 'uk' => 44, 'ur' => 38, 'uz@latin' => 72, 'uz' => 72, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpMyAdmin-3.4.8-all-languages/libraries/session.inc.php new/phpMyAdmin-3.4.9-all-languages/libraries/session.inc.php --- old/phpMyAdmin-3.4.8-all-languages/libraries/session.inc.php 2011-12-01 18:20:55.000000000 +0100 +++ new/phpMyAdmin-3.4.9-all-languages/libraries/session.inc.php 2011-12-21 21:07:53.000000000 +0100 @@ -44,7 +44,8 @@ // but not all user allow cookies @ini_set('session.use_only_cookies', false); -@ini_set('session.use_trans_sid', true); +// do not force transparent session ids, see bug #3398788 +//@ini_set('session.use_trans_sid', true); @ini_set('url_rewriter.tags', 'a=href,frame=src,input=src,form=fakeentry,fieldset='); //ini_set('arg_separator.output', '&'); Files old/phpMyAdmin-3.4.8-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ar/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/be/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/be(a)latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/be(a)latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/bg/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/bn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ca/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/cs/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/da/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/de/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/el/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/en_GB/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/es/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/et/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/fi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/fr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/gl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hi/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/hu/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/id/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/it/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ja/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ka/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/lt/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/mn/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/nb/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/nl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/pl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/pt_BR/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ro/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/ru/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/si/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sl/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sr(a)latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sr(a)latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/sv/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/tr/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uk/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uz/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/uz(a)latin/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/uz(a)latin/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/zh_CN/LC_MESSAGES/phpmyadmin.mo differ Files old/phpMyAdmin-3.4.8-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo and new/phpMyAdmin-3.4.9-all-languages/locale/zh_TW/LC_MESSAGES/phpmyadmin.mo differ ++++++ phpMyAdmin-3.4.1-config.patch -> phpMyAdmin-3.4.9-config.patch ++++++ --- /work/SRC/openSUSE:12.1:Update:Test/phpMyAdmin/phpMyAdmin-3.4.1-config.patch 2011-11-24 20:15:54.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.phpMyAdmin.new/phpMyAdmin-3.4.9-config.patch 2011-12-29 11:15:57.000000000 +0100 @@ -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 @@ -$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 @@ * 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 @@ /** * Whether setup requires writable directory where config -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ define('CONFIG_DIR', './'); /** * Filename of a configuration file. */ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnome-control-center for openSUSE:12.1:Update:Test
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package gnome-control-center for openSUSE:12.1:Update:Test checked in at 2011-12-29 11:15:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/gnome-control-center (Old) and /work/SRC/openSUSE:12.1:Update:Test/.gnome-control-center.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnome-control-center", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/gnome-control-center/gnome-control-center.changes 2011-11-24 20:14:51.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.gnome-control-center.new/gnome-control-center.changes 2011-12-29 11:15:14.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Dec 23 04:29:04 UTC 2011 - glin(a)suse.com + +- add gnome-control-center-private-connections-by-default.patch to + create the private connections by default (bnc#731812) + +------------------------------------------------------------------- New: ---- gnome-control-center-private-connections-by-default.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-control-center.spec ++++++ --- /var/tmp/diff_new_pack.7IJlQZ/_old 2011-12-29 11:15:14.000000000 +0100 +++ /var/tmp/diff_new_pack.7IJlQZ/_new 2011-12-29 11:15:14.000000000 +0100 @@ -79,6 +79,8 @@ Patch14: gnome-control-center-system-proxy-configuration.patch # PATCH-FIX-UPSTREAM gnome-control-center-probe-radius-server-cert.patch bnc#574266 glin(a)suse.com -- Probe the RADIUS server certificate Patch15: gnome-control-center-probe-radius-server-cert.patch +# PATCH-FIX-OPENSUSE gnome-control-center-private-connections-by-default.patch bnc#731812 glin(a)suse.com -- Create the private connections by default +Patch16: gnome-control-center-private-connections-by-default.patch Url: http://www.gnome.org Requires: %{name}-branding = %{version} # needed for printers panel @@ -164,6 +166,7 @@ #NEEDS-REBASE #%patch14 -p1 %patch15 -p1 +%patch16 -p1 %if 0%{?BUILD_FROM_VCS} [ -x ./autogen.sh ] && NOCONFIGURE=1 ./autogen.sh ++++++ gnome-control-center-private-connections-by-default.patch ++++++ diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c index ca31b0d..424ae38 100644 --- a/panels/network/cc-network-panel.c +++ b/panels/network/cc-network-panel.c @@ -2687,8 +2687,10 @@ wireless_ap_changed_cb (GtkComboBox *combo_box, CcNetworkPanel *panel) NetObject *object; NMConnection *connection; NMConnection *connection_activate = NULL; + NMConnection *partial; NMDevice *device; NMSettingWireless *setting_wireless; + NMSettingConnection *setting_con; if (panel->priv->updating_device) goto out; @@ -2757,8 +2759,12 @@ wireless_ap_changed_cb (GtkComboBox *combo_box, CcNetworkPanel *panel) /* create one, as it's missing */ g_debug ("no existing connection found for %s, creating", ssid_target); + partial = nm_connection_new (); + setting_con = nm_setting_connection_new (); + nm_connection_add_setting (partial, NM_SETTING (setting_con)); + nm_setting_connection_add_permission (setting_con, "user", g_get_user_name(), NULL); nm_client_add_and_activate_connection (panel->priv->client, - NULL, + partial, device, object_path, connection_add_activate_cb, panel); out: @@ -3010,6 +3016,7 @@ start_shared_connection (CcNetworkPanel *panel) "id", "Hotspot", "autoconnect", FALSE, NULL); + nm_setting_connection_add_permission (sc, "user", g_get_user_name(), NULL); nm_connection_add_setting (c, (NMSetting *)sc); sw = (NMSettingWireless *)nm_setting_wireless_new (); diff --git a/panels/network/network-dialogs.c b/panels/network/network-dialogs.c index efe1704..f8419e5 100644 --- a/panels/network/network-dialogs.c +++ b/panels/network/network-dialogs.c @@ -293,6 +293,7 @@ cc_network_panel_connect_to_8021x_network (CcNetworkPanel *panel, uuid = nm_utils_uuid_generate (); g_object_set (s_con, NM_SETTING_CONNECTION_UUID, uuid, NULL); g_free (uuid); + nm_setting_connection_add_permission (s_con, "user", g_get_user_name(), NULL); nm_connection_add_setting (connection, NM_SETTING (s_con)); s_wifi = (NMSettingWireless *) nm_setting_wireless_new (); @@ -393,6 +394,10 @@ cdma_mobile_wizard_done (NMAMobileWizard *wizard, NULL); g_free (uuid); g_free (id); + nm_setting_connection_add_permission ((NMSettingConnection *)setting, + "user", + g_get_user_name(), + NULL); nm_connection_add_setting (connection, setting); } @@ -456,6 +461,10 @@ gsm_mobile_wizard_done (NMAMobileWizard *wizard, NULL); g_free (uuid); g_free (id); + nm_setting_connection_add_permission ((NMSettingConnection *)setting, + "user", + g_get_user_name(), + NULL); nm_connection_add_setting (connection, setting); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5-appl for openSUSE:11.4
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package krb5-appl for openSUSE:11.4 checked in at Thu Dec 29 11:14:40 CET 2011. -------- --- old-versions/11.4/UPDATES/all/krb5-appl/krb5-appl.changes 2011-07-06 15:43:55.000000000 +0200 +++ 11.4/krb5-appl/krb5-appl.changes 2011-12-28 19:11:50.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 28 19:11:34 CET 2011 - meissner(a)suse.de + +- Fixed a remote code execution in ktelnetd (CVE-2011-4862 / bnc#738632) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- krb5-appl-telnet-CVE-2011-4862.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-appl.spec ++++++ --- /var/tmp/diff_new_pack.rAACQ6/_old 2011-12-29 11:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.rAACQ6/_new 2011-12-29 11:14:29.000000000 +0100 @@ -26,7 +26,7 @@ Url: http://web.mit.edu/kerberos/www/ BuildRequires: bison krb5-devel libcom_err-devel ncurses-devel Version: 1.0 -Release: 7.<RELEASE10> +Release: 7.<RELEASE12> Summary: MIT Kerberos5 Implementation--Applications Group: Productivity/Networking/Security Source0: krb5-appl-1.0.tar.bz2 @@ -38,6 +38,7 @@ Patch3: krb5-appl-1.0-fix-path-in-manpages.dif Patch4: fix-telnet.dif Patch5: krb5-appl-MITKRB5-SA-2011-005.dif +Patch6: krb5-appl-telnet-CVE-2011-4862.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,9 +114,11 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %{?suse_update_config:%{suse_update_config -f}} +autoconf ./autogen.sh CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fpie" \ LDFLAGS="-pie " \ ++++++ fix-telnet.dif ++++++ --- /var/tmp/diff_new_pack.rAACQ6/_old 2011-12-29 11:14:29.000000000 +0100 +++ /var/tmp/diff_new_pack.rAACQ6/_new 2011-12-29 11:14:29.000000000 +0100 @@ -1,125 +1,3 @@ -Gemeinsame Unterverzeichnisse: krb5-appl-1.0//bsd und krb5-appl-1.0.1//bsd. -diff -u krb5-appl-1.0//configure krb5-appl-1.0.1//configure ---- krb5-appl-1.0//configure 2010-03-03 00:59:12.000000000 +0100 -+++ krb5-appl-1.0.1//configure 2010-05-22 14:17:15.000000000 +0200 -@@ -8840,9 +8840,7 @@ - - - -- -- --for ac_func in line_push logwtmp openpty ptsname revoke rmufile rresvport_af -+for ac_func in line_push ptsname revoke rmufile rresvport_af - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - { echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -9330,6 +9328,106 @@ - done - - -+# Check for functions found in libutil. -+old_LIBS="$LIBS" -+LIBS="$UTIL_LIB $LIBS" -+ -+ -+for ac_func in logwtmp openpty -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$ac_func || defined __stub___$ac_func -+choke me -+#endif -+ -+int -+main () -+{ -+return $ac_func (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ eval "$as_ac_var=no" -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+ac_res=`eval echo '${'$as_ac_var'}'` -+ { echo "$as_me:$LINENO: result: $ac_res" >&5 -+echo "${ECHO_T}$ac_res" >&6; } -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+LIBS="$old_LIBS" -+ - # Determine which functions to define in libmissing. - - diff -u krb5-appl-1.0//configure.ac krb5-appl-1.0.1//configure.ac --- krb5-appl-1.0//configure.ac 2009-11-21 22:46:39.000000000 +0100 +++ krb5-appl-1.0.1//configure.ac 2010-05-22 14:08:50.000000000 +0200 ++++++ krb5-appl-telnet-CVE-2011-4862.patch ++++++ Index: krb5-appl/telnet/libtelnet/encrypt.c =================================================================== --- krb5-appl/telnet/libtelnet/encrypt.c +++ krb5-appl/telnet/libtelnet/encrypt.c @@ -755,6 +755,9 @@ static void encrypt_keyid(kp, keyid, len int dir = kp->dir; register int ret = 0; + if (len > MAXKEYLEN) + len = MAXKEYLEN; + if (!(ep = (*kp->getcrypt)(*kp->modep))) { if (len == 0) return; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iptables for openSUSE:11.4
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package iptables for openSUSE:11.4 checked in at Thu Dec 29 11:14:37 CET 2011. -------- --- old-versions/11.4/all/iptables/iptables.changes 2010-10-29 19:58:42.000000000 +0200 +++ 11.4/iptables/iptables.changes 2011-12-28 11:13:00.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 28 09:54:42 UTC 2011 - puzel(a)suse.com + +- iptables-apply-mktemp-fix.patch (bnc#730161) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/iptables Destination is old-versions/11.4/UPDATES/all/iptables calling whatdependson for 11.4-i586 New: ---- iptables-apply-mktemp-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptables.spec ++++++ --- /var/tmp/diff_new_pack.UNlKKC/_old 2011-12-29 11:14:13.000000000 +0100 +++ /var/tmp/diff_new_pack.UNlKKC/_new 2011-12-29 11:14:13.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package iptables (Version 1.4.10) +# spec file for package iptables # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,14 @@ License: GPLv2+ Group: Productivity/Networking/Security Version: 1.4.10 -Release: 1 +Release: 4.<RELEASE5> Summary: IP Packet Filter Administration #Git-Web: http://git.netfilter.org/ #Git-Clone: git://git.netfilter.org/iptables Source: http://netfilter.org/projects/%name/files/%name-%version.tar.bz2 Patch0: iptables-batch.patch +Patch1: iptables-apply-mktemp-fix.patch Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config sgmltool @@ -51,6 +52,7 @@ %prep %setup -q %patch -P 0 -p1 +%patch1 %build if [ ! -e configure ]; then ++++++ iptables-apply-mktemp-fix.patch ++++++ Index: iptables-apply =================================================================== --- iptables-apply.orig +++ iptables-apply @@ -110,7 +110,7 @@ case "${0##*/}" in ;; esac -COMMANDS=(tempfile "$SAVE" "$RESTORE") +COMMANDS=(mktemp "$SAVE" "$RESTORE") for cmd in "${COMMANDS[@]}"; do if ! command -v $cmd >/dev/null; then @@ -121,7 +121,7 @@ done umask 0700 -TMPFILE=$(tempfile -p iptap) +TMPFILE=$(mktemp) trap "rm -f $TMPFILE" EXIT 1 2 3 4 5 6 7 8 10 11 12 13 14 15 if ! "$SAVE" >"$TMPFILE"; then continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit krb5-appl for openSUSE:11.3
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package krb5-appl for openSUSE:11.3 checked in at Thu Dec 29 11:14:24 CET 2011. -------- --- old-versions/11.3/UPDATES/all/krb5-appl/krb5-appl.changes 2011-07-06 15:42:47.000000000 +0200 +++ 11.3/krb5-appl/krb5-appl.changes 2011-12-28 19:11:14.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 28 19:10:32 CET 2011 - meissner(a)suse.de + +- Fixed a remote code execution in ktelnetd (CVE-2011-4862 / bnc#738632) + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 New: ---- krb5-appl-telnet-CVE-2011-4862.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-appl.spec ++++++ --- /var/tmp/diff_new_pack.kK1ObD/_old 2011-12-29 11:14:05.000000000 +0100 +++ /var/tmp/diff_new_pack.kK1ObD/_new 2011-12-29 11:14:05.000000000 +0100 @@ -26,7 +26,7 @@ Url: http://web.mit.edu/kerberos/www/ BuildRequires: bison krb5-devel libcom_err-devel ncurses-devel Version: 1.0 -Release: 4.<RELEASE2> +Release: 4.<RELEASE5> Summary: MIT Kerberos5 Implementation--Applications Group: Productivity/Networking/Security Source0: krb5-appl-1.0.tar.bz2 @@ -37,6 +37,7 @@ Patch2: krb5-appl-1.0-fix-var-used-before-value-set.dif Patch3: krb5-appl-1.0-fix-path-in-manpages.dif Patch4: krb5-appl-MITKRB5-SA-2011-005.dif +Patch5: krb5-appl-telnet-CVE-2011-4862.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -111,6 +112,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ krb5-appl-telnet-CVE-2011-4862.patch ++++++ Index: krb5-appl/telnet/libtelnet/encrypt.c =================================================================== --- krb5-appl/telnet/libtelnet/encrypt.c +++ krb5-appl/telnet/libtelnet/encrypt.c @@ -755,6 +755,9 @@ static void encrypt_keyid(kp, keyid, len int dir = kp->dir; register int ret = 0; + if (len > MAXKEYLEN) + len = MAXKEYLEN; + if (!(ep = (*kp->getcrypt)(*kp->modep))) { if (len == 0) return; continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit iptables for openSUSE:11.3
by root＠hilbert.suse.de 29 Dec '11

29 Dec '11

Hello community, here is the log from the commit of package iptables for openSUSE:11.3 checked in at Thu Dec 29 11:14:00 CET 2011. -------- --- old-versions/11.3/all/iptables/iptables.changes 2010-05-26 17:26:25.000000000 +0200 +++ 11.3/iptables/iptables.changes 2011-12-28 11:12:51.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 28 09:57:06 UTC 2011 - puzel(a)suse.com + +- iptables-apply-mktemp-fix.patch (bnc#730161) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/iptables Destination is old-versions/11.3/UPDATES/all/iptables calling whatdependson for 11.3-i586 New: ---- iptables-apply-mktemp-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptables.spec ++++++ --- /var/tmp/diff_new_pack.34FxeJ/_old 2011-12-29 11:13:29.000000000 +0100 +++ /var/tmp/diff_new_pack.34FxeJ/_new 2011-12-29 11:13:29.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package iptables (Version 1.4.8) +# spec file for package iptables # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,14 @@ License: GPLv2+ Group: Productivity/Networking/Security Version: 1.4.8 -Release: 1 +Release: 2.<RELEASE2> Summary: IP Packet Filter Administration #Git-Web: http://git.netfilter.org/ #Git-Clone: git://git.netfilter.org/iptables Source: http://netfilter.org/projects/iptables/files/iptables-1.4.8.tar.bz2 Patch0: %{name}-batch.patch +Patch1: iptables-apply-mktemp-fix.patch Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config sgmltool @@ -51,6 +52,7 @@ %prep %setup -q %patch -P 0 -p1 +%patch1 %build if [ ! -e configure ]; then ++++++ iptables-apply-mktemp-fix.patch ++++++ Index: iptables-apply =================================================================== --- iptables-apply.orig +++ iptables-apply @@ -110,7 +110,7 @@ case "${0##*/}" in ;; esac -COMMANDS=(tempfile "$SAVE" "$RESTORE") +COMMANDS=(mktemp "$SAVE" "$RESTORE") for cmd in "${COMMANDS[@]}"; do if ! command -v $cmd >/dev/null; then @@ -121,7 +121,7 @@ done umask 0700 -TMPFILE=$(tempfile -p iptap) +TMPFILE=$(mktemp) trap "rm -f $TMPFILE" EXIT 1 2 3 4 5 6 7 8 10 11 12 13 14 15 if ! "$SAVE" >"$TMPFILE"; then continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zlib for openSUSE:Factory
by root＠hilbert.suse.de 27 Dec '11

27 Dec '11

Hello community, here is the log from the commit of package zlib for openSUSE:Factory checked in at 2011-12-27 18:39:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zlib (Old) and /work/SRC/openSUSE:Factory/.zlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zlib", Maintainer is "MVyskocil(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/zlib/zlib.changes 2011-12-12 17:06:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zlib.new/zlib.changes 2011-12-27 18:39:56.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 22 14:31:42 CET 2011 - meissner(a)suse.de + +- use configure options for library paths. Also fixes + the pkg-config file to not have /usr/local bnc#738169 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zlib.spec ++++++ --- /var/tmp/diff_new_pack.h4Jfld/_old 2011-12-27 18:39:59.000000000 +0100 +++ /var/tmp/diff_new_pack.h4Jfld/_new 2011-12-27 18:39:59.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: zlib Provides: libz Obsoletes: libz @@ -89,14 +90,14 @@ %if %{do_profiling} profiledir=$(mktemp -d) trap "rm -rf $profiledir" EXIT -CC="%__cc" ./configure --shared +CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_generate}=$profiledir" %{?_smp_mflags} time make check make clean %{__make} CFLAGS="$RPM_OPT_FLAGS %{cflags_profile_feedback}=$profiledir" %{?_smp_mflags} %else export CFLAGS="%optflags" -CC="%__cc" ./configure --shared +CC="%__cc" ./configure --shared --prefix=%_prefix --libdir=/%_lib %{__make} %{?_smp_mflags} %endif @@ -104,12 +105,9 @@ time make check %install -mkdir -p %{buildroot}{/%{_lib},%{_libdir}} -mkdir -p %{buildroot}%{_mandir}/man3 -mkdir -p %{buildroot}%{_includedir} -make install \ - prefix=%{buildroot}%{_prefix} \ - libdir=%{buildroot}/%{_lib} +#mkdir -p %{buildroot}%{_mandir}/man3 +mkdir -p %{buildroot}%{_libdir} +make install DESTDIR=%{buildroot} %{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/libz.so) %{buildroot}%{_libdir}/libz.so %{__rm} -v %{buildroot}/%{_lib}/libz.so # static lib -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xfconf for openSUSE:Factory
by root＠hilbert.suse.de 27 Dec '11

27 Dec '11

Hello community, here is the log from the commit of package xfconf for openSUSE:Factory checked in at 2011-12-27 18:39:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfconf (Old) and /work/SRC/openSUSE:Factory/.xfconf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfconf", Maintainer is "xfce-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xfconf/xfconf.changes 2011-09-23 12:51:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfconf.new/xfconf.changes 2011-12-27 18:39:47.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 23 19:49:00 UTC 2011 - gber(a)opensuse.org + +- remove workarounds for 11.2 +- update to version 4.8.1 + - fix double free crash + - allow installation of the helpers in a custom location + - translation updates +- install xfconfd under %_libexecdir + +------------------------------------------------------------------- Old: ---- xfconf-4.8.0.tar.bz2 New: ---- xfconf-4.8.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfconf.spec ++++++ --- /var/tmp/diff_new_pack.Nfik5f/_old 2011-12-27 18:39:48.000000000 +0100 +++ /var/tmp/diff_new_pack.Nfik5f/_new 2011-12-27 18:39:48.000000000 +0100 @@ -15,31 +15,22 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%if 0%{?suse_version} >= 1130 -%define withperl 1 -%else -%define withperl 0 -%endif - Name: xfconf -Version: 4.8.0 -Release: 1 -License: GPL-2.0+ +Version: 4.8.1 +Release: 0 %define libname lib%{name}-0-2 Summary: Simple Configuration Storage for Xfce -Url: http://www.xfce.org/ +License: GPL-2.0+ Group: System/GUI/XFCE +Url: http://www.xfce.org/ Source: %{name}-%{version}.tar.bz2 Source100: %{name}-rpmlintrc Patch0: xfconf-4.7.3-remove-rpath.patch BuildRequires: gtk-doc BuildRequires: intltool -%if %{withperl} BuildRequires: perl(ExtUtils::Depends) BuildRequires: perl(ExtUtils::PkgConfig) BuildRequires: perl(Glib) -%endif BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libxfce4util-1.0) @@ -49,10 +40,7 @@ Xfconf is a simple client-server configuration storage and query system for the Xfce desktop. -%if %{withperl} - %package -n perl-xfconf -License: GPL-2.0+ Summary: Simple Configuration Storage for Xfce - Perl Interface Group: Development/Libraries/Perl Requires: %{name} = %{version} @@ -65,12 +53,8 @@ This package contains the Perl interface to %{name}. -%endif - %package -n %{libname} - -License: GPL-2.0+ Summary: Simple Configuration Storage for Xfce - Runtime Library Group: System/Libraries Provides: libxfce4mcs = %{version} @@ -84,7 +68,6 @@ This package contains the runtime library. %package -n libxfconf-devel -License: GPL-2.0+ Summary: Simple Configuration Storage for Xfce - Runtime Library - Development Files Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} @@ -110,11 +93,8 @@ %configure \ --disable-silent-rules \ --disable-static \ -%if %{withperl} + --with-helper-path-prefix=%{_libexecdir} \ --with-perl-options='NOECHO= OPTIMIZE="%{optflags}" CCDLFLAGS="-Wl,-E" INSTALLDIRS=vendor' \ -%else - --disable-perl-bindings \ -%endif --enable-gtk-doc make %{?_smp_mflags} @@ -123,9 +103,7 @@ rm -f %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,ur_PK} rm -f %{buildroot}%{perl_vendorarch}/auto/Xfce4/Xfconf/Xfconf.bs -%if %{withperl} %perl_process_packlist -%endif %find_lang %{name} %clean @@ -139,9 +117,9 @@ %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog TODO %{_bindir}/xfconf-query -%dir %{_libdir}/xfce4 -%dir %{_libdir}/xfce4/xfconf -%{_libdir}/xfce4/xfconf/xfconfd +%dir %{_libexecdir}/xfce4 +%dir %{_libexecdir}/xfce4/xfconf +%{_libexecdir}/xfce4/xfconf/xfconfd %{_datadir}/dbus-1/services/* %files -n %{libname} @@ -155,8 +133,6 @@ %{_libdir}/*.so %{_libdir}/pkgconfig/* -%if %{withperl} - %files -n perl-xfconf %defattr(-,root,root) %doc %{_mandir}/man3/Xfce4::Xfconf.3pm* @@ -170,6 +146,4 @@ %{_localstatedir}/adm/perl-modules/xfconf %endif -%endif - %changelog ++++++ xfconf-4.8.0.tar.bz2 -> xfconf-4.8.1.tar.bz2 ++++++ ++++ 21374 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit virtuoso for openSUSE:Factory
by root＠hilbert.suse.de 27 Dec '11

27 Dec '11

Hello community, here is the log from the commit of package virtuoso for openSUSE:Factory checked in at 2011-12-27 18:39:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/virtuoso (Old) and /work/SRC/openSUSE:Factory/.virtuoso.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "virtuoso", Maintainer is "DMueller(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/virtuoso/virtuoso.changes 2011-11-16 17:23:15.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.virtuoso.new/virtuoso.changes 2011-12-27 18:39:41.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 27 15:31:56 UTC 2011 - idonmez(a)suse.com + +- Fix wrong size parameter in memset call + +------------------------------------------------------------------- New: ---- virtuoso-wrong-memset.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ virtuoso.spec ++++++ --- /var/tmp/diff_new_pack.g3ZwuQ/_old 2011-12-27 18:39:44.000000000 +0100 +++ /var/tmp/diff_new_pack.g3ZwuQ/_new 2011-12-27 18:39:44.000000000 +0100 @@ -16,14 +16,13 @@ # - Name: virtuoso Version: 6.1.4 -Release: 7 -License: GPL-2.0 +Release: 0 Summary: Relational database server with RDF -Url: http://virtuoso.openlinksw.com/ +License: GPL-2.0 Group: Productivity/Databases/Servers +Url: http://virtuoso.openlinksw.com/ Source0: http://prdownloads.sourceforge.net/virtuoso/%{name}-opensource-%{version}.t… # PATCH-FIX-OPENSUSE build-sanely.diff -- Build only things needed by KDE Patch0: build-sanely.diff @@ -35,6 +34,8 @@ Patch3: isql-buffer-overflow.patch # PATCH-FIX-OPENSUSE suse-gawk-4.diff pkleef(a)openlinksw.com -- Disable the gawk check for Opensuse (required because of SR85083) Patch4: suse-gawk-4.diff +# PATCH-FIX-UPSTREAM patches/virtuoso-wrong-memset.patch idoenmez(a)suse.de -- Fix wrong size parameter in memset call +Patch5: virtuoso-wrong-memset.patch BuildRequires: bison BuildRequires: flex BuildRequires: gperf @@ -66,7 +67,6 @@ It is used by the Virtuoso backend for Soprano in KDE. %package -n virtuoso-server -License: GPL-2.0 Summary: Virtuoso server Group: Productivity/Databases/Servers Requires: virtuoso-drivers = %{version} @@ -79,7 +79,6 @@ It is used by the Virtuoso backend for Soprano in KDE. %package -n virtuoso-drivers -License: GPL-2.0 Summary: Virtuoso ODBC Driver Group: Productivity/Databases/Servers Provides: %{name} = %{version} @@ -101,6 +100,7 @@ %if 0%{?suse_version} >= 1210 %patch4 -p1 %endif +%patch5 -p1 %build # autogen.sh because of patching Makefile.am ++++++ virtuoso-wrong-memset.patch ++++++ Index: virtuoso-opensource-6.1.4/libsrc/Wi/srvcr.c =================================================================== --- virtuoso-opensource-6.1.4.orig/libsrc/Wi/srvcr.c +++ virtuoso-opensource-6.1.4/libsrc/Wi/srvcr.c @@ -2085,7 +2085,7 @@ bif_scroll_cr_open (caddr_t * qst, caddr { params[0][inx] = box_copy_tree (bif_arg (qst, args, inx + 1, "__scroll_cr_open")); } - memset (opts, 0, sizeof (opts)); + memset (opts, 0, sizeof (stmt_options_t)); opts->so_concurrency = SQL_CONCUR_LOCK; opts->so_cursor_type = stmt->sst_query->qr_cursor_type; Index: virtuoso-opensource-6.1.4/libsrc/Tidy/lexer.c =================================================================== --- virtuoso-opensource-6.1.4.orig/libsrc/Tidy/lexer.c +++ virtuoso-opensource-6.1.4/libsrc/Tidy/lexer.c @@ -191,7 +191,7 @@ Lexer *NewLexer(StreamIn *in) Lexer *lexer; lexer = (Lexer *)MemAlloc(sizeof(Lexer)); - ClearMemory (lexer, sizeof (Lexer *)); + ClearMemory (lexer, sizeof (Lexer)); lexer->in = in; lexer->lines = 1; lexer->columns = 1; @@ -483,7 +483,7 @@ Node *NewNode(void) Node *node; node = (Node *)MemAlloc(sizeof(Node)); - ClearMemory (node, sizeof (Node *)); + ClearMemory (node, sizeof (Node)); node->type = TextNode; return node; } Index: virtuoso-opensource-6.1.4/libsrc/Tidy/tidy.c =================================================================== --- virtuoso-opensource-6.1.4.orig/libsrc/Tidy/tidy.c +++ virtuoso-opensource-6.1.4/libsrc/Tidy/tidy.c @@ -215,7 +215,7 @@ StreamIn *OpenInputBoxString(caddr_t htm { StreamIn *in; in = (StreamIn *)MemAlloc(sizeof(StreamIn)); - ClearMemory(in, sizeof (StreamIn *)); + ClearMemory(in, sizeof (StreamIn)); in->input.tio_data.lm_memblock = html_input; in->input.tio_data.lm_length = box_length (html_input)-1; in->input.tio_pos = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0