Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
6
.gitignore
vendored
6
.gitignore
vendored
@ -1 +1,5 @@
|
||||
SOURCES/xdg-utils-1.1.2.tar.gz
|
||||
/xdg-utils-1.1.3.tar.gz
|
||||
/xdg-utils-1.1.3.tar.gz.md5sum
|
||||
/xdg-utils-1.1.3.tar.gz.sha1sum
|
||||
/xdg-utils-21fb316bea83e3374eafc7fbf1e25a0ccdda92cb.tar.gz
|
||||
/xdg-utils-v1.2.0.tar.gz
|
||||
|
||||
@ -1 +0,0 @@
|
||||
20cd4cc5cfaa904b12abf6d584deb568367f4d83 SOURCES/xdg-utils-1.1.2.tar.gz
|
||||
@ -1,25 +0,0 @@
|
||||
From 233512d857379115736216392b048c753b5d04b5 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Mon, 8 May 2017 07:33:56 -0500
|
||||
Subject: [PATCH 1/8] bump version: 1.1.2+
|
||||
|
||||
---
|
||||
scripts/xdg-utils-common.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/xdg-utils-common.in b/scripts/xdg-utils-common.in
|
||||
index 160e3ca..8b85883 100644
|
||||
--- a/scripts/xdg-utils-common.in
|
||||
+++ b/scripts/xdg-utils-common.in
|
||||
@@ -245,7 +245,7 @@ check_common_commands()
|
||||
;;
|
||||
|
||||
--version)
|
||||
- echo "@NAME@ 1.1.2"
|
||||
+ echo "@NAME@ 1.1.2+"
|
||||
exit_success
|
||||
;;
|
||||
esac
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From fb9ee8c69932feb716ad4db793a7941dd06b345c Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@math.unl.edu>
|
||||
Date: Mon, 8 May 2017 07:34:29 -0500
|
||||
Subject: [PATCH 2/8] init 1.1.3 ChangeLog section
|
||||
|
||||
---
|
||||
ChangeLog | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 77e6cef..c819efb 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,4 +1,6 @@
|
||||
-=== xdg-utils 1.1.2 (unreleased) ===
|
||||
+=== xdg-utils 1.1.3 ===
|
||||
+
|
||||
+=== xdg-utils 1.1.2 ===
|
||||
|
||||
2017-02-28 Rex Dieter <rdieter@fedoraproject.org>
|
||||
* xdg-open: Add "chromium" to fallback browsers (BR99366)
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From afeedb5c932371482b4ffe7b5e98bc1d619f9594 Mon Sep 17 00:00:00 2001
|
||||
From: Nicholas Guriev <guriev-ns@ya.ru>
|
||||
Date: Sat, 30 Sep 2017 21:34:18 +0300
|
||||
Subject: [PATCH 3/8] Fix tests for 1f8e58d51e6fb3f50f59ed2d8265f2f346ac68e6
|
||||
|
||||
---
|
||||
autotests/t-xdg-mime-query-default.sh | 2 ++
|
||||
autotests/t-xdg-settings.sh | 4 ++++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/autotests/t-xdg-mime-query-default.sh b/autotests/t-xdg-mime-query-default.sh
|
||||
index 66bb8d7..a746b1d 100755
|
||||
--- a/autotests/t-xdg-mime-query-default.sh
|
||||
+++ b/autotests/t-xdg-mime-query-default.sh
|
||||
@@ -3,6 +3,8 @@ COMMAND_TESTED="xdg-mime query default"
|
||||
. ./test-lib.sh
|
||||
|
||||
test_that_it reads \$XDG_CONFIG_HOME/mimeapps.list
|
||||
+mock mosaic # Default app should exist
|
||||
+mock_desktop_file mosaic
|
||||
mock_default_app x-scheme-handler/http mosaic
|
||||
handler=$(run generic xdg-mime query default x-scheme-handler/http)
|
||||
assert_equal mosaic.desktop "$handler"
|
||||
diff --git a/autotests/t-xdg-settings.sh b/autotests/t-xdg-settings.sh
|
||||
index 7b697e4..b8255ab 100755
|
||||
--- a/autotests/t-xdg-settings.sh
|
||||
+++ b/autotests/t-xdg-settings.sh
|
||||
@@ -12,12 +12,16 @@ assert_run gconftool-2 --get /desktop/gnome/applications/browser/exec
|
||||
for de in gnome3 cinnamon lxde mate generic; do
|
||||
test_that_it determines default browser from \
|
||||
\$XDG_CONFIG_HOME/mimeapps.list in $de
|
||||
+ mock mosaic # Default app should exist
|
||||
+ mock_desktop_file mosaic
|
||||
mock_default_app x-scheme-handler/http mosaic
|
||||
assert_equal mosaic.desktop \
|
||||
"$(run $de xdg-settings get default-web-browser)"
|
||||
|
||||
test_that_it determines default URL handler from \
|
||||
\$XDG_CONFIG_HOME/mimeapps.list in $de
|
||||
+ mock footorrent # Default app should exist
|
||||
+ mock_desktop_file footorrent
|
||||
mock_default_app x-scheme-handler/magnet footorrent
|
||||
assert_equal \
|
||||
footorrent.desktop \
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From 186b6d7839ae8528d845c977fb680a46bd1c6123 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
|
||||
Date: Fri, 13 Oct 2017 11:40:05 +0300
|
||||
Subject: [PATCH 4/8] xdg-mime.1: Add missing period
|
||||
|
||||
---
|
||||
scripts/desc/xdg-mime.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/desc/xdg-mime.xml b/scripts/desc/xdg-mime.xml
|
||||
index 04d1e17..64bfc85 100644
|
||||
--- a/scripts/desc/xdg-mime.xml
|
||||
+++ b/scripts/desc/xdg-mime.xml
|
||||
@@ -119,7 +119,7 @@ and adding descriptions for new file types</refpurpose>
|
||||
</simpara>
|
||||
<simpara>
|
||||
<replaceable>application</replaceable> is the desktop file
|
||||
- id of the application and has the form vendor-name.desktop
|
||||
+ id of the application and has the form vendor-name.desktop.
|
||||
<replaceable>application</replaceable> must already be installed
|
||||
in the desktop menu before it can be made the default handler.
|
||||
The application's desktop file must list support for all the
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,209 +0,0 @@
|
||||
From fa5805559ad27382ef62110cb23e67d6eb649030 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@gmail.com>
|
||||
Date: Wed, 29 Nov 2017 14:07:24 -0600
|
||||
Subject: [PATCH 5/8] Spelling fixes (BR103255)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Credit to Ville Skyttä <ville.skytta@iki.fi>
|
||||
---
|
||||
ChangeLog | 4 ++--
|
||||
scripts/desc/xdg-settings.xml | 2 +-
|
||||
scripts/xdg-desktop-menu.in | 2 +-
|
||||
scripts/xdg-screensaver.in | 2 +-
|
||||
tests/README | 4 ++--
|
||||
tests/debug/t.extraout | 2 +-
|
||||
tests/debug/t.interactive | 2 +-
|
||||
tests/doc_gen.pl | 2 +-
|
||||
tests/include/testassertions.sh | 10 +++++-----
|
||||
tests/testrun | 2 +-
|
||||
10 files changed, 16 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index c819efb..292915f 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -541,7 +541,7 @@
|
||||
|
||||
2006-04-24 Kevin Krammer <kevin.krammer@gmx.at>
|
||||
* Applied patch provided by Benedikt Meurer <benedikt.meurer@unix-ag.uni-siegen.de>
|
||||
- to improve the compatability of the Makefile
|
||||
+ to improve the compatibility of the Makefile
|
||||
* Added --title option to xdg-file-dialog
|
||||
* Applied another path by Benedikt to let xdg-file-dialog use
|
||||
zenity on GNOME and XFCE
|
||||
@@ -564,7 +564,7 @@
|
||||
Currently only used in xdg-mime to gather feedback
|
||||
|
||||
2006-04-08 Kevin Krammer <kevin.krammer@gmx.at>
|
||||
- * In case of $BROWSER being not avialable or empty, try a fixed list of well
|
||||
+ * In case of $BROWSER being not available or empty, try a fixed list of well
|
||||
known browsers instead
|
||||
|
||||
2006-04-06 Kevin Krammer <kevin.krammer@gmx.at>
|
||||
diff --git a/scripts/desc/xdg-settings.xml b/scripts/desc/xdg-settings.xml
|
||||
index 56055b7..255d712 100644
|
||||
--- a/scripts/desc/xdg-settings.xml
|
||||
+++ b/scripts/desc/xdg-settings.xml
|
||||
@@ -114,7 +114,7 @@
|
||||
<refsect1 id="properties">
|
||||
<title>Properties</title>
|
||||
<para>
|
||||
- When using xdg-settings to get, check or set a destkop setting, properties
|
||||
+ When using xdg-settings to get, check or set a desktop setting, properties
|
||||
and possibly sub-properties are used to specify the setting to be changed.
|
||||
</para>
|
||||
<para>
|
||||
diff --git a/scripts/xdg-desktop-menu.in b/scripts/xdg-desktop-menu.in
|
||||
index 13159cb..9d837e1 100644
|
||||
--- a/scripts/xdg-desktop-menu.in
|
||||
+++ b/scripts/xdg-desktop-menu.in
|
||||
@@ -394,7 +394,7 @@ while [ $# -gt 0 ] ; do
|
||||
case "$parm" in
|
||||
*.directory)
|
||||
if [ -n "$desktop_files" ] ; then
|
||||
- exit_failure_syntax "'$parm' must preceed any *.desktop file"
|
||||
+ exit_failure_syntax "'$parm' must precede any *.desktop file"
|
||||
fi
|
||||
directory_files="$directory_files $parm"
|
||||
;;
|
||||
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
|
||||
index aecd8e3..9e68196 100644
|
||||
--- a/scripts/xdg-screensaver.in
|
||||
+++ b/scripts/xdg-screensaver.in
|
||||
@@ -583,7 +583,7 @@ screensaver_mate_screensaver()
|
||||
{
|
||||
# DBUS interface for mate-screensaver
|
||||
# This is same as gnome's for now but may change in the future as MATE
|
||||
-# does not follow gnome's developement necessarily.
|
||||
+# does not follow gnome's development necessarily.
|
||||
case "$1" in
|
||||
suspend)
|
||||
screensaver_suspend_loop \
|
||||
diff --git a/tests/README b/tests/README
|
||||
index 26469f2..8ebcfef 100644
|
||||
--- a/tests/README
|
||||
+++ b/tests/README
|
||||
@@ -18,7 +18,7 @@ NORESULT: test_system_mime_install
|
||||
See xdg-test.log for details.
|
||||
NOT OK!
|
||||
|
||||
-FAIL indicates (not suprisingly) a test failure.
|
||||
+FAIL indicates (not surprisingly) a test failure.
|
||||
NORESULT indicates that the test prerequisites failed for some reason.
|
||||
(e.g. the install phase of an uninstall test failed)
|
||||
UNTESTED means that something needed was not found. This is fine and should
|
||||
@@ -26,7 +26,7 @@ UNTESTED means that something needed was not found. This is fine and should
|
||||
(e.g. test requires root, but we are not running as root)
|
||||
|
||||
NOTE: The test runner makes guesses about appropriate values of XDG_TEST_DIR
|
||||
- and PATH. These values can be overriden explicitly.
|
||||
+ and PATH. These values can be overridden explicitly.
|
||||
|
||||
To run tests individually, or as smaller groups do something like
|
||||
|
||||
diff --git a/tests/debug/t.extraout b/tests/debug/t.extraout
|
||||
index ea84b33..4946673 100755
|
||||
--- a/tests/debug/t.extraout
|
||||
+++ b/tests/debug/t.extraout
|
||||
@@ -4,7 +4,7 @@
|
||||
. "$XDG_TEST_DIR/include/testcontrol.sh"
|
||||
|
||||
test_extraout() {
|
||||
-test_start "$FUNCNAME: verify functionallity of assert_nostdout"
|
||||
+test_start "$FUNCNAME: verify functionality of assert_nostdout"
|
||||
|
||||
test_procedure
|
||||
|
||||
diff --git a/tests/debug/t.interactive b/tests/debug/t.interactive
|
||||
index fa203c2..6f6f858 100755
|
||||
--- a/tests/debug/t.interactive
|
||||
+++ b/tests/debug/t.interactive
|
||||
@@ -4,7 +4,7 @@
|
||||
. "$XDG_TEST_DIR/include/testcontrol.sh"
|
||||
|
||||
test_interactive() {
|
||||
-test_start "$FUNCNAME: verify functionallity of assert_interactive"
|
||||
+test_start "$FUNCNAME: verify functionality of assert_interactive"
|
||||
|
||||
test_procedure
|
||||
|
||||
diff --git a/tests/doc_gen.pl b/tests/doc_gen.pl
|
||||
index ed29d94..50d134d 100755
|
||||
--- a/tests/doc_gen.pl
|
||||
+++ b/tests/doc_gen.pl
|
||||
@@ -102,7 +102,7 @@ for $f ( @test_files ) {
|
||||
}
|
||||
#find initilization
|
||||
elsif ( m/test_init/ ) {
|
||||
- print HTM "<h2>Depencencies</h2>\n";
|
||||
+ print HTM "<h2>Dependencies</h2>\n";
|
||||
$state = 'INIT';
|
||||
next;
|
||||
}
|
||||
diff --git a/tests/include/testassertions.sh b/tests/include/testassertions.sh
|
||||
index 1ba026d..142c0de 100644
|
||||
--- a/tests/include/testassertions.sh
|
||||
+++ b/tests/include/testassertions.sh
|
||||
@@ -5,7 +5,7 @@
|
||||
. "$XDG_TEST_DIR/include/testfuncs.sh"
|
||||
|
||||
## NOTE: Documentation is generated AUTOMATICALLY from this file
|
||||
-## Function usage must immediately follow function delcaration
|
||||
+## Function usage must immediately follow function declaration
|
||||
|
||||
assert_exit() {
|
||||
# execute command (saving output) and check exit code
|
||||
@@ -41,7 +41,7 @@ assert_interactive_notroot() {
|
||||
}
|
||||
|
||||
assert_interactive() {
|
||||
-# Useage:
|
||||
+# Usage:
|
||||
# assert_interactive {msg} [y|n|C|s varname]
|
||||
#
|
||||
# msg is the text to print.
|
||||
@@ -122,7 +122,7 @@ assert_file_not_in_path() {
|
||||
|
||||
|
||||
assert_file() {
|
||||
-# Assert the existance of an exact filename
|
||||
+# Assert the existence of an exact filename
|
||||
# Usage: assert_file FILE
|
||||
if [ ! -e "$1" ] ; then
|
||||
test_fail "'$1' does not exist"
|
||||
@@ -140,7 +140,7 @@ assert_file() {
|
||||
}
|
||||
|
||||
assert_nofile() {
|
||||
-# Assert the non existance of an exact filename.
|
||||
+# Assert the non existence of an exact filename.
|
||||
# Opposite of 'assert_file'
|
||||
if [ -e "$1" ] ; then
|
||||
test_fail "'$1' exists."
|
||||
@@ -339,7 +339,7 @@ get_unique_name() {
|
||||
varname="$1"
|
||||
file="$2"
|
||||
if [ -z "$varname" ] ; then
|
||||
- echo "TEST SYNAX ERROR: get_unique_name requries a variable name"
|
||||
+ echo "TEST SYNAX ERROR: get_unique_name requires a variable name"
|
||||
exit 255
|
||||
fi
|
||||
|
||||
diff --git a/tests/testrun b/tests/testrun
|
||||
index 822fc69..4a9f748 100755
|
||||
--- a/tests/testrun
|
||||
+++ b/tests/testrun
|
||||
@@ -123,7 +123,7 @@ if [ -z "$XDG_TEST_SELF_LAUNCH" ] ; then # not self launched
|
||||
else
|
||||
SUCMD=`which sudo 2>/dev/null`
|
||||
echo "Running ${SUCMD-su} for system tests."
|
||||
- echo "Please enter an apropriate password if requested."
|
||||
+ echo "Please enter an appropriate password if requested."
|
||||
fi
|
||||
# Note if sudo is not found, $SUCMD will be blank, so run su directly.
|
||||
# We cannot assume su works since systems like Ubuntu require sudo
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From eda08ef065adac7cfa46f296d378cc06a3131d3e Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@gmail.com>
|
||||
Date: Mon, 18 Dec 2017 15:50:45 -0600
|
||||
Subject: [PATCH 6/8] xdg-mime awk script syntax error (BR104298)
|
||||
|
||||
---
|
||||
ChangeLog | 3 +++
|
||||
scripts/xdg-mime.in | 4 ++--
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 292915f..964006c 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,5 +1,8 @@
|
||||
=== xdg-utils 1.1.3 ===
|
||||
|
||||
+2017-1218
|
||||
+ * xdg-mime awk script syntax error (BR104298)
|
||||
+
|
||||
=== xdg-utils 1.1.2 ===
|
||||
|
||||
2017-02-28 Rex Dieter <rdieter@fedoraproject.org>
|
||||
diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
|
||||
index b67581c..0e567c7 100644
|
||||
--- a/scripts/xdg-mime.in
|
||||
+++ b/scripts/xdg-mime.in
|
||||
@@ -171,7 +171,7 @@ make_default_kde()
|
||||
blanks++
|
||||
suppress=1
|
||||
} else if (associations && index($0, prefix) == 1) {
|
||||
- value=substr($0, length(prefix) + 1, length)
|
||||
+ value=substr($0, length(prefix) + 1, length())
|
||||
split(value, apps, ";")
|
||||
value=application ";"
|
||||
count=0
|
||||
@@ -369,7 +369,7 @@ check_mimeapps_list()
|
||||
} else if (index($0, "[") == 1) {
|
||||
indefault=0
|
||||
} else if (!found && indefault && index($0, prefix) == 1) {
|
||||
- print substr($0, length(prefix) +1, length)
|
||||
+ print substr($0, length(prefix) +1, length())
|
||||
found=1
|
||||
}
|
||||
}
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 7d4360c64d94de53d907f13ca99837285e972ec6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com>
|
||||
Date: Wed, 17 May 2017 14:33:30 +0100
|
||||
Subject: [PATCH 7/8] xdg-open: Fixes LXQt behavior
|
||||
|
||||
Commit 6387086e4938d568c2bab185632f60e1619b3f68 introduced LXQt support.
|
||||
In xdg-open it assumed that LXQt and LXDE are the same. They aren't. LXQt
|
||||
does not have pcmanfm, it has pcmanfm-qt.
|
||||
LXQt doesn't want to rely on pcmamfm-qt to handle it: LXQt is very modular
|
||||
and can be deployed without pcmanfm-qt.
|
||||
|
||||
open_generic() works for LXQt but it depends on mimeopen and mimetype. In
|
||||
the future we will want, for sure, to drop those dependencies. That's the
|
||||
reason for the existence of open_lxqt().
|
||||
---
|
||||
scripts/xdg-open.in | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
||||
index 9817c5f..2972257 100644
|
||||
--- a/scripts/xdg-open.in
|
||||
+++ b/scripts/xdg-open.in
|
||||
@@ -447,6 +447,11 @@ open_lxde()
|
||||
fi
|
||||
}
|
||||
|
||||
+open_lxqt()
|
||||
+{
|
||||
+ open_generic "$1"
|
||||
+}
|
||||
+
|
||||
[ x"$1" != x"" ] || exit_failure_syntax
|
||||
|
||||
url=
|
||||
@@ -511,10 +516,14 @@ case "$DE" in
|
||||
open_xfce "$url"
|
||||
;;
|
||||
|
||||
- lxde|lxqt)
|
||||
+ lxde)
|
||||
open_lxde "$url"
|
||||
;;
|
||||
|
||||
+ lxqt)
|
||||
+ open_lxqt "$url"
|
||||
+ ;;
|
||||
+
|
||||
enlightenment)
|
||||
open_enlightenment "$url"
|
||||
;;
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 13963edddcad55438f03aefd4db1538cc8f68f14 Mon Sep 17 00:00:00 2001
|
||||
From: Rex Dieter <rdieter@gmail.com>
|
||||
Date: Tue, 27 Feb 2018 15:58:42 -0600
|
||||
Subject: [PATCH 8/8] Changelog for prior commit
|
||||
|
||||
---
|
||||
ChangeLog | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ChangeLog b/ChangeLog
|
||||
index 964006c..8060d47 100644
|
||||
--- a/ChangeLog
|
||||
+++ b/ChangeLog
|
||||
@@ -1,6 +1,9 @@
|
||||
=== xdg-utils 1.1.3 ===
|
||||
|
||||
-2017-1218
|
||||
+2018-02-27
|
||||
+ * xdg-open: Fixes LXQt behavior (BR81674,BR103146)
|
||||
+
|
||||
+2017-12-18
|
||||
* xdg-mime awk script syntax error (BR104298)
|
||||
|
||||
=== xdg-utils 1.1.2 ===
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
From ce802d71c3466d1dbb24f2fe9b6db82a1f899bcb Mon Sep 17 00:00:00 2001
|
||||
From: Gabriel Corona <gabriel.corona@enst-bretagne.fr>
|
||||
Date: Mon, 19 Mar 2018 22:09:00 +0100
|
||||
Subject: [PATCH] Avoid argument injection vulnerability in open_envvar()
|
||||
|
||||
---
|
||||
scripts/xdg-open.in | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
|
||||
index 2972257..021524b 100644
|
||||
--- a/scripts/xdg-open.in
|
||||
+++ b/scripts/xdg-open.in
|
||||
@@ -351,6 +351,11 @@ open_generic_xdg_x_scheme_handler()
|
||||
fi
|
||||
}
|
||||
|
||||
+has_single_argument()
|
||||
+{
|
||||
+ test $# = 1
|
||||
+}
|
||||
+
|
||||
open_envvar()
|
||||
{
|
||||
local oldifs="$IFS"
|
||||
@@ -365,7 +370,10 @@ open_envvar()
|
||||
fi
|
||||
|
||||
if echo "$browser" | grep -q %s; then
|
||||
- $(printf "$browser" "$1")
|
||||
+ # Avoid argument injection.
|
||||
+ # See https://bugs.freedesktop.org/show_bug.cgi?id=103807
|
||||
+ # URIs don't have IFS characters spaces anyway.
|
||||
+ has_single_argument $1 && $(printf "$browser" "$1")
|
||||
else
|
||||
$browser "$1"
|
||||
fi
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
|
||||
MODULE=xdg-utils
|
||||
VERSION=1.1.0
|
||||
DATE=$(date +%Y%m%d)git
|
||||
|
||||
set -x
|
||||
|
||||
rm -rf $MODULE
|
||||
|
||||
git clone git://anongit.freedesktop.org/git/xdg/xdg-utils $MODULE/
|
||||
pushd $MODULE
|
||||
git archive master --format tar --prefix=${MODULE}-${VERSION}/ | gzip -9 > ../${MODULE}-${VERSION}-${DATE}.tar.gz
|
||||
popd
|
||||
|
||||
rm -rf $MODULE
|
||||
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
1
sources
Normal file
1
sources
Normal file
@ -0,0 +1 @@
|
||||
SHA512 (xdg-utils-v1.2.0.tar.gz) = 4d4f7dda1ef3c041e08de03631f264edaec6740d1bf04e84fa080a2beaf6fd894b6cf225b5de4bbb1dd83f05140e0a37c64a0f5f172ded1c69fbd80d041dc95a
|
||||
@ -1,37 +1,21 @@
|
||||
#global prerelease rc3
|
||||
#global snap 20150927git
|
||||
|
||||
Summary: Basic desktop integration functions
|
||||
Name: xdg-utils
|
||||
Version: 1.1.2
|
||||
Release: 5%{?dist}
|
||||
Version: 1.2.0
|
||||
Release: 3%{?dist}
|
||||
|
||||
URL: http://portland.freedesktop.org/
|
||||
URL: https://www.freedesktop.org/wiki/Software/xdg-utils/
|
||||
%if 0%{?snap:1}
|
||||
Source0: xdg-utils-1.1.0-%{snap}.tar.gz
|
||||
Source0: xdg-utils-%{version}-%{snap}.tar.gz
|
||||
%else
|
||||
# at least until freedesktop folks move over to release dir
|
||||
Source0: https://people.freedesktop.org/~rdieter/xdg-utils/xdg-utils-%{version}.tar.gz
|
||||
#Source0: http://portland.freedesktop.org/download/xdg-utils-%{version}%{?prerelease:-%{prerelease}}.tar.gz
|
||||
Source0: https://gitlab.freedesktop.org/xdg/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.gz
|
||||
%endif
|
||||
Source1: xdg-utils-git_checkout.sh
|
||||
License: MIT
|
||||
|
||||
## upstream patches (treat as sources in lookaside cache)
|
||||
Patch1: 0001-bump-version-1.1.2.patch
|
||||
Patch2: 0002-init-1.1.3-ChangeLog-section.patch
|
||||
Patch3: 0003-Fix-tests-for-1f8e58d51e6fb3f50f59ed2d8265f2f346ac68.patch
|
||||
Patch4: 0004-xdg-mime.1-Add-missing-period.patch
|
||||
Patch5: 0005-Spelling-fixes-BR103255.patch
|
||||
Patch6: 0006-xdg-mime-awk-script-syntax-error-BR104298.patch
|
||||
Patch7: 0007-xdg-open-Fixes-LXQt-behavior.patch
|
||||
Patch8: 0008-Changelog-for-prior-commit.patch
|
||||
Patch9: CVE-2017-18266.patch
|
||||
|
||||
# make sure BuildArch comes *after* patches, to ensure %%autosetup works right
|
||||
# http://bugzilla.redhat.com/1084309
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gawk
|
||||
BuildRequires: xmlto lynx
|
||||
|
||||
@ -63,7 +47,7 @@ The following scripts are provided at this time:
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version}%{?pre:-%{pre}} -p1
|
||||
%autosetup -n %{name}-v%{version} -p1
|
||||
|
||||
|
||||
%build
|
||||
@ -73,15 +57,15 @@ The following scripts are provided at this time:
|
||||
make scripts-clean -C scripts
|
||||
make man scripts %{?_smp_mflags} -C scripts
|
||||
%endif
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%make_build
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot}
|
||||
%make_install
|
||||
|
||||
|
||||
%files
|
||||
%doc ChangeLog LICENSE README TODO
|
||||
%doc ChangeLog README.md TODO
|
||||
%license LICENSE
|
||||
%{_bindir}/xdg-desktop-icon
|
||||
%{_bindir}/xdg-desktop-menu
|
||||
%{_bindir}/xdg-email
|
||||
@ -101,9 +85,72 @@ make install DESTDIR=%{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Sep 20 2018 Alexander Larsson <alexl@redhat.com> - 1.1.2-5
|
||||
- Add patch for CVE-2017-18266
|
||||
Resolves: #1578769
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.0-3
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.2.0-2
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Tue Jan 30 2024 Steve Cossette <farchord@gmail.com> - 1.2.0-1
|
||||
- Release to 1.2.0 final
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0~git20231511.21fb316-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Nov 18 2023 Alessandro Astone <ales.astone@gmail.com> - 1.2.0~git20231511.21fb316-1
|
||||
- Update to 1.2.0~ git snapshot
|
||||
|
||||
* Tue Jul 25 2023 Rafael Guterres Jeffman <rjeffman@redhat.com> - 1.1.3-15
|
||||
- Use "grep -E" instead of the obsoleted "egrep"
|
||||
Resolves: BZ#2140197
|
||||
- mark LICENSE as %%license
|
||||
- Spec cleanup
|
||||
- Small patches, as a rule, are in git dist, to be more easy to read.
|
||||
- Migrated to SPDX license (noop)
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Fri Apr 23 2021 Rex Dieter <rdieter@fedoraproject.org> - 1.1.3-9
|
||||
- pull in upstream fixes
|
||||
- xdg-open run indefinetly (#1881372)
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu May 24 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.3-2
|
||||
- pull in upstream fixes
|
||||
|
||||
* Thu May 10 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.3-1
|
||||
- xdg-utils-1.1.3
|
||||
|
||||
* Tue Feb 27 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.2-4
|
||||
- pull in upstream fixes
|
||||
Loading…
Reference in New Issue
Block a user