Hello community, here is the log from the commit of package xdg-utils for openSUSE:Factory checked in at 2013-05-27 10:10:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdg-utils (Old) and /work/SRC/openSUSE:Factory/.xdg-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdg-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/xdg-utils/xdg-utils.changes 2012-09-25 14:18:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdg-utils.new/xdg-utils.changes 2013-05-27 10:10:44.000000000 +0200 @@ -1,0 +2,8 @@ +Mon May 20 11:57:03 UTC 2013 - jsl...@suse.com + +- update to 20121008 + * xdg-mime does not search mimeinfo.cache (BR31629) +- xdg-open-be-more-paranoid-in-escaping.patch: xdg-open: be more + paranoid in escaping (bnc#811959) + +------------------------------------------------------------------- Old: ---- xdg-utils-20120916.tar.xz New: ---- xdg-open-be-more-paranoid-in-escaping.patch xdg-utils-20121008.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdg-utils.spec ++++++ --- /var/tmp/diff_new_pack.PRjjHq/_old 2013-05-27 10:10:45.000000000 +0200 +++ /var/tmp/diff_new_pack.PRjjHq/_new 2013-05-27 10:10:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xdg-utils # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -25,7 +25,7 @@ Summary: Utilities to uniformly interface desktop environments License: MIT Group: System/GUI/Other -Version: 20120916 +Version: 20121008 Release: 0 BuildArch: noarch Url: http://portland.freedesktop.org/ @@ -33,6 +33,7 @@ # http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz Source0: xdg-utils-%{version}.tar.xz Patch0: install-some-more-scripts.diff +Patch1: xdg-open-be-more-paranoid-in-escaping.patch Patch8: xdg-screensaver-gnome-perl.diff Requires: perl Requires: perl-Net-DBus @@ -56,6 +57,7 @@ %prep %setup -q -n %name-%{version} %patch0 -p1 +%patch1 -p1 %patch8 -p1 %build ++++++ xdg-open-be-more-paranoid-in-escaping.patch ++++++ From: Jiri Slaby <jsl...@suse.cz> Date: Mon, 20 May 2013 13:53:04 +0200 Subject: xdg-open: be more paranoid in escaping Patch-mainline: not yet, submitted 2013/05/20 References: bnc#811959 When trying to open URLs like: http://www.google.com/search?hl=en&q=HTTP+'M-SEARCH * HTTP/1.1\r\n' we fail terribly in the generic case. \r and \n are replaced by line feed+CR, * is replaced by the contents of the current directory. So escape all those before used and expanded by sed. And also later when invoking. Signed-off-by: Jiri Slaby <jsl...@suse.cz> --- scripts/xdg-open.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in index eda1cfb..0934142 100644 --- a/scripts/xdg-open.in +++ b/scripts/xdg-open.in @@ -135,16 +135,16 @@ search_desktop_file() command="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | first_word`" command_exec=`which $command 2>/dev/null` arguments="`grep -E "^Exec(\[[^]=]*])?=" "$file" | cut -d= -f 2- | last_word`" - arg_one="`echo $arg | sed 's/&/\\\\&/g'`" - arguments_exec="`echo $arguments | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`" + arg_one="`echo "$arg" | sed 's/[&*\\]/\\\\&/g'`" + arguments_exec="`echo "$arguments" | sed -e 's*%[fFuU]*"'"$arg_one"'"*g'`" if [ -x "$command_exec" ] ; then - if echo $arguments | grep -iq '%[fFuU]' ; then - echo START $command_exec $arguments_exec - eval $command_exec $arguments_exec + if echo "$arguments" | grep -iq '%[fFuU]' ; then + echo START "$command_exec" "$arguments_exec" + eval "$command_exec" "$arguments_exec" else - echo START $command_exec $arguments_exec "$arg" - eval $command_exec $arguments_exec "$arg" + echo START "$command_exec" "$arguments_exec" "$arg" + eval "$command_exec" "$arguments_exec" "$arg" fi if [ $? -eq 0 ]; then -- 1.8.2.3 ++++++ xdg-utils-20120916.tar.xz -> xdg-utils-20121008.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20120916/ChangeLog new/xdg-utils-20121008/ChangeLog --- old/xdg-utils-20120916/ChangeLog 2012-09-24 13:51:02.000000000 +0200 +++ new/xdg-utils-20121008/ChangeLog 2013-05-20 13:51:09.000000000 +0200 @@ -1,5 +1,8 @@ === xdg-utils 1.1.x === +2012-10-08 Rex Dieter <rdie...@fedoraproject.org> + * xdg-mime does not search mimeinfo.cache (BR31629) + 2012-09-16 Rex Dieter <rdie...@fedoraproject.org> * recognize XDG_CURRENT_DESKTOP/DESKTOP_SESSION=MATE (BR54941) * xdg-su: use gnomesu for mate (BR54941) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xdg-utils-20120916/scripts/xdg-mime.in new/xdg-utils-20121008/scripts/xdg-mime.in --- old/xdg-utils-20120916/scripts/xdg-mime.in 2012-09-24 13:51:02.000000000 +0200 +++ new/xdg-utils-20121008/scripts/xdg-mime.in 2013-05-20 13:51:09.000000000 +0200 @@ -378,8 +378,8 @@ for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do for prefix in "$XDG_MENU_PREFIX" ""; do - DEBUG 2 "Checking $x/applications/${prefix}defaults.list" - trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1` + DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache" + trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1` if [ -n "$trader_result" ] ; then echo $trader_result exit_success -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
