Bug#958141: buster-pu: package xdg-utils/1.1.3-1
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Dear release managers,
There are a number of bugs fixed in the 1.1.3-2 version of the xdg-utils
package that now is available in testing and unstable archives. It would
be good to have the fixes in buster also.
If you think these changes are okay for stable update, please consider
to sponsor upload to stable-proposed-updates. The packaging repository
can be found at [1], there is an upload to mentors.d.n [2].
[1]: https://salsa.debian.org/freedesktop-team/xdg-utils/-/tree/buster
[2]: https://mentors.debian.net/package/xdg-utils
-- System Information:
Debian Release: buster/sid
APT prefers eoan-updates
APT policy: (500, 'eoan-updates'), (500, 'eoan-security'), (500, 'eoan')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.3.0-46-generic (SMP w/4 CPU cores)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8), LANGUAGE=ru (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru xdg-utils-1.1.3/debian/changelog xdg-utils-1.1.3/debian/changelog
--- xdg-utils-1.1.3/debian/changelog 2018-05-20 01:18:48.000000000 +0300
+++ xdg-utils-1.1.3/debian/changelog 2020-04-18 22:57:30.000000000 +0300
@@ -1,3 +1,23 @@
+xdg-utils (1.1.3-1+deb10u1) buster; urgency=medium
+
+ [ Rex Dieter ]
+ * xdg-open: Do better pcmanfm check, fix AND operator. Closes: #908760,
+ Upstream: BR106636, BR106161.
+
+ [ Iain Lane ]
+ * xdg-screensaver: Sanitise window name before sending it over D-Bus.
+ Closes: #910070, LP: #1743216, Upstream: BR108121.
+
+ [ Andrea Tarocchi ]
+ * xdg-open: correct handling directories with spaces in the name.
+ LP: #1848335, Upstream: #166.
+
+ [ Nicholas Guriev ]
+ * xdg-mime: Create config directory if it does not exist yet.
+ Closes: #652038.
+
+ -- Nicholas Guriev <guriev-ns@ya.ru> Sat, 18 Apr 2020 22:57:30 +0300
+
xdg-utils (1.1.3-1) unstable; urgency=medium
* New upstream release.
diff -Nru xdg-utils-1.1.3/debian/patches/debian-changes xdg-utils-1.1.3/debian/patches/debian-changes
--- xdg-utils-1.1.3/debian/patches/debian-changes 2018-05-20 01:18:48.000000000 +0300
+++ xdg-utils-1.1.3/debian/patches/debian-changes 2020-04-18 22:57:30.000000000 +0300
@@ -62,8 +62,36 @@
if echo "$client" | grep -Eq 'thunderbird|icedove'; then
run_thunderbird "$client" "$1"
+--- xdg-utils-1.1.3.orig/scripts/xdg-mime.in
++++ xdg-utils-1.1.3/scripts/xdg-mime.in
+@@ -247,6 +247,7 @@ make_default_generic()
+ default_file="$xdg_config_home/mimeapps.list"
+ DEBUG 2 "make_default_generic $1 $2"
+ DEBUG 1 "Updating $default_file"
++ [ -d "$xdg_config_home" ] || mkdir -p "$xdg_config_home"
+ [ -f "$default_file" ] || touch "$default_file"
+ awk -v mimetype="$2" -v application="$1" '
+ BEGIN {
+@@ -305,7 +306,7 @@ search_desktop_file()
+
+ grep -l "$MIME;" "$dir/"*.desktop 2>/dev/null
+
+- for f in $dir/*/; do
++ for f in "$dir/"*/; do
+ [ -d "$f" ] && search_desktop_file "$MIME" "$f"
+ done
+ }
--- xdg-utils-1.1.3.orig/scripts/xdg-open.in
+++ xdg-utils-1.1.3/scripts/xdg-open.in
+@@ -327,7 +327,7 @@ search_desktop_file()
+ fi
+ fi
+
+- for d in $dir/*/; do
++ for d in "$dir/"*/; do
+ [ -d "$d" ] && search_desktop_file "$default" "$d" "$target"
+ done
+ }
@@ -366,13 +366,9 @@ open_generic_xdg_x_scheme_handler()
fi
}
@@ -99,3 +127,33 @@
fi
if [ $? -eq 0 ]; then
+@@ -451,7 +450,7 @@ open_lxde()
+ {
+
+ # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
+- if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
++ if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
+ local file="$(file_url_to_path "$1")"
+
+ # handle relative paths
+--- xdg-utils-1.1.3.orig/scripts/xdg-screensaver.in
++++ xdg-utils-1.1.3/scripts/xdg-screensaver.in
+@@ -468,6 +468,7 @@ screensaver_gnome_screensaver()
+ perl -e '
+ use strict;
+ use warnings;
++use Encode qw(decode);
+ use IO::File;
+ use Net::DBus;
+ use X11::Protocol;
+@@ -489,6 +490,10 @@ while (1) {
+ }
+ }
+
++# Replace any invalid unicode characters with U+FFFD, so we dont crash when we
++# pass them over to D-Bus
++$window_name = decode("utf8", $window_name, Encode::FB_DEFAULT);
++
+ # Inhibit idle detection (flags = 8) with window name and ID.
+ # We have no reason so just send the window name again.
+ my $bus = Net::DBus->session();
Reply to: