March 2012 - openSUSE Commits - openSUSE Mailing Lists

commit phpPgAdmin for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package phpPgAdmin for openSUSE:Factory checked in at 2012-03-30 14:20:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/phpPgAdmin (Old) and /work/SRC/openSUSE:Factory/.phpPgAdmin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "phpPgAdmin", Maintainer is "max(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/phpPgAdmin/phpPgAdmin.changes 2011-10-21 16:34:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.phpPgAdmin.new/phpPgAdmin.changes 2012-03-30 14:20:24.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Mar 29 10:59:18 UTC 2012 - chris(a)computersalat.de + +- update to 5.0.4 + - Released: 22th March 2012 + - Bug fixes. + * Fix #3468882 "UPDATE single row with varchar key: empty where + clause", reported by "Dirk Kraemer" + * Fix XSS in function.php, reported by Mateusz Goik + * Fix bug where renaming a tablespace was leading to an error + * Fix a bug where clicking to "Show all schemas" on schema + privilege page leads back to the latest tab used in database level + * Fix a bug when executing a query from the history + * Fix bad confirmation message when droping an autovacuum table setup + * Fix bug #3429633 '"Back" link from "Browse" leads to error' + * Fix a PHP warning when Slony conf parameters are not set + * Show cancel/kill actions in process page only if role is a superuser + * Some more small code cleanup and fixes. +- fix for bnc#754694 (CVE-2012-1600) + * https://bugzilla.novell.com/show_bug.cgi?id=754694 + +------------------------------------------------------------------- Old: ---- phpPgAdmin-5.0.3.tar.bz2 New: ---- phpPgAdmin-5.0.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ phpPgAdmin.spec ++++++ --- /var/tmp/diff_new_pack.oqr3sX/_old 2012-03-30 14:20:26.000000000 +0200 +++ /var/tmp/diff_new_pack.oqr3sX/_new 2012-03-30 14:20:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package phpPgAdmin # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,7 +16,6 @@ # - Name: phpPgAdmin %define apxs %{_sbindir}/apxs2 @@ -26,10 +25,10 @@ %define ppa_config %{_sysconfdir}/%{name}/config.inc.php Summary: Administration of PostgreSQL over the web -Version: 5.0.3 -Release: 1 License: GPL-2.0+ Group: Productivity/Databases/Tools +Version: 5.0.4 +Release: 0 Url: http://phppgadmin.sourceforge.net Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.http @@ -37,7 +36,8 @@ BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: apache2-devel -Requires: mod_php_any php-pgsql +Requires: mod_php_any +Requires: php-pgsql %description phpPgAdmin is a web-based administration tool for PostgreSQL. It is ++++++ phpPgAdmin-5.0.3.tar.bz2 -> phpPgAdmin-5.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/HISTORY new/phpPgAdmin-5.0.4/HISTORY --- old/phpPgAdmin-5.0.3/HISTORY 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/HISTORY 2012-03-22 14:35:22.000000000 +0100 @@ -2,6 +2,24 @@ ------------------ +Version 5.0.4 +------------- + +Released: 22th March 2012 + +Bug fixes. + +* Fix #3468882 "UPDATE single row with varchar key: empty where clause", reported by "Dirk Kraemer" +* Fix XSS in function.php, reported by Mateusz Goik +* Fix bug where renaming a tablespace was leading to an error +* Fix a bug where clicking to "Show all schemas" on schema privilege page leads back to the latest tab used in database level +* Fix a bug when executing a query from the history +* Fix bad confirmation message when droping an autovacuum table setup +* Fix bug #3429633 '"Back" link from "Browse" leads to error' +* Fix a PHP warning when Slony conf parameters are not set +* Show cancel/kill actions in process page only if role is a superuser +* Some more small code cleanup and fixes. + Version 5.0.3 ------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/admin.php new/phpPgAdmin-5.0.4/admin.php --- old/phpPgAdmin-5.0.3/admin.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/admin.php 2012-03-22 14:35:22.000000000 +0100 @@ -427,7 +427,7 @@ $script = ($type == 'database')? 'database.php' : 'tables.php'; printf("<p>{$lang['strdelvacuumtable']}</p>\n", - $misc->printVal("\"{$_GET['schema']}"."{$_GET['table']}\"")); + $misc->printVal("\"{$_GET['schema']}\".\"{$_GET['table']}\"")); echo "<form style=\"float: left\" action=\"{$script}\" method=\"post\">\n"; echo "<input type=\"hidden\" name=\"action\" value=\"delautovac\" />\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/classes/Misc.php new/phpPgAdmin-5.0.4/classes/Misc.php --- old/phpPgAdmin-5.0.3/classes/Misc.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/classes/Misc.php 2012-03-22 14:35:22.000000000 +0100 @@ -40,13 +40,173 @@ if (isset($_REQUEST['server']) && $exclude_from != 'server') { $href .= 'server=' . urlencode($_REQUEST['server']); if (isset($_REQUEST['database']) && $exclude_from != 'database') { - $href .= '&database=' . urlencode($_REQUEST['database']); + $href .= '&database=' . urlencode($_REQUEST['database']); if (isset($_REQUEST['schema']) && $exclude_from != 'schema') { - $href .= '&schema=' . urlencode($_REQUEST['schema']); + $href .= '&schema=' . urlencode($_REQUEST['schema']); } } } - return $href; + return htmlentities($href); + } + + function getHREFSubject($subject) { + + $vars = array(); + + switch($subject) { + case 'root': + return 'redirect.php?subject=root'; + break; + case 'server': + $vars = array ( + 'server' => $_REQUEST['server'], + 'subject' => 'server' + ); + break; + case 'report': + return 'reports.php?'. http_build_query(array( + 'server' => $_REQUEST['server'], + 'subject' => 'report', + 'report' => $_REQUEST['report'] + ), '', '&'); + break; + case 'role': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'role', + 'action' => 'properties', + 'rolename' => $_REQUEST['rolename'] + ); + break; + case 'database': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'database', + 'database' => $_REQUEST['database'], + ); + break; + case 'schema': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'schema', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'] + ); + break; + case 'slony_cluster': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'slony_cluster', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'slony_cluster' => $_REQUEST['slony_cluster'] + ); + break; + case 'table': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'table', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'table' => $_REQUEST['table'] + ); + break; + case 'selectrows': + return 'tables.php?'. http_build_query(array( + 'server' => $_REQUEST['server'], + 'subject' => 'table', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'table' => $_REQUEST['table'], + 'action' => 'confselectrows' + ), '', '&'); + break; + case 'view': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'view', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'view' => $_REQUEST['view'] + ); + break; + case 'fulltext': + case 'ftscfg': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'fulltext', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'action' => 'viewconfig', + 'ftscfg' => $_REQUEST['ftscfg'] + ); + break; + case 'function': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'function', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'function' => $_REQUEST['function'], + 'function_oid' => $_REQUEST['function_oid'] + ); + break; + case 'aggregate': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'aggregate', + 'action' => 'properties', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'aggrname' => $_REQUEST['aggrname'], + 'aggrtype' => $_REQUEST['aggrtype'] + ); + break; + case 'slony_node': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'slony_cluster', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'no_id' => $_REQUEST['no_id'], + 'no_name' => $_REQUEST['no_name'] + ); + break; + case 'slony_set': + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'slony_set', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'slony_set_id' => $_REQUEST['slony_set'], + 'slony_set' => $_REQUEST['slony_set'] + ); + break; + case 'column': + if (isset($_REQUEST['table'])) + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'column', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'table' => $_REQUEST['table'], + 'column' => $_REQUEST['column'] + ); + else + $vars = array( + 'server' => $_REQUEST['server'], + 'subject' => 'column', + 'database' => $_REQUEST['database'], + 'schema' => $_REQUEST['schema'], + 'view' => $_REQUEST['view'], + 'column' => $_REQUEST['column'] + ); + break; + default: + return false; + } + + return 'redirect.php?'. http_build_query($vars, '', '&'); } /** @@ -1192,7 +1352,7 @@ $crumblink = "<a"; if (isset($crumb['url'])) - $crumblink .= ' href="' . $this->printVal($crumb['url'], 'nbsp') . '"'; + $crumblink .= " href=\"{$crumb['url']}\""; if (isset($crumb['title'])) $crumblink .= " title=\"{$crumb['title']}\""; @@ -1241,12 +1401,11 @@ if ($subject == 'root') $done = true; if (!$done) { - $vars = 'server='.urlencode($_REQUEST['server']).'&'; $server_info = $this->getServerInfo(); $trail['server'] = array( 'title' => $lang['strserver'], 'text' => $server_info['desc'], - 'url' => "redirect.php?subject=server&{$vars}", + 'url' => $this->getHREFSubject('server'), 'help' => 'pg.server', 'icon' => 'Server' ); @@ -1254,30 +1413,27 @@ if ($subject == 'server') $done = true; if (isset($_REQUEST['report']) && !$done) { - $vars .= 'report='.urlencode($_REQUEST['report']).'&'; $trail['report'] = array( 'title' => $lang['strreport'], 'text' => $_REQUEST['report'], - 'url' => "reports.php?subject=report&{$vars}", + 'url' => $this->getHREFSubject('report'), 'icon' => 'Report' ); } if (isset($_REQUEST['database']) && !$done) { - $vars .= 'database='.urlencode($_REQUEST['database']).'&'; $trail['database'] = array( 'title' => $lang['strdatabase'], 'text' => $_REQUEST['database'], - 'url' => "redirect.php?subject=database&{$vars}", + 'url' => $this->getHREFSubject('database'), 'help' => 'pg.database', 'icon' => 'Database' ); } elseif (isset($_REQUEST['rolename']) && !$done) { - $vars .= "subject=role&action=properties&rolename=".urlencode($_REQUEST['rolename']); $trail['role'] = array( 'title' => $lang['strrole'], 'text' => $_REQUEST['rolename'], - 'url' => "redirect.php?{$vars}", + 'url' => $this->getHREFSubject('role'), 'help' => 'pg.role', 'icon' => 'Roles' ); @@ -1285,11 +1441,10 @@ if ($subject == 'database' || $subject == 'role' || $subject == 'report') $done = true; if (isset($_REQUEST['schema']) && !$done) { - $vars .= 'schema='.urlencode($_REQUEST['schema']).'&'; $trail['schema'] = array( 'title' => $lang['strschema'], 'text' => $_REQUEST['schema'], - 'url' => "redirect.php?subject=schema&{$vars}", + 'url' => $this->getHREFSubject('schema'), 'help' => 'pg.schema', 'icon' => 'Schema' ); @@ -1297,11 +1452,10 @@ if ($subject == 'schema') $done = true; if (isset($_REQUEST['slony_cluster']) && !$done) { - $vars .= 'slony_cluster='.urlencode($_REQUEST['slony_cluster']).'&'; $trail['slony_cluster'] = array( 'title' => 'Slony Cluster', 'text' => $_REQUEST['slony_cluster'], - 'url' => "redirect.php?subject=slony_cluster&{$vars}", + 'url' => $this->getHREFSubject('slony_cluster'), 'help' => 'sl.cluster', 'icon' => 'Cluster' ); @@ -1309,29 +1463,26 @@ if ($subject == 'slony_cluster') $done = true; if (isset($_REQUEST['table']) && !$done) { - $vars .= "table=".urlencode($_REQUEST['table']); $trail['table'] = array( 'title' => $lang['strtable'], 'text' => $_REQUEST['table'], - 'url' => "redirect.php?subject=table&{$vars}", + 'url' => $this->getHREFSubject('table'), 'help' => 'pg.table', 'icon' => 'Table' ); } elseif (isset($_REQUEST['view']) && !$done) { - $vars .= "view=".urlencode($_REQUEST['view']); $trail['view'] = array( 'title' => $lang['strview'], 'text' => $_REQUEST['view'], - 'url' => "redirect.php?subject=view&{$vars}", + 'url' => $this->getHREFSubject('view'), 'help' => 'pg.view', 'icon' => 'View' ); } elseif (isset($_REQUEST['ftscfg']) && !$done) { - $vars .= "action=viewconfig&ftscfg=".urlencode($_REQUEST['ftscfg']); $trail['ftscfg'] = array( 'title' => $lang['strftsconfig'], 'text' => $_REQUEST['ftscfg'], - 'url' => "fulltext.php?{$vars}", + 'url' => $this->getHREFSubject('ftscfg'), 'help' => 'pg.ftscfg.example', 'icon' => 'Fts' ); @@ -1341,55 +1492,45 @@ if (!$done && !is_null($subject)) { switch ($subject) { case 'function': - $vars .= "{$subject}_oid=".urlencode($_REQUEST[$subject.'_oid']).'&'; - $vars .= "subject={$subject}&{$subject}=".urlencode($_REQUEST[$subject]); $trail[$subject] = array( 'title' => $lang['str'.$subject], 'text' => $_REQUEST[$subject], - 'url' => "redirect.php?{$vars}", + 'url' => $this->getHREFSubject('function'), 'help' => 'pg.function', 'icon' => 'Function' ); break; case 'aggregate': - $vars .= "subject=aggregate&action=properties&aggrname=".urlencode($_REQUEST['aggrname']); - $vars .= "&aggrtype=".urlencode($_REQUEST['aggrtype']); $trail[$subject] = array( 'title' => $lang['straggregate'], 'text' => $_REQUEST['aggrname'], - 'url' => "redirect.php?{$vars}", + 'url' => $this->getHREFSubject('aggregate'), 'help' => 'pg.aggregate', 'icon' => 'Aggregate' ); break; case 'slony_node': - $vars .= 'no_id='.urlencode($_REQUEST['no_id']).'&no_name='.urlencode($_REQUEST['no_name']); $trail[$subject] = array( 'title' => 'Slony Node', 'text' => $_REQUEST['no_name'], - 'url' => "redirect.php?{$vars}", 'help' => 'sl.'.$subject, 'icon' => 'Node' ); break; case 'slony_set': - $vars .= "{$subject}_id=".urlencode($_REQUEST[$subject]).'&'; - $vars .= "subject={$subject}&{$subject}=".urlencode($_REQUEST[$subject]); $trail[$subject] = array( 'title' => $lang['str'.$subject], 'text' => $_REQUEST[$subject], - 'url' => "redirect.php?{$vars}", 'help' => 'sl.'.$subject, 'icon' => 'AvailableReplicationSet' ); break; case 'column': - $vars .= "&column=". urlencode($_REQUEST['column']) ."&subject=column"; $trail['column'] = array ( 'title' => $lang['strcolumn'], 'text' => $_REQUEST['column'], 'icon' => 'Column', - 'url' => "redirect.php?{$vars}" + 'url' => $this->getHREFSubject('column') ); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/classes/database/Postgres.php new/phpPgAdmin-5.0.4/classes/database/Postgres.php --- old/phpPgAdmin-5.0.3/classes/database/Postgres.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/classes/database/Postgres.php 2012-03-22 14:35:22.000000000 +0100 @@ -7058,10 +7058,12 @@ if ($name != $spcname) { $sql = "ALTER TABLESPACE \"{$spcname}\" RENAME TO \"{$name}\""; $status = $this->execute($sql); - if ($status != 0) { - $this->rollbackTransaction(); - return -3; - } + if ($status != 0) { + $this->rollbackTransaction(); + return -3; + } + + $spcname = $name; } // Set comment if it has changed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/colproperties.php new/phpPgAdmin-5.0.4/colproperties.php --- old/phpPgAdmin-5.0.3/colproperties.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/colproperties.php 2012-03-22 14:35:22.000000000 +0100 @@ -240,30 +240,27 @@ $query_url = urlencode("SELECT \"{$f_attname}\", count(*) AS \"count\" FROM \"{$f_schema}\".\"{$f_table}\" GROUP BY \"{$f_attname}\" ORDER BY \"{$f_attname}\"") ; if ($isTable) { - $return_url = urlencode("colproperties.php?{$misc->href}&table=". urlencode($tableName) - ."&column=". urlencode($_REQUEST['column'])); - /* Browse link */ /* FIXME browsing a col should somehow be a action so we don't * send an ugly SQL in the URL */ echo "\t<li><a href=\"display.php?{$misc->href}&subject=column&table=", urlencode($_REQUEST['table']), "&column=", urlencode($_REQUEST['column']), - "&return_url={$return_url}&return_desc=", urlencode($lang['strback']), + "&return=column", "&query={$query_url}\">{$lang['strbrowse']}</a></li>\n"; /* Edit link */ echo "\t<li><a href=\"colproperties.php?action=properties&{$misc->href}&table=", urlencode($tableName), "&column=", urlencode($_REQUEST['column']) . "\">{$lang['stralter']}</a></li>\n"; - echo "\t<li><a href=\"tblproperties.php?action=confirm_drop&{$misc->href}&table=", urlencode($tableName), - "&column=" . urlencode($_REQUEST['column']) . "\">{$lang['strdrop']}</a></li>\n"; + echo "\t<li><a href=\"tblproperties.php?action=confirm_drop&{$misc->href}&table=", urlencode($tableName), + "&column=" . urlencode($_REQUEST['column']) . "\">{$lang['strdrop']}</a></li>\n"; } else { - $return_url = urlencode("colproperties.php?{$misc->href}&view=". urlencode($tableName) - ."&column=". urlencode($_REQUEST['column'])); /* Browse link */ - echo "\t<li><a href=\"display.php?{$misc->href}&subject=column&column=", - urlencode($_REQUEST['column']), "&return_url={$return_url}&return_desc=", urlencode($lang['strback']), + echo "\t<li><a href=\"display.php?{$misc->href}&subject=column&view=", + urlencode($_REQUEST['view']), + "&column=", urlencode($_REQUEST['column']), + "&return=column", "&query={$query_url}\">{$lang['strbrowse']}</a></li>\n"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/database.php new/phpPgAdmin-5.0.4/database.php --- old/phpPgAdmin-5.0.3/database.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/database.php 2012-03-22 14:35:22.000000000 +0100 @@ -457,23 +457,26 @@ // Build possible actions for our process list $columns['actions'] = array('title' => $lang['stractions']); - - $actions = array( - 'cancel' => array( - 'title' => $lang['strcancel'], - 'url' => "database.php?action=signal&signal=CANCEL&{$misc->href}&", - 'vars' => array('procpid' => 'procpid') - ), - 'kill' => array( - 'title' => $lang['strkill'], - 'url' => "database.php?action=signal&signal=KILL&{$misc->href}&", - 'vars' => array('procpid' => 'procpid') - ) - ); + + $actions = array(); + if ($data->isSuperUser()) { + $actions = array( + 'cancel' => array( + 'title' => $lang['strcancel'], + 'url' => "database.php?action=signal&signal=CANCEL&{$misc->href}&", + 'vars' => array('procpid' => 'procpid') + ), + 'kill' => array( + 'title' => $lang['strkill'], + 'url' => "database.php?action=signal&signal=KILL&{$misc->href}&", + 'vars' => array('procpid' => 'procpid') + ) + ); - // Remove actions where not supported - if (!$data->hasQueryKill()) unset($actions['kill']); - if (!$data->hasQueryCancel()) unset($actions['cancel']); + // Remove actions where not supported + if (!$data->hasQueryKill()) unset($actions['kill']); + if (!$data->hasQueryCancel()) unset($actions['cancel']); + } if (count($actions) == 0) unset($columns['actions']); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/display.php new/phpPgAdmin-5.0.4/display.php --- old/phpPgAdmin-5.0.3/display.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/display.php 2012-03-22 14:35:22.000000000 +0100 @@ -5,8 +5,7 @@ * tables, reports, arbitrary queries, etc. to avoid code duplication. * @param $query The SQL SELECT string to execute * @param $count The same SQL query, but only retrieves the count of the rows (AS total) - * @param $return_url The return URL - * @param $return_desc The return link name + * @param $return The return section * @param $page The current page * * $Id: display.php,v 1.68 2008/04/14 12:44:27 ioguix Exp $ @@ -32,7 +31,7 @@ if (is_array($_REQUEST['key'])) $key = $_REQUEST['key']; else - $key = unserialize($_REQUEST['key']); + $key = unserialize(urldecode($_REQUEST['key'])); if ($confirm) { $misc->printTrail($_REQUEST['subject']); @@ -143,15 +142,13 @@ echo "<input type=\"hidden\" name=\"query\" value=\"", htmlspecialchars($_REQUEST['query']), "\" />\n"; if (isset($_REQUEST['count'])) echo "<input type=\"hidden\" name=\"count\" value=\"", htmlspecialchars($_REQUEST['count']), "\" />\n"; - if (isset($_REQUEST['return_url'])) - echo "<input type=\"hidden\" name=\"return_url\" value=\"", htmlspecialchars($_REQUEST['return_url']), "\" />\n"; - if (isset($_REQUEST['return_desc'])) - echo "<input type=\"hidden\" name=\"return_desc\" value=\"", htmlspecialchars($_REQUEST['return_desc']), "\" />\n"; + if (isset($_REQUEST['return'])) + echo "<input type=\"hidden\" name=\"return\" value=\"", htmlspecialchars($_REQUEST['return']), "\" />\n"; echo "<input type=\"hidden\" name=\"page\" value=\"", htmlspecialchars($_REQUEST['page']), "\" />\n"; echo "<input type=\"hidden\" name=\"sortkey\" value=\"", htmlspecialchars($_REQUEST['sortkey']), "\" />\n"; echo "<input type=\"hidden\" name=\"sortdir\" value=\"", htmlspecialchars($_REQUEST['sortdir']), "\" />\n"; echo "<input type=\"hidden\" name=\"strings\" value=\"", htmlspecialchars($_REQUEST['strings']), "\" />\n"; - echo "<input type=\"hidden\" name=\"key\" value=\"", htmlspecialchars(serialize($key)), "\" />\n"; + echo "<input type=\"hidden\" name=\"key\" value=\"", htmlspecialchars(urlencode(serialize($key))), "\" />\n"; echo "<p>"; if (!$error) echo "<input type=\"submit\" name=\"save\" value=\"{$lang['strsave']}\" />\n"; echo "<input type=\"submit\" name=\"cancel\" value=\"{$lang['strcancel']}\" />\n"; @@ -171,7 +168,7 @@ if (!isset($_POST['nulls'])) $_POST['nulls'] = array(); $status = $data->editRow($_POST['table'], $_POST['values'], $_POST['nulls'], - $_POST['format'], $_POST['types'], unserialize($_POST['key'])); + $_POST['format'], $_POST['types'], $key); if ($status == 0) doBrowse($lang['strrowupdated']); elseif ($status == -2) @@ -206,21 +203,19 @@ echo "<input type=\"hidden\" name=\"query\" value=\"", htmlspecialchars($_REQUEST['query']), "\" />\n"; if (isset($_REQUEST['count'])) echo "<input type=\"hidden\" name=\"count\" value=\"", htmlspecialchars($_REQUEST['count']), "\" />\n"; - if (isset($_REQUEST['return_url'])) - echo "<input type=\"hidden\" name=\"return_url\" value=\"", htmlspecialchars($_REQUEST['return_url']), "\" />\n"; - if (isset($_REQUEST['return_desc'])) - echo "<input type=\"hidden\" name=\"return_desc\" value=\"", htmlspecialchars($_REQUEST['return_desc']), "\" />\n"; + if (isset($_REQUEST['return'])) + echo "<input type=\"hidden\" name=\"return\" value=\"", htmlspecialchars($_REQUEST['return']), "\" />\n"; echo "<input type=\"hidden\" name=\"page\" value=\"", htmlspecialchars($_REQUEST['page']), "\" />\n"; echo "<input type=\"hidden\" name=\"sortkey\" value=\"", htmlspecialchars($_REQUEST['sortkey']), "\" />\n"; echo "<input type=\"hidden\" name=\"sortdir\" value=\"", htmlspecialchars($_REQUEST['sortdir']), "\" />\n"; echo "<input type=\"hidden\" name=\"strings\" value=\"", htmlspecialchars($_REQUEST['strings']), "\" />\n"; - echo "<input type=\"hidden\" name=\"key\" value=\"", htmlspecialchars(serialize($_REQUEST['key'])), "\" />\n"; + echo "<input type=\"hidden\" name=\"key\" value=\"", htmlspecialchars(urlencode(serialize($_REQUEST['key']))), "\" />\n"; echo "<input type=\"submit\" name=\"yes\" value=\"{$lang['stryes']}\" />\n"; echo "<input type=\"submit\" name=\"no\" value=\"{$lang['strno']}\" />\n"; echo "</form>\n"; } else { - $status = $data->deleteRow($_POST['table'], unserialize($_POST['key'])); + $status = $data->deleteRow($_POST['table'], unserialize(urldecode($_POST['key']))); if ($status == 0) doBrowse($lang['strrowdeleted']); elseif ($status == -2) @@ -243,16 +238,7 @@ $constraints = $data->getConstraintsWithFields($_REQUEST['table']); if ($constraints->recordCount() > 0) { - /* build the common parts of the url for the FK */ - $fk_return_url = "{$misc->href}&subject=table&table=". urlencode($_REQUEST['table']); - if (isset($_REQUEST['page'])) $fk_return_url .= "&page=" . urlencode($_REQUEST['page']); - if (isset($_REQUEST['query'])) $fk_return_url .= "&query=" . urlencode($_REQUEST['query']); - if (isset($_REQUEST['search_path'])) $fk_return_url .= "&search_path=" . urlencode($_REQUEST['search_path']); - - /* yes, we double urlencode fk_return_url so parameters here don't - * overwrite real one when included in the final url */ - $fkey_information['common_url'] = $misc->getHREF('schema') .'&subject=table&return_url=display.php?' - . urlencode($fk_return_url) .'&return_desc='. urlencode($lang['strback']); + $fkey_information['common_url'] = $misc->getHREF('schema') .'&subject=table'; /* build the FK constraints data structure */ while (!$constraints->EOF) { @@ -492,8 +478,7 @@ if (isset($_REQUEST['query'])) $gets .= "&query=" . urlencode($_REQUEST['query']); if (isset($_REQUEST['report'])) $gets .= "&report=" . urlencode($_REQUEST['report']); if (isset($_REQUEST['count'])) $gets .= "&count=" . urlencode($_REQUEST['count']); - if (isset($_REQUEST['return_url'])) $gets .= "&return_url=" . urlencode($_REQUEST['return_url']); - if (isset($_REQUEST['return_desc'])) $gets .= "&return_desc=" . urlencode($_REQUEST['return_desc']); + if (isset($_REQUEST['return'])) $gets .= "&return=" . urlencode($_REQUEST['return']); if (isset($_REQUEST['search_path'])) $gets .= "&search_path=" . urlencode($_REQUEST['search_path']); if (isset($_REQUEST['table'])) $gets .= "&table=" . urlencode($_REQUEST['table']); @@ -577,8 +562,12 @@ echo "<ul class=\"navlink\">\n"; // Return - if (isset($_REQUEST['return_url']) && isset($_REQUEST['return_desc'])) - echo "\t<li><a href=\"". htmlspecialchars($_REQUEST['return_url']) ."\">". htmlspecialchars($_REQUEST['return_desc']) ."</a></li>\n"; + if (isset($_REQUEST['return'])) { + $return_url = $misc->getHREFSubject($_REQUEST['return']); + + if ($return_url) + echo "\t<li><a href=\"{$return_url}\">{$lang['strback']}</a></li>\n"; + } // Edit SQL link if (isset($_REQUEST['query'])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/functions.php new/phpPgAdmin-5.0.4/functions.php --- old/phpPgAdmin-5.0.3/functions.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/functions.php 2012-03-22 14:35:22.000000000 +0100 @@ -41,8 +41,7 @@ // and reload the browser frame. if (!empty($_POST['formFuncSchema']) && ($_POST['formFuncSchema'] != $_POST['original_schema'])) { // Jump them to the new function schema - $_REQUEST['schema'] = $_POST['formFuncSchema']; - $misc->href = "server={$_REQUEST['server']}&database={$_REQUEST['database']}&schema={$_REQUEST['schema']}"; + $misc->setCurrentSchema($_POST['formFuncSchema']); // Force a browser reload $_reload_browser = true; } @@ -774,14 +773,12 @@ 'function' => array( 'title' => $lang['strfunction'], 'field' => field('proproto'), - 'type' => 'verbatim', 'url' => "redirect.php?subject=function&action=properties&{$misc->href}&", 'vars' => array('function' => 'proproto', 'function_oid' => 'prooid'), ), 'returns' => array( 'title' => $lang['strreturns'], 'field' => field('proreturns'), - 'type' => 'verbatim', ), 'owner' => array( 'title' => $lang['strowner'], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/history.php new/phpPgAdmin-5.0.4/history.php --- old/phpPgAdmin-5.0.3/history.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/history.php 2012-03-22 14:35:22.000000000 +0100 @@ -53,8 +53,8 @@ $actions = array( 'run' => array( 'title' => $lang['strexecute'], - 'url' => "sql.php?{$misc->href}&nohistory=t&", - 'vars' => array('query' => 'query', 'paginate' => 'paginate'), + 'url' => "sql.php?{$misc->href}&nohistory=t&subject=history&", + 'vars' => array('queryid' => 'queryid', 'paginate' => 'paginate'), 'target' => 'detail', ), 'remove' => array( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/lang/french.php new/phpPgAdmin-5.0.4/lang/french.php --- old/phpPgAdmin-5.0.3/lang/french.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/lang/french.php 2012-03-22 14:35:22.000000000 +0100 @@ -144,7 +144,7 @@ $lang['strunselectall'] = 'Des�lectionner tout'; $lang['strlocale'] = 'Locale'; $lang['strcollation'] = 'Tri'; - $lang['strctype'] = 'Type de cartact�re'; + $lang['strctype'] = 'Type de caract�re'; $lang['strdefaultvalues'] = 'Valeurs par d�faut'; $lang['strnewvalues'] = 'Nouvelles valeurs'; $lang['strstart'] = 'D�marrer'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/lang/recoded/french.php new/phpPgAdmin-5.0.4/lang/recoded/french.php --- old/phpPgAdmin-5.0.3/lang/recoded/french.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/lang/recoded/french.php 2012-03-22 14:35:22.000000000 +0100 @@ -144,7 +144,7 @@ $lang['strunselectall'] = 'Desélectionner tout'; $lang['strlocale'] = 'Locale'; $lang['strcollation'] = 'Tri'; - $lang['strctype'] = 'Type de cartactère'; + $lang['strctype'] = 'Type de caractère'; $lang['strdefaultvalues'] = 'Valeurs par défaut'; $lang['strnewvalues'] = 'Nouvelles valeurs'; $lang['strstart'] = 'Démarrer'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/libraries/lib.inc.php new/phpPgAdmin-5.0.4/libraries/lib.inc.php --- old/phpPgAdmin-5.0.3/libraries/lib.inc.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/libraries/lib.inc.php 2012-03-22 14:35:22.000000000 +0100 @@ -16,7 +16,7 @@ $appName = 'phpPgAdmin'; // Application version - $appVersion = '5.0.3'; + $appVersion = '5.0.4'; // PostgreSQL and PHP minimum version $postgresqlMinVer = '7.4'; @@ -249,7 +249,7 @@ // Load Slony if required - if ($_server_info['slony_support']) { + if (isset($_server_info['slony_support'])) { include('./classes/plugins/Slony.php'); $slony = new Slony(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/privileges.php new/phpPgAdmin-5.0.4/privileges.php --- old/phpPgAdmin-5.0.3/privileges.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/privileges.php 2012-03-22 14:35:22.000000000 +0100 @@ -236,7 +236,7 @@ $alltxt = $lang["strshowall{$_REQUEST['subject']}s"]; break; case 'schema': - $allurl = "database.php"; + $allurl = "schemas.php"; $alltxt = $lang["strshowallschemas"]; break; case 'database': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/reports.php new/phpPgAdmin-5.0.4/reports.php --- old/phpPgAdmin-5.0.3/reports.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/reports.php 2012-03-22 14:35:22.000000000 +0100 @@ -275,12 +275,10 @@ ), ); - $return_url = urlencode("reports.php?{$misc->href}"); - $actions = array( 'run' => array( 'title' => $lang['strexecute'], - 'url' => "sql.php?subject=report&{$misc->href}&return_url={$return_url}&return_desc=".urlencode($lang['strback'])."&", + 'url' => "sql.php?subject=report&{$misc->href}&return=report&", 'vars' => array('report' => 'report_name', 'database' => 'db_name', 'reportid' => 'report_id', 'paginate' => 'paginate'), ), 'edit' => array( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/schemas.php new/phpPgAdmin-5.0.4/schemas.php --- old/phpPgAdmin-5.0.3/schemas.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/schemas.php 2012-03-22 14:35:22.000000000 +0100 @@ -192,7 +192,7 @@ echo "\t<tr>\n"; echo "\t\t<th class=\"data\">{$lang['strcomment']}</th>\n"; - echo "\t\t<td class=\"data1\"><textarea cols=\"32\" rows=\"3\"name=\"comment\">", htmlspecialchars($_POST['comment']), "</textarea></td>\n"; + echo "\t\t<td class=\"data1\"><textarea cols=\"32\" rows=\"3\" name=\"comment\">", htmlspecialchars($_POST['comment']), "</textarea></td>\n"; echo "\t</tr>\n"; echo "</table>\n"; echo "<p><input type=\"hidden\" name=\"action\" value=\"alter\" />\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/sql.php new/phpPgAdmin-5.0.4/sql.php --- old/phpPgAdmin-5.0.3/sql.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/sql.php 2012-03-22 14:35:22.000000000 +0100 @@ -80,10 +80,15 @@ $report = $reportsdb->getReport($_REQUEST['reportid']); $_SESSION['sqlquery'] = $report->fields['report_sql']; } + elseif (isset($_REQUEST['subject']) && $_REQUEST['subject'] == 'history') { + // Or maybe we came from the history popup + $_SESSION['sqlquery'] = $_SESSION['history'][$_REQUEST['server']][$_REQUEST['database']][$_GET['queryid']]['query']; + } elseif (isset($_POST['query'])) { // Or maybe we came from an sql form $_SESSION['sqlquery'] = $_POST['query']; - } else { + } + else { echo "could not find the query!!"; } @@ -194,8 +199,10 @@ echo "<ul class=\"navlink\">\n"; // Return - if (isset($_REQUEST['return_url']) && isset($_REQUEST['return_desc'])) - echo "\t<li><a href=\"{$_REQUEST['return_url']}\">{$_REQUEST['return_desc']}</a></li>\n"; + if (isset($_REQUEST['return'])) { + $return_url = $misc->getHREFSubject($_REQUEST['return']); + echo "\t<li><a href=\"{$return_url}\">{$lang['strback']}</a></li>\n"; + } // Edit echo "\t<li><a href=\"database.php?database=", urlencode($_REQUEST['database']), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/tables.php new/phpPgAdmin-5.0.4/tables.php --- old/phpPgAdmin-5.0.3/tables.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/tables.php 2012-03-22 14:35:22.000000000 +0100 @@ -438,8 +438,7 @@ $query = $data->getSelectSQL($_REQUEST['table'], array_keys($_POST['show']), $_POST['values'], $_POST['ops']); $_REQUEST['query'] = $query; - $_REQUEST['return_url'] = "tables.php?action=confselectrows&{$misc->href}&table={$_REQUEST['table']}"; - $_REQUEST['return_desc'] = $lang['strback']; + $_REQUEST['return'] = 'selectrows'; $_no_output = true; include('./display.php'); @@ -772,7 +771,7 @@ ), 'browse' => array( 'title' => $lang['strbrowse'], - 'url' => "display.php?{$misc->href}&subject=table&return_url=".urlencode("tables.php?{$misc->href}")."&return_desc=".urlencode($lang['strback'])."&", + 'url' => "display.php?{$misc->href}&subject=table&return=schema&", 'vars' => array('table' => 'relname'), ), 'select' => array( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/tblproperties.php new/phpPgAdmin-5.0.4/tblproperties.php --- old/phpPgAdmin-5.0.3/tblproperties.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/tblproperties.php 2012-03-22 14:35:22.000000000 +0100 @@ -541,12 +541,10 @@ return $str; } - $return_url = urlencode("tblproperties.php?{$misc->href}&table=". urlencode($_REQUEST['table'])); - $actions = array( 'browse' => array( 'title' => $lang['strbrowse'], - 'url' => "display.php?{$misc->href}&subject=column&return_url={$return_url}&table=".urlencode($_REQUEST['table'])."&return_desc=" . urlencode($lang['strback']) . '&', + 'url' => "display.php?{$misc->href}&subject=column&return=table&table=".urlencode($_REQUEST['table']).'&', 'vars' => array('column' => 'attname'), ), 'alter' => array( @@ -569,8 +567,7 @@ $misc->printTable($attrs, $columns, $actions, null, 'attPre'); echo "<ul class=\"navlink\">\n"; - echo "\t<li><a href=\"display.php?{$misc->href}&table=", urlencode($_REQUEST['table']), "&subject=table&return_url={$return_url}&return_desc=", - urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n"; + echo "\t<li><a href=\"display.php?{$misc->href}&table=", urlencode($_REQUEST['table']), "&subject=table&return=table\">{$lang['strbrowse']}</a></li>\n"; echo "\t<li><a href=\"tables.php?action=confselectrows&{$misc->href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strselect']}</a></li>\n"; echo "\t<li><a href=\"tables.php?action=confinsertrow&{$misc->href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strinsert']}</a></li>\n"; echo "\t<li><a href=\"tables.php?action=confirm_empty&{$misc->href}&table=", urlencode($_REQUEST['table']),"\">{$lang['strempty']}</a></li>\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/viewproperties.php new/phpPgAdmin-5.0.4/viewproperties.php --- old/phpPgAdmin-5.0.3/viewproperties.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/viewproperties.php 2012-03-22 14:35:22.000000000 +0100 @@ -431,9 +431,7 @@ echo "<br />\n"; echo "<ul class=\"navlink\">\n"; - $return_url = urlencode("viewproperties.php?{$misc->href}&view=" . urlencode($_REQUEST['view'])); - echo "\t<li><a href=\"display.php?{$misc->href}&view=", urlencode($_REQUEST['view']), "&subject=view&return_url={$return_url}&return_desc=", - urlencode($lang['strback']), "\">{$lang['strbrowse']}</a></li>\n"; + echo "\t<li><a href=\"display.php?{$misc->href}&view=", urlencode($_REQUEST['view']), "&subject=view&return=view\">{$lang['strbrowse']}</a></li>\n"; echo "\t<li><a href=\"views.php?action=confselectrows&{$misc->href}&view=", urlencode($_REQUEST['view']),"\">{$lang['strselect']}</a></li>\n"; echo "\t<li><a href=\"views.php?action=confirm_drop&{$misc->href}&view=", urlencode($_REQUEST['view']),"\">{$lang['strdrop']}</a></li>\n"; echo "\t<li><a href=\"viewproperties.php?action=confirm_alter&{$misc->href}&view=", urlencode($_REQUEST['view']),"\">{$lang['stralter']}</a></li>\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/phpPgAdmin-5.0.3/views.php new/phpPgAdmin-5.0.4/views.php --- old/phpPgAdmin-5.0.3/views.php 2011-10-03 09:37:22.000000000 +0200 +++ new/phpPgAdmin-5.0.4/views.php 2012-03-22 14:35:22.000000000 +0100 @@ -109,12 +109,10 @@ else { // Generate query SQL $query = $data->getSelectSQL($_REQUEST['view'], array_keys($_POST['show']), - $_POST['values'], $_POST['ops']); + $_POST['values'], $_POST['ops']); $_REQUEST['query'] = $query; - $_REQUEST['return_url'] = "views.php?action=confselectrows&{$misc->href}&view=". urlencode($_REQUEST['view']); - $_REQUEST['return_desc'] = $lang['strback']; - - $_no_output = true; + $_REQUEST['return'] = "schema"; + $_no_output = true; include('./display.php'); exit; } @@ -588,7 +586,7 @@ ), 'browse' => array( 'title' => $lang['strbrowse'], - 'url' => "display.php?{$misc->href}&subject=view&return_url=".urlencode("views.php?{$misc->href}")."&return_desc=".urlencode($lang['strback'])."&", + 'url' => "display.php?{$misc->href}&subject=view&return=schema&", 'vars' => array('view' => 'relname'), ), 'select' => array( -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nss-myhostname for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package nss-myhostname for openSUSE:Factory checked in at 2012-03-30 14:20:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nss-myhostname (Old) and /work/SRC/openSUSE:Factory/.nss-myhostname.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nss-myhostname", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/nss-myhostname/nss-myhostname.changes 2011-09-23 02:14:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nss-myhostname.new/nss-myhostname.changes 2012-03-30 14:20:02.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Mar 29 13:21:33 UTC 2012 - aj(a)suse.de + +- Use addFilter for rpmlintrc. + +------------------------------------------------------------------- +Tue Mar 27 13:37:18 UTC 2012 - aj(a)suse.de + +- Add autoconf as build require. + +------------------------------------------------------------------- +Fri Dec 2 16:01:53 UTC 2011 - coolo(a)suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss-myhostname.spec ++++++ --- /var/tmp/diff_new_pack.s1zFYe/_old 2012-03-30 14:20:03.000000000 +0200 +++ /var/tmp/diff_new_pack.s1zFYe/_new 2012-03-30 14:20:03.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nss-myhostname # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,17 +14,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 Name: nss-myhostname Summary: Plugin for local system host name resolution +License: LGPL-2.1+ +Group: System/Libraries Version: 0.3 -Release: 1 -License: LGPLv2+ +Release: 0 +BuildRequires: autoconf +BuildRequires: automake Url: http://0pointer.de/lennart/projects/nss-myhostname/ -Group: System/Libraries Source: http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-%{version… Source1: nss-myhostname-config Patch0: 0001-optionally-warn-if-nss-myhostname-is-called.diff ++++++ nss-myhostname.rpmlintrc ++++++ --- /var/tmp/diff_new_pack.s1zFYe/_old 2012-03-30 14:20:03.000000000 +0200 +++ /var/tmp/diff_new_pack.s1zFYe/_new 2012-03-30 14:20:03.000000000 +0200 @@ -1,2 +1,2 @@ # TODO: clarify if shlib policy applies to nss plugins -setBadness("shlib-policy-name-error", 0) +addFilter ("shlib-policy-name-error") -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit nfacct for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package nfacct for openSUSE:Factory checked in at 2012-03-30 14:19:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nfacct (Old) and /work/SRC/openSUSE:Factory/.nfacct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nfacct", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/nfacct/nfacct.changes 2012-03-22 12:36:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nfacct.new/nfacct.changes 2012-03-30 14:19:56.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Mar 27 14:11:18 UTC 2012 - jengelh(a)medozas.de + +- Update to new upstream release 1.0.0 +* add support for XML output + +------------------------------------------------------------------- Old: ---- nfacct-1.0.0.tar.xz New: ---- nfacct-1.0.0.tar.bz2 nfacct-1.0.0.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nfacct.spec ++++++ --- /var/tmp/diff_new_pack.bVn5jC/_old 2012-03-30 14:20:02.000000000 +0200 +++ /var/tmp/diff_new_pack.bVn5jC/_new 2012-03-30 14:20:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package nfacct # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,6 +14,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: nfacct Version: 1.0.0 Release: 0 @@ -23,12 +25,16 @@ #Git-Web: http://git.netfilter.org/ #Git-Clone: git://git.netfilter.org/nfacct -Source: %name-%version.tar.xz -URL: http://netfilter.org/ +Source: %name-%version.tar.bz2 +Source2: %name-%version.tar.bz2.sig +Url: http://netfilter.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf, automake >= 1.6, libtool, pkgconfig >= 0.23 -BuildRequires: pkgconfig(libmnl) >= 1, pkgconfig(libnetfilter_acct) >= 1.0.0 -BuildRequires: xz +BuildRequires: autoconf +BuildRequires: automake >= 1.6 +BuildRequires: libtool +BuildRequires: pkgconfig >= 0.21 +BuildRequires: pkgconfig(libmnl) >= 1 +BuildRequires: pkgconfig(libnetfilter_acct) >= 1.0.0 %description This utility allows you to manipulate the extended accounting @@ -36,10 +42,10 @@ %prep %if 0%{?__xz:1} -%setup -qn %name +%setup -q %else -tar -xf "%{S:0}" --use=xz; -%setup -DTqn %name +tar -xf "%{S:0}" --use=bzip2; +%setup -DTq %endif %build ++++++ nfacct-1.0.0.tar.xz -> nfacct-1.0.0.tar.bz2 ++++++ ++++ 42027 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 mkinitrd for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-03-30 14:19:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mkinitrd", Maintainer is "MMarek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-03-29 07:45:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-03-30 14:19:44.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Mar 28 20:35:35 UTC 2012 - rschweikert(a)suse.com + +- add patches mkinitrd_cpbin_follow_link.patch and + mkinitrd_simplify_netsetup.patch; pull requests 6 & 7 in gitorious + - setup-prepare: cp_bin() needs to follow links + - setup-network: move loop independent operation outside the loop + +------------------------------------------------------------------- New: ---- mkinitrd_cpbin_follow_link.patch mkinitrd_simplify_netsetup.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.pNi40j/_old 2012-03-30 14:19:47.000000000 +0200 +++ /var/tmp/diff_new_pack.pNi40j/_new 2012-03-30 14:19:47.000000000 +0200 @@ -51,6 +51,8 @@ # don't change it in the build service without sending the author a # pull request or patch first. Otherwise, you risk that your changes will be # silently overwritten by the next submission. +Patch0: mkinitrd_cpbin_follow_link.patch +Patch1: mkinitrd_simplify_netsetup.patch Url: http://gitorious.org/opensuse/mkinitrd %description @@ -81,6 +83,8 @@ %prep %setup +%patch0 +%patch1 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd_cpbin_follow_link.patch ++++++ --- scripts/setup-prepare.sh.orig +++ scripts/setup-prepare.sh @@ -23,23 +23,57 @@ ## # Install a binary file +cp_link() { + # Copy the target of the given link $1 to the destination $2 + # spaces and special characters in file names will break things + if [ -h "$1" ]; then + lnkTarget=$(readlink $1) + if [ -e $lnkTarget ];then + cp -a $lnkTarget $2/$lnkTarget + else + # This link points to something in the same directory + lnkSrc="$1" + # Get the base bath of the link origin + lnkSrcBase=${lnkSrc%/*} + cp -a $lnkSrcBase/$lnkTarget $2/$lnkSrcBase/$lnkTarget + fi + return 1 + fi + return 0 +} + cp_bin() { cp -a "$@" \ || exit_code=1 - # Remember the binaries installed. We need the list for checking - # for dynamic libraries. - while [ $# -gt 1 ]; do - initrd_bins[${#initrd_bins[@]}]=$1 - shift - done - # file may print '^setuid ELF ...' - # suid mount will fail if mkinitrd was called as user - if [ -L "$1" ]; then - : do nothing with symlinks - elif [ -d "$1" -o -f "$1" ]; then - find "$1" -type f -print0 | xargs -0 chmod 0755 - fi + if [ -h "$1" ]; then + lnkTarget=$1 + # Determine the base bath of the target + targetPath="$2" + targetBase=${targetPath%$1*} + while [ 1 ]; do + cp_link $lnkTarget $targetBase + lnkCopied=$? + if [ $lnkCopied = 0 ]; then + if [ -e $lnkTarget ]; then + initrd_bins[${#initrd_bins[@]}]=$lnkTarget + fi + break + fi + done + else + # Remember the binaries installed. We need the list for checking + # for dynamic libraries. + while [ $# -gt 1 ]; do + initrd_bins[${#initrd_bins[@]}]=$1 + shift + done + # file may print '^setuid ELF ...' + # suid mount will fail if mkinitrd was called as user + if [ -d "$1" -o -f "$1" ]; then + find "$1" -type f -print0 | xargs -0 chmod 0755 + fi + fi } # check if we should use script or feature $1 ++++++ mkinitrd_simplify_netsetup.patch ++++++ --- scripts/setup-network.sh.orig +++ scripts/setup-network.sh @@ -306,18 +306,14 @@ for f in /{lib,etc}/udev/rules.d/77-netw continue fi cp --parents "$f" $tmp_mnt/ - cp_bin /sbin/ifup $tmp_mnt/sbin/ifup - mkdir -p $tmp_mnt/etc/alternatives - for bin in /bin/{g,}awk /etc/alternatives/awk; do - if test -e $bin; then - cp_bin $bin $tmp_mnt/$bin - fi - done - cp_bin /bin/grep $tmp_mnt/bin/grep - cp_bin /bin/logger $tmp_mnt/bin/logger - cp_bin /bin/touch $tmp_mnt/bin/touch - break done +# awk points to alternatives, need the directory +mkdir -p $tmp_mnt/etc/alternatives +cp_bin /bin/awk $tmp_mnt/bin/awk +cp_bin /bin/grep $tmp_mnt/bin/grep +cp_bin /sbin/ifup $tmp_mnt/sbin/ifup +cp_bin /bin/logger $tmp_mnt/bin/logger +cp_bin /bin/touch $tmp_mnt/bin/touch test -n "$static_interfaces" && verbose "[NETWORK]\tstatic: $static_interfaces" test -n "$dhcp_interfaces" && verbose "[NETWORK]\tdynamic: $dhcp_interfaces" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit liferea for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package liferea for openSUSE:Factory checked in at 2012-03-30 14:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liferea (Old) and /work/SRC/openSUSE:Factory/.liferea.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "liferea", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/liferea/liferea.changes 2012-03-26 15:37:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liferea.new/liferea.changes 2012-03-30 14:19:35.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Mar 28 16:42:41 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.8.4: + + Improve DB item counting statements. + + Change OpenStreetMap rendering from osmarender to mapnik. + + Reimplemented search folder rule for item with enclosures. + + Reimplemented search folder rule for item categories. + + sf#3480238: crashes when double clicking find + + deb#660602: Item pane may be reset during feed update +- Add liferea-missing-include.patch: add missing include to fix + build. + +------------------------------------------------------------------- Old: ---- liferea-1.8.3.tar.gz New: ---- liferea-1.8.4.tar.gz liferea-missing-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liferea.spec ++++++ --- /var/tmp/diff_new_pack.rtjShG/_old 2012-03-30 14:19:37.000000000 +0200 +++ /var/tmp/diff_new_pack.rtjShG/_new 2012-03-30 14:19:37.000000000 +0200 @@ -17,15 +17,17 @@ Name: liferea -Version: 1.8.3 +Version: 1.8.4 Release: 0 Summary: Linux Feed Reader License: GPL-2.0+ Group: Productivity/Other Url: http://liferea.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/liferea/Liferea%20Stable/1.8.3/%{n… +Source: http://downloads.sourceforge.net/project/liferea/Liferea%20Stable/1.8.4/%{n… # PATCH-FEATURE-OPENSUSE liferea-opensuse-feeds.patch -- Add openSUSE feeds to default feeds Patch0: liferea-opensuse-feeds.patch +# PATCH-FIX-UPSTREAM liferea-missing-include.patch vuntz(a)opensuse.org -- Add missing include (sent upstream by mail, vuntz -- 2012-03-12) +Patch1: liferea-missing-include.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool @@ -60,6 +62,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build %configure \ ++++++ liferea-1.8.3.tar.gz -> liferea-1.8.4.tar.gz ++++++ ++++ 72541 lines of diff (skipped) ++++++ liferea-missing-include.patch ++++++ Index: liferea-1.8.4/src/rule.c =================================================================== --- liferea-1.8.4.orig/src/rule.c +++ liferea-1.8.4/src/rule.c @@ -24,6 +24,7 @@ #include "common.h" #include "debug.h" +#include "metadata.h" #define ITEM_MATCH_RULE_ID "exact" #define ITEM_TITLE_MATCH_RULE_ID "exact_title" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kimtoy for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package kimtoy for openSUSE:Factory checked in at 2012-03-30 14:19:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kimtoy (Old) and /work/SRC/openSUSE:Factory/.kimtoy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kimtoy", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kimtoy/kimtoy.changes 2012-03-20 11:29:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kimtoy.new/kimtoy.changes 2012-03-30 14:19:27.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Mar 30 00:28:05 UTC 2012 - i(a)marguerite.su + +- Update version 1.6 + * statusbar will not overlap fullscreen application + * fix scim-kconfig symbol name so to be loaded correctly + * rewrite scim-panel using dbus-c++ + * fix the issue that scim panel freezes after quit + * add trayicon bar mode + * disable statusbar theme and property widget meanwhile + * fix a rare crash in loading theme + * update libpng-apng copy to 1.5.9 + +------------------------------------------------------------------- Old: ---- kimtoy-1.5.tar.bz2 New: ---- kimtoy-1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kimtoy.spec ++++++ --- /var/tmp/diff_new_pack.IIXhUv/_old 2012-03-30 14:19:28.000000000 +0200 +++ /var/tmp/diff_new_pack.IIXhUv/_new 2012-03-30 14:19:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: kimtoy -Version: 1.5 +Version: 1.6 Release: 1 Summary: An input method frontend for KDE. It is an alternative to kimpanel Url: http://kde-apps.org/content/show.php/KIMToy?content=140967 ++++++ kimtoy-1.5.tar.bz2 -> kimtoy-1.6.tar.bz2 ++++++ ++++ 14848 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 kdebindings3 for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package kdebindings3 for openSUSE:Factory checked in at 2012-03-30 14:19:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebindings3 (Old) and /work/SRC/openSUSE:Factory/.kdebindings3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebindings3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebindings3/kdebindings3-java.changes 2011-10-06 16:30:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebindings3.new/kdebindings3-java.changes 2012-03-30 14:19:25.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 29 00:42:44 UTC 2012 - anixx(a)opensuse.org + +- move man pages to /opt/kde3/share/man + +------------------------------------------------------------------- kdebindings3-javascript.changes: same change kdebindings3.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings3-java.spec ++++++ --- /var/tmp/diff_new_pack.FE4o5y/_old 2012-03-30 14:19:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FE4o5y/_new 2012-03-30 14:19:27.000000000 +0200 @@ -22,6 +22,7 @@ %define is_base 0 %define is_java 1 %define is_js 0 +%define _mandir /opt/kde3/share/man BuildRequires: gcc-java java-devel kdemultimedia3-devel kdepim3 %if %suse_version > 1020 BuildRequires: unzip ++++++ kdebindings3-javascript.spec ++++++ --- /var/tmp/diff_new_pack.FE4o5y/_old 2012-03-30 14:19:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FE4o5y/_new 2012-03-30 14:19:27.000000000 +0200 @@ -13,15 +13,12 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - Name: kdebindings3-javascript %define is_base 0 %define is_java 0 %define is_js 1 +%define _mandir /opt/kde3/share/man BuildRequires: kdemultimedia3-devel kdepim3 %if %suse_version > 1020 BuildRequires: unzip @@ -54,12 +51,6 @@ sandbox,where they havebhave access to all files, as every other application does. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %if %{is_base} %package perl @@ -96,12 +87,6 @@ sandbox,where they havebhave access to all files, as every other application does. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %endif %prep @@ -167,9 +152,6 @@ %suse_update_desktop_file -u embedjs Development %endif -%clean -rm -rf ${RPM_BUILD_ROOT} - %post %run_ldconfig @@ -235,7 +217,7 @@ /opt/kde3/share/apps/kjsembed /opt/kde3/share/appl*/*/embedjs.desktop /opt/kde3/share/services/qprocess_plugin.desktop -%_mandir/man1/kjscmd.1.gz +%_mandir/man1/kjscmd.1 /opt/kde3/%_lib/kde3/libjsconsoleplugin.* /opt/kde3/share/applications/kde/kjscmd.desktop /opt/kde3/share/apps/kate ++++++ kdebindings3.spec ++++++ --- /var/tmp/diff_new_pack.FE4o5y/_old 2012-03-30 14:19:27.000000000 +0200 +++ /var/tmp/diff_new_pack.FE4o5y/_new 2012-03-30 14:19:27.000000000 +0200 @@ -13,19 +13,14 @@ # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - -# norootforbuild - Name: kdebindings3 %define is_base 1 %define is_java 0 %define is_js 0 +%define _mandir /opt/kde3/share/man BuildRequires: kdemultimedia3-devel kdepim3 ruby-devel -%if %suse_version > 1020 BuildRequires: unzip -%endif %if %suse_version >= 1130 #BuildRequires: python-devel %endif @@ -53,12 +48,6 @@ This package contains generator applications for creating bindings for specific languages from Qt and KDE header files. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %if %{is_base} %package perl @@ -70,12 +59,6 @@ %description perl A Perl module for making DCOP calls from Perl code. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %package ruby License: GPL-2.0 and LGPL-2.1+ Summary: Ruby Bindings for Qt and KDE Libraries @@ -85,12 +68,6 @@ This package contains the needed environment for writing Qt applications in Ruby. - - -Authors: --------- - The KDE Team <kde(a)kde.org> - %endif %if %{is_js} @@ -169,9 +146,8 @@ %suse_update_desktop_file -u kjscmd Development %suse_update_desktop_file -u embedjs Development %endif - -%clean -rm -rf ${RPM_BUILD_ROOT} +install -d ${RPM_BUILD_ROOT}/%_mandir/man3 +mv ${RPM_BUILD_ROOT}/usr/share/man/man3/DCOP.3pm ${RPM_BUILD_ROOT}/%_mandir/man3 %post %run_ldconfig @@ -194,7 +170,8 @@ %{perl_vendorarch}/DCOP/Object.pm %{perl_vendorarch}/auto/DCOP/DCOP.bs %{perl_vendorarch}/auto/DCOP/DCOP.so -%{_mandir}/man3/DCOP.3pm.gz +%{_mandir}/man3/DCOP.3pm +%dir %{_mandir}/man3 %if %suse_version < 1140 %{perl_vendorarch}/auto/DCOP/.packlist /var/adm/perl-modules/kdebindings3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kbiff for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package kbiff for openSUSE:Factory checked in at 2012-03-30 14:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kbiff (Old) and /work/SRC/openSUSE:Factory/.kbiff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kbiff", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kbiff/kbiff.changes 2011-09-23 02:04:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kbiff.new/kbiff.changes 2012-03-30 14:19:10.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Mar 29 12:55:02 UTC 2012 - anixx(a)opensuse.org + +- move manpages to /opt + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kbiff.spec ++++++ --- /var/tmp/diff_new_pack.pg0JdN/_old 2012-03-30 14:19:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pg0JdN/_new 2012-03-30 14:19:12.000000000 +0200 @@ -15,11 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Url: http://kbiff.granroth.org/ Name: kbiff +%define _mandir /opt/kde3/share/man BuildRequires: kdelibs3-devel License: LGPL-2.1+ Group: Productivity/Networking/Email/Utilities -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit empathy for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at 2012-03-30 14:18:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/empathy (Old) and /work/SRC/openSUSE:Factory/.empathy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "empathy", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/empathy/empathy.changes 2012-02-20 16:08:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.empathy.new/empathy.changes 2012-03-30 14:19:08.000000000 +0200 @@ -1,0 +2,98 @@ +Mon Mar 26 15:23:35 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.4.0: + + Bugs fixed: bgo#672504, bgo#672506, bgo#672508, bgo#672596, + bgo#672608, bgo#672633, bgo#672828. + + Updated translations. + +------------------------------------------------------------------- +Mon Mar 26 07:32:37 UTC 2012 - vuntz(a)opensuse.org + +- Remove hack to find localized help: this has been fixed in + find-lang.sh. + +------------------------------------------------------------------- +Tue Mar 20 16:50:13 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.92: + + Bugs fixed: bgo#616159, bgo#671035, bgo#671547, bgo#671644, + bgo#671718, bgo#671720, bgo#671790, bgo#671875, bgo#671884, + bgo#671914, bgo#671931, bgo#671981, bgo#671983, bgo#671994, + bgo#672036, bgo#672037, bgo#672063, bgo#672120. + + Updated translations. +- Remove sed hacks from %prep to use libchamplain 0.12 instead of + libchamplain 0.13/0.14: the dependency moved back to 0.12. + +------------------------------------------------------------------- +Tue Mar 6 18:54:56 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.91: + + bgo#661515: Wrong date is shown in chat window + + bgo#671447: Make running empathy components without + installing them simpler + + bgo#671452: Avoid XMPP accounts to have a negative priority + + Updated translations. + +------------------------------------------------------------------- +Fri Mar 2 19:24:49 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.90.2: + + Optionally brings back empathy-av + + Bugs fixed: + + bgo#656676: Use new documentation infrastructure + + bgo#671061, Debug: Clear doesn't work for the All option + + Upudated translations. + +------------------------------------------------------------------- +Mon Feb 27 10:51:59 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 3.3.90.1: + + Fixed a bunch of memory leaks in the new call window. + + Build fixes. + + Bugs fixed: bgo#670638. + + Updated translations. +- Drop empathy-farstream.patch: fixed upstream. +- Change itstool BuildRequires to yelp-tools: this is really what + is needed for build. +- Add sed hacks in %prep to use libchamplain 0.12 instead of + libchamplain 0.13/0.14: there's no release for libchamplain + 0.13/0.14 yet, so it makes no sense to try to use it. +- Manually list the translated help documents as %find_lang needs + to support the new XDG help system first. + +------------------------------------------------------------------- +Tue Feb 21 20:37:31 UTC 2012 - dimstar(a)opensuse.org + +- Update to version 3.3.90: + + New call UI, based on Clutter and Farstream. + + Stop using telepathy-butterfly and now rely on telepathy-haze + to connect to MSN. Accounts should be automatically migrated + with the next telepathy-mission-control release (5.11.0). + + Rely on gnome-contacts to display contacts' details and link + contacts together. + + Remove accounts assistant and integrate its features into the + accounts dialog. + + Add ability in debug window to display the logs from all the + components together and to upload them easily to pastebin. + + Bugs fixed: bgo#629902, bgo#659683, bgo#652669, bgo#592994, + bgo#627658, bgo#632739, bgo#646654, bgo#655101, bgo#656097, + bgo#658724, bgo#663627, bgo#663829, bgo#664045, bgo#668985, + bgo#669482, bgo#669559, bgo#669578, bgo#669655, bgo#669676, + bgo#669695, bgo#669712, bgo#669823, bgo#670201, bgo#670203. +- Replace gnome-doc-utils-devel BuildRequires with itstool, + following upstream changes regarding help implementation. +- Changed BuildRequires following upstream changes related to new + call UI: + + Remove pkgconfig(telepathy-farsight). + + Add pkgconfig(clutter-gst-1.0), pkgconfig(farstream-0.1), + pkgconfig(telepathy-farstream). +- Add gnome-contacts Requires, so contacts can be displayed. +- Remove telepathy-butterfly Recommends, as telepathy-haze is now + used for MSN connections. Note that we already have a + telepathy-haze Recommends. +- Remove --disable-scrollkeeper from configure call: it is not + known anymore. +- Add empathy-farstream.patch: Replace final farsight includes with + respective farstream includes. + +------------------------------------------------------------------- Old: ---- empathy-3.3.5.tar.xz New: ---- empathy-3.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.KbRu72/_old 2012-03-30 14:19:09.000000000 +0200 +++ /var/tmp/diff_new_pack.KbRu72/_new 2012-03-30 14:19:09.000000000 +0200 @@ -17,35 +17,36 @@ Name: empathy -Version: 3.3.5 +Version: 3.4.0 Release: 0 -# FIXME: add telepathy-fastream BuildRequires when upstream is happy with it (ie, not experimental anymore) Summary: Instant Messenger Client for GNOME, based on Telepathy License: GPL-2.0+ Group: Productivity/Networking/Instant Messenger Url: http://live.gnome.org/Empathy -Source: http://download.gnome.org/sources/empathy/3.3/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/empathy/3.4/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRequires: fdupes -BuildRequires: gnome-doc-utils-devel BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: yelp-tools BuildRequires: pkgconfig(champlain-gtk-0.12) >= 0.12.1 BuildRequires: pkgconfig(cheese-gtk) -BuildRequires: pkgconfig(clutter-1.0) >= 1.7.14 -BuildRequires: pkgconfig(clutter-gtk-1.0) +BuildRequires: pkgconfig(clutter-1.0) >= 1.8.0 +BuildRequires: pkgconfig(clutter-gst-1.0) >= 1.5.2 +BuildRequires: pkgconfig(clutter-gtk-1.0) >= 0.90.3 BuildRequires: pkgconfig(enchant) +BuildRequires: pkgconfig(farstream-0.1) BuildRequires: pkgconfig(folks-telepathy) >= 0.6.6 BuildRequires: pkgconfig(gcr-3) -BuildRequires: pkgconfig(geoclue) +BuildRequires: pkgconfig(geoclue) >= 0.12 BuildRequires: pkgconfig(geocode-glib) BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(goa-1.0) >= 3.3.0 BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gstreamer-0.10) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.2 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.6 BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) @@ -57,10 +58,13 @@ BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(mission-control-plugins) BuildRequires: pkgconfig(nautilus-sendto) -BuildRequires: pkgconfig(telepathy-farsight) >= 0.0.14 -BuildRequires: pkgconfig(telepathy-glib) >= 0.17.3 +BuildRequires: pkgconfig(telepathy-farstream) >= 0.2.1 +BuildRequires: pkgconfig(telepathy-glib) >= 0.17.5 BuildRequires: pkgconfig(telepathy-logger-0.2) >= 0.2.10 BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.3.13 +# Not strictly required but empathy now relies on gnome-contacts to +# display contacts' details and link contacts together. +Requires: gnome-contacts Requires: iso-codes Requires: telepathy-gabble Requires: telepathy-logger @@ -68,7 +72,6 @@ Requires: telepathy-salut Recommends: %{name}-lang Recommends: geoclue -Recommends: telepathy-butterfly Recommends: telepathy-haze Recommends: telepathy-idle # The applets and the libraries have been removed @@ -121,7 +124,6 @@ %build %configure --disable-static \ --with-pic \ - --disable-scrollkeeper \ --enable-goa make %{?_smp_mflags} V=1 @@ -160,10 +162,7 @@ %files %defattr(-,root,root) %doc README TODO -%dir %{_datadir}/gnome/ -%dir %{_datadir}/gnome/help/ -%dir %{_datadir}/gnome/help/%{name}/ -%doc %{_datadir}/gnome/help/%{name}/C/ +%doc %{_datadir}/help/C/%{name}/ %{_bindir}/empathy %{_bindir}/empathy-accounts %{_bindir}/empathy-debugger @@ -176,7 +175,7 @@ %{_datadir}/glib-2.0/schemas/org.gnome.Empathy.gschema.xml %{_datadir}/telepathy/clients/*.client %{_libexecdir}/empathy-auth-client -%{_libexecdir}/empathy-av +%{_libexecdir}/empathy-call %{_libexecdir}/empathy-chat %{_mandir}/man1/empathy.1%{?ext_man} %{_mandir}/man1/empathy-accounts.1%{?ext_man} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit dee for openSUSE:Factory
by root＠hilbert.suse.de 30 Mar '12

30 Mar '12

Hello community, here is the log from the commit of package dee for openSUSE:Factory checked in at 2012-03-30 14:18:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dee (Old) and /work/SRC/openSUSE:Factory/.dee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dee", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dee/dee.changes 2012-03-26 15:36:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dee.new/dee.changes 2012-03-30 14:19:05.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 28 12:21:00 UTC 2012 - vuntz(a)opensuse.org + +- Update to version 1.0.8: + + Bug fixes: lp#956882, lp#959458. + +------------------------------------------------------------------- Old: ---- dee-1.0.6.tar.gz New: ---- dee-1.0.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dee.spec ++++++ --- /var/tmp/diff_new_pack.SZlP6z/_old 2012-03-30 14:19:07.000000000 +0200 +++ /var/tmp/diff_new_pack.SZlP6z/_new 2012-03-30 14:19:07.000000000 +0200 @@ -19,7 +19,7 @@ %define soname 1_0-4 Name: dee -Version: 1.0.6 +Version: 1.0.8 Release: 0 Summary: Library that uses DBus to provide objects License: LGPL-3.0 ++++++ dee-1.0.6.tar.gz -> dee-1.0.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/configure new/dee-1.0.8/configure --- old/dee-1.0.6/configure 2012-03-12 09:20:55.000000000 +0100 +++ new/dee-1.0.8/configure 2012-03-23 12:41:00.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for dee 1.0.6. +# Generated by GNU Autoconf 2.68 for dee 1.0.8. # # Report bugs to <https://bugs.launchpad.net/dee>. # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='dee' PACKAGE_TARNAME='dee' -PACKAGE_VERSION='1.0.6' -PACKAGE_STRING='dee 1.0.6' +PACKAGE_VERSION='1.0.8' +PACKAGE_STRING='dee 1.0.8' PACKAGE_BUGREPORT='https://bugs.launchpad.net/dee' PACKAGE_URL='' @@ -1378,7 +1378,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dee 1.0.6 to adapt to many kinds of systems. +\`configure' configures dee 1.0.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dee 1.0.6:";; + short | recursive ) echo "Configuration of dee 1.0.8:";; esac cat <<\_ACEOF @@ -1581,7 +1581,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dee configure 1.0.6 +dee configure 1.0.8 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1950,7 +1950,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dee $as_me 1.0.6, which was +It was created by dee $as_me 1.0.8, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2774,7 +2774,7 @@ # Define the identity of the package. PACKAGE='dee' - VERSION='1.0.6' + VERSION='1.0.8' cat >>confdefs.h <<_ACEOF @@ -3031,8 +3031,8 @@ DEE_MAJOR_VERSION=1 DEE_MINOR_VERSION=0 -DEE_MICRO_VERSION=6 -DEE_VERSION=1.0.6 +DEE_MICRO_VERSION=8 +DEE_VERSION=1.0.8 @@ -13866,7 +13866,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dee $as_me 1.0.6, which was +This file was extended by dee $as_me 1.0.8, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13932,7 +13932,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dee config.status 1.0.6 +dee config.status 1.0.8 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -16298,7 +16298,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dee $as_me 1.0.6, which was +This file was extended by dee $as_me 1.0.8, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16364,7 +16364,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dee config.status 1.0.6 +dee config.status 1.0.8 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/configure.ac new/dee-1.0.8/configure.ac --- old/dee-1.0.6/configure.ac 2012-03-12 09:20:37.000000000 +0100 +++ new/dee-1.0.8/configure.ac 2012-03-23 12:40:33.000000000 +0100 @@ -5,7 +5,7 @@ # Don't forget that this changes also GIR version, and requires rebuilding vapi m4_define([dee_major], [1]) m4_define([dee_minor], [0]) -m4_define([dee_micro], [6]) +m4_define([dee_micro], [8]) m4_define([dee_api], [dee_major.dee_minor]) m4_define([dee_version], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/src/dee-model.h new/dee-1.0.8/src/dee-model.h --- old/dee-1.0.6/src/dee-model.h 2012-02-21 11:48:30.000000000 +0100 +++ new/dee-1.0.8/src/dee-model.h 2012-03-19 12:08:56.000000000 +0100 @@ -64,8 +64,8 @@ /** * DeeCompareRowFunc: - * @row1: The model being indexed - * @row2: The row to extract terms for + * @row1: (array): The model being indexed + * @row2: (array): The row to extract terms for * @user_data: (closure): User data to pass to comparison function * * Compares @row1 and @row2. Mainly used with dee_model_insert_sorted() and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/src/dee-tree-index.c new/dee-1.0.8/src/dee-tree-index.c --- old/dee-1.0.6/src/dee-tree-index.c 2012-03-01 16:15:45.000000000 +0100 +++ new/dee-1.0.8/src/dee-tree-index.c 2012-03-16 12:44:56.000000000 +0100 @@ -119,10 +119,12 @@ static GSequenceIter* find_term (GSequence *terms, const gchar *term, + const gchar *col_key, DeeAnalyzer *analyzer); static GSequenceIter* find_term_real (GSequence *terms, const gchar *term, + const gchar *col_key, DeeAnalyzer *analyzer, DeeTermMatchFlag flags); /* @@ -214,14 +216,16 @@ /* Search priv->terms for a string from priv->term_list. * ! Doesn't work for strings not in priv->term_list ! */ static GSequenceIter* -find_term (GSequence *terms, const gchar *term, DeeAnalyzer *analyzer) +find_term (GSequence *terms, const gchar *term, const gchar *col_key, + DeeAnalyzer *analyzer) { - return find_term_real (terms, term, analyzer, DEE_TERM_MATCH_EXACT); + return find_term_real (terms, term, col_key, analyzer, DEE_TERM_MATCH_EXACT); } static GSequenceIter* find_term_real (GSequence *terms, const gchar *term, + const gchar *col_key, DeeAnalyzer *analyzer, DeeTermMatchFlag flags) { @@ -235,7 +239,7 @@ if (begin == end) return NULL; - search_term.col_key = term; + search_term.col_key = col_key; if (flags & DEE_TERM_MATCH_EXACT) { @@ -259,14 +263,14 @@ { previous = g_sequence_iter_prev (previous); term_result = g_sequence_get (previous); - if (g_str_has_prefix (term_result->col_key, term)) iter = previous; + if (g_str_has_prefix (term_result->term, term)) iter = previous; else break; } if (iter == found_iter) { /* We never checked this one */ term_result = g_sequence_get (iter); - if (g_str_has_prefix (term_result->col_key, term)) + if (g_str_has_prefix (term_result->term, term)) return iter; } else @@ -421,14 +425,16 @@ priv = DEE_TREE_INDEX (self)->priv; analyzer = dee_index_get_analyzer (self); col_key = dee_analyzer_collate_key (analyzer, term); - term_iter = find_term_real (priv->terms, col_key, analyzer, flags); + term_iter = find_term_real (priv->terms, term, col_key, analyzer, flags); g_free (col_key); if (term_iter == NULL || term_iter == g_sequence_get_end_iter (priv->terms)) - return dee_glist_result_set_new (NULL, /* The empty GList */ - dee_index_get_model (self), - NULL); + { + return dee_glist_result_set_new (NULL, /* The empty GList */ + dee_index_get_model (self), + NULL); + } if (flags & DEE_TERM_MATCH_EXACT) { @@ -446,7 +452,8 @@ end = g_sequence_get_end_iter (priv->terms); term_data = g_sequence_get (term_iter); - while (g_str_has_prefix (term_data->col_key, term)) + /* We can't use collation keys for prefix matching */ + while (g_str_has_prefix (term_data->term, term)) { GList *rows = term_rows (term_data); iter = rows; @@ -503,9 +510,11 @@ { DeeTreeIndexPrivate *priv; DeeModel *model; + DeeAnalyzer *analyzer; DeeResultSet *results; GSequenceIter *iter, *end; Term *term_data; + gchar *col_key; g_return_if_fail (DEE_IS_TREE_INDEX (self)); g_return_if_fail (func != NULL); @@ -517,8 +526,10 @@ iter = g_sequence_get_begin_iter (priv->terms); else { - iter = find_term (priv->terms, start_term, // FIXME: col key? - dee_index_get_analyzer (self)); + analyzer = dee_index_get_analyzer (self); + col_key = dee_analyzer_collate_key (analyzer, start_term); + iter = find_term (priv->terms, start_term, col_key, analyzer); + g_free (col_key); if (iter == NULL || iter == g_sequence_get_end_iter (priv->terms)) return; @@ -568,13 +579,16 @@ Term *term_data; GSequenceIter *term_iter; DeeAnalyzer *analyzer; + gchar *col_key; g_return_val_if_fail (DEE_IS_TREE_INDEX (self), 0); g_return_val_if_fail (term != NULL, 0); priv = DEE_TREE_INDEX (self)->priv; analyzer = dee_index_get_analyzer (self); - term_iter = find_term (priv->terms, term, analyzer); // FIXME: col key? + col_key = dee_analyzer_collate_key (analyzer, term); + term_iter = find_term (priv->terms, term, col_key, analyzer); + g_free (col_key); if (term_iter == NULL || term_iter == g_sequence_get_end_iter (priv->terms)) @@ -641,7 +655,7 @@ term = dee_term_list_get_term (priv->term_list, i); /* Update priv->terms */ - term_iter = find_term (priv->terms, colkey, analyzer); + term_iter = find_term (priv->terms, term, colkey, analyzer); if (term_iter == NULL || term_iter == g_sequence_get_end_iter (priv->terms)) @@ -698,7 +712,8 @@ if (term_n_rows (term_data) == 0) { /* Removing the term from the sequence also frees it */ - term_iter = find_term (priv->terms, term_data->col_key, analyzer); + term_iter = find_term (priv->terms, term_data->term, + term_data->col_key, analyzer); g_sequence_remove (term_iter); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/tests/test-dee.c new/dee-1.0.8/tests/test-dee.c --- old/dee-1.0.6/tests/test-dee.c 2012-01-26 13:46:35.000000000 +0100 +++ new/dee-1.0.8/tests/test-dee.c 2012-03-16 11:52:18.000000000 +0100 @@ -20,6 +20,7 @@ #include "config.h" #include <glib.h> #include <glib-object.h> +#include <locale.h> void test_model_column_create_suite (void); void test_model_complex_column_create_suite (void); @@ -54,6 +55,7 @@ g_thread_init (NULL); g_test_init (&argc, &argv, NULL); + setlocale (LC_ALL, ""); test_model_column_create_suite (); test_model_complex_column_create_suite (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dee-1.0.6/vapi/dee-1.0.vapi new/dee-1.0.8/vapi/dee-1.0.vapi --- old/dee-1.0.6/vapi/dee-1.0.vapi 2012-03-12 09:21:15.000000000 +0100 +++ new/dee-1.0.8/vapi/dee-1.0.vapi 2012-03-23 12:41:25.000000000 +0100 @@ -341,7 +341,7 @@ [CCode (cheader_filename = "dee.h", instance_pos = 1.9)] public delegate string CollatorFunc (string input); [CCode (cheader_filename = "dee.h", instance_pos = 2.9)] - public delegate int CompareRowFunc (GLib.Variant row1, GLib.Variant row2); + public delegate int CompareRowFunc ([CCode (array_length = false)] GLib.Variant[] row1, [CCode (array_length = false)] GLib.Variant[] row2); [CCode (cheader_filename = "dee.h", instance_pos = 2.9)] public delegate void FilterMapFunc (Dee.Model orig_model, Dee.FilterModel filter_model); [CCode (cheader_filename = "dee.h", instance_pos = 3.9)] -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0