From de58e5d6f6366a3886c5aa51909f38cd83ebe376b1fc0a86963dc5dfd163cb77 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Wed, 23 May 2018 10:06:27 +0000 Subject: [PATCH] Accepting request 611525 from home:alarrosa:branches:X11:common:Factory - Update to version 20180510 (1.1.3): * bump version, prep for 1.1.3 release * xdg-open: use pcmanfm only if it is available (BR106161) * Add Deepin Desktop Environment support. * Avoid argument injection vulnerability in open_envvar() (CVE-2017-18266, boo#1093086) * xdg-settings: check_browser is broken under kde when just the binary is specified (BR106343) * xdg-open: Fixes LXQt behavior * xdg-mime awk script syntax error (BR104298) * Spelling fixes (BR103255) * xdg-mime.1: Add missing period * Fix tests for 1f8e58d51e6fb3f50f59ed2d8265f2f346ac68e6 - Drop fix-kde-browser-check.patch which is already included upstream OBS-URL: https://build.opensuse.org/request/show/611525 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/xdg-utils?expand=0&rev=63 --- _servicedata | 2 +- fix-kde-browser-check.patch | 49 ------------------------------------- xdg-utils-20170508.tar.xz | 3 --- xdg-utils-20180510.tar.xz | 3 +++ xdg-utils.changes | 20 +++++++++++++++ xdg-utils.spec | 5 ++-- 6 files changed, 26 insertions(+), 56 deletions(-) delete mode 100644 fix-kde-browser-check.patch delete mode 100644 xdg-utils-20170508.tar.xz create mode 100644 xdg-utils-20180510.tar.xz diff --git a/_servicedata b/_servicedata index 79e1754..0475fde 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://anongit.freedesktop.org/xdg/xdg-utils - fb9ee8c69932feb716ad4db793a7941dd06b345c \ No newline at end of file + 159fc37075db2decf446f453fe1a796da6921aad \ No newline at end of file diff --git a/fix-kde-browser-check.patch b/fix-kde-browser-check.patch deleted file mode 100644 index 72a56fb..0000000 --- a/fix-kde-browser-check.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: xdg-utils-20160610/scripts/xdg-settings.in -=================================================================== ---- xdg-utils-20160610.orig/scripts/xdg-settings.in -+++ xdg-utils-20160610/scripts/xdg-settings.in -@@ -226,6 +226,14 @@ check_browser_kde() - fi - browser="`read_kde_browser`" - binary="`resolve_kde_browser`" -+ -+ # The browser may contain a relative entry to the binary starting with ! -+ if [ x"!" == x"${browser:0:1}" ]; then -+ # get the full path -+ browser="`binary_to_desktop_file ${browser:1}`" -+ binary="`desktop_file_to_binary $browser`" -+ fi -+ - # Because KDE will use the handler for MIME type text/html if this value - # is empty, we allow either the empty string or a match to $check here. - if [ x"$binary" != x -a x"$binary" != x"$check" ]; then -@@ -575,16 +583,23 @@ check_url_scheme_handler_kde() - fi - if [ x"$1" = "mailto" ]; then - binary="`read_kde_config emaildefaults PROFILE_Default EmailClient`" -+ # The field may contain a relative entry to the binary starting with ! -+ if [ x"!" == x"${binary:0:1}" ]; then -+ # get the full path -+ desktop_file="`binary_to_desktop_file ${binary:1}`" -+ binary="`desktop_file_to_binary $desktop_file`" -+ fi -+ if [ x"$binary" != x"$check" ]; then -+ echo no -+ exit_success -+ fi -+ else -+ handler="`get_browser_mime x-scheme-handler/$1`" -+ binary="`desktop_file_to_binary "$handler"`" - if [ x"$binary" != x"$check" ]; then - echo no - exit_success - fi -- fi -- handler="`get_browser_mime x-scheme-handler/$1`" -- binary="`desktop_file_to_binary "$handler"`" -- if [ x"$binary" != x"$check" ]; then -- echo no -- exit_success - fi - echo yes - exit_success diff --git a/xdg-utils-20170508.tar.xz b/xdg-utils-20170508.tar.xz deleted file mode 100644 index 34760d2..0000000 --- a/xdg-utils-20170508.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:033f6ef83305e2baf8ec969150c0fe63b2435e63b9f74558dd0234a2c5374c66 -size 269336 diff --git a/xdg-utils-20180510.tar.xz b/xdg-utils-20180510.tar.xz new file mode 100644 index 0000000..91ad477 --- /dev/null +++ b/xdg-utils-20180510.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d8527598ee63e1b5a2fdd569f16ee15934756a84cb6d551a1e02b21c8bc46c1 +size 269664 diff --git a/xdg-utils.changes b/xdg-utils.changes index e0fe71e..176d48e 100644 --- a/xdg-utils.changes +++ b/xdg-utils.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed May 23 09:17:31 UTC 2018 - alarrosa@suse.com + +- Update to version 20180510 (1.1.3): + * bump version, prep for 1.1.3 release + * xdg-open: use pcmanfm only if it is available (BR106161) + * Add Deepin Desktop Environment support. + * Avoid argument injection vulnerability in open_envvar() (CVE-2017-18266, + boo#1093086) + * xdg-settings: check_browser is broken under kde when just the binary + is specified (BR106343) + * xdg-open: Fixes LXQt behavior + * xdg-mime awk script syntax error (BR104298) + * Spelling fixes (BR103255) + * xdg-mime.1: Add missing period + * Fix tests for 1f8e58d51e6fb3f50f59ed2d8265f2f346ac68e6 + +- Drop fix-kde-browser-check.patch which is already included upstream + +------------------------------------------------------------------- Tue May 1 05:28:49 UTC 2018 - sflees@suse.de - boo#1051353 can't set default browser on kde. diff --git a/xdg-utils.spec b/xdg-utils.spec index e9e1efc..bb02928 100644 --- a/xdg-utils.spec +++ b/xdg-utils.spec @@ -1,7 +1,7 @@ # # spec file for package xdg-utils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xdg-utils -Version: 20170508 +Version: 20180510 Release: 0 Summary: Utilities to uniformly interface desktop environments License: MIT @@ -31,7 +31,6 @@ Patch0: install-some-more-scripts.diff Patch1: xdg-terminal-fix-gsettings.patch # PATCH-FIX-UPSTREAM xdg-terminal-fix-terminal--x-arg.patch fdo#93231 sor.alexei@meowr.ru -- https://bugs.freedesktop.org/show_bug.cgi?id=93231#c5 Patch3: xdg-terminal-fix-terminal--x-arg.patch -Patch4: fix-kde-browser-check.patch BuildRequires: make # for xmlto to be able to generate text from html BuildRequires: w3m