forked from pool/xdg-utils
Accepting request 213304 from home:jirislaby:branches:X11:common:Factory
update to 20131024 OBS-URL: https://build.opensuse.org/request/show/213304 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=30
This commit is contained in:
parent
73fbf171ee
commit
2326b00299
31
xdg-mime-generic-handle-filenames-with-colon.patch
Normal file
31
xdg-mime-generic-handle-filenames-with-colon.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From: Jiri Slaby <jslaby@suse.cz>
|
||||||
|
Date: Thu, 9 Jan 2014 14:11:18 +0100
|
||||||
|
Subject: xdg-mime: generic, handle filenames with colon
|
||||||
|
Patch-mainline: not yet, submitted on 9 Jan 2014
|
||||||
|
References: bnc#854777
|
||||||
|
|
||||||
|
When we use the generic path, we use cut to separate filename from
|
||||||
|
mime type from the output of /usr/bin/file. Let's use -b parameter of
|
||||||
|
/usr/bin/file and eliminate cut and sed completely.
|
||||||
|
|
||||||
|
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
|
||||||
|
---
|
||||||
|
scripts/xdg-mime.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
|
||||||
|
index 7669a3b93a9c..474dc5d4488e 100644
|
||||||
|
--- a/scripts/xdg-mime.in
|
||||||
|
+++ b/scripts/xdg-mime.in
|
||||||
|
@@ -98,7 +98,7 @@ info_generic()
|
||||||
|
mimetype -b "$1"
|
||||||
|
else
|
||||||
|
DEBUG 1 "Running file --mime-type \"$1\""
|
||||||
|
- /usr/bin/file --mime-type "$1" 2> /dev/null | cut -d ":" -f 2 | sed s/"^ "//
|
||||||
|
+ /usr/bin/file -b --mime-type "$1" 2> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
--
|
||||||
|
1.8.5.2
|
||||||
|
|
@ -1,50 +0,0 @@
|
|||||||
From: Jiri Slaby <jslaby@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 <jslaby@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
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:a9958811bc3b145b4e5cbbbd810d5784fe40faffb4ff3ed31f1d938c3e26d8b4
|
|
||||||
size 272688
|
|
3
xdg-utils-20131024.tar.xz
Normal file
3
xdg-utils-20131024.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:15db685c4e1f35fa9bba9b75194993c21c7f931c8daeb920d9ac1915452731b1
|
||||||
|
size 273228
|
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 9 13:54:09 UTC 2014 - jslaby@suse.com
|
||||||
|
|
||||||
|
- xdg-mime-generic-handle-filenames-with-colon.patch (bnc#854777)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 9 13:51:11 UTC 2014 - jslaby@suse.com
|
||||||
|
|
||||||
|
- update to 20131024
|
||||||
|
* xdg-desktop-menu: improperly check for vendor prefix ...
|
||||||
|
* xdg-screensaver: Support MATE desktop part 2
|
||||||
|
* xdg-desktop-menu: Unquoted file name (BR69399)
|
||||||
|
* xdg-open: Detect Enlightenment and make use of it
|
||||||
|
* xdg-open: be more paranoid in escaping
|
||||||
|
- xdg-open-be-more-paranoid-in-escaping.patch: remove
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 2 15:34:42 UTC 2013 - fcrozat@suse.com
|
Wed Oct 2 15:34:42 UTC 2013 - fcrozat@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xdg-utils
|
# spec file for package xdg-utils
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Name: xdg-utils
|
Name: xdg-utils
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: xmlto
|
BuildRequires: xmlto
|
||||||
@ -25,7 +26,7 @@ BuildRequires: w3m
|
|||||||
Summary: Utilities to uniformly interface desktop environments
|
Summary: Utilities to uniformly interface desktop environments
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: System/GUI/Other
|
Group: System/GUI/Other
|
||||||
Version: 20121008
|
Version: 20131024
|
||||||
Release: 0
|
Release: 0
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Url: http://portland.freedesktop.org/
|
Url: http://portland.freedesktop.org/
|
||||||
@ -33,7 +34,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz
|
# http://portland.freedesktop.org/download/xdg-utils-%%{version}.tgz
|
||||||
Source0: xdg-utils-%{version}.tar.xz
|
Source0: xdg-utils-%{version}.tar.xz
|
||||||
Patch0: install-some-more-scripts.diff
|
Patch0: install-some-more-scripts.diff
|
||||||
Patch1: xdg-open-be-more-paranoid-in-escaping.patch
|
Patch1: xdg-mime-generic-handle-filenames-with-colon.patch
|
||||||
Patch8: xdg-screensaver-gnome-perl.diff
|
Patch8: xdg-screensaver-gnome-perl.diff
|
||||||
Requires: perl
|
Requires: perl
|
||||||
Requires: perl-Net-DBus
|
Requires: perl-Net-DBus
|
||||||
|
Loading…
Reference in New Issue
Block a user