rpms/xdg-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- xdg-settings fixes (#580715, fdo#26284)

Browse Source
This commit is contained in:
Rex Dieter 2010-04-09 20:07:43 +00:00
parent 0fa7fb3396
commit ced57bc2a5
8 changed files with 8 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xdg-utils-20100118cvs.tgz
xdg-utils-20100409.tgz

2
sources
View File

@ -1 +1 @@
fc4fb7ae7f1121e97575c4b1ec982154 xdg-utils-20100118cvs.tgz
c10d1dabf25180c7daf336e928b0d505 xdg-utils-20100409.tgz

11
xdg-utils-1.0.1-typo.patch
View File

@ -1,11 +0,0 @@
--- xdg-utils-1.0.1/scripts/man/xdg-icon-resource.1.typo 2006-11-03 21:35:57.000000000 -0600
+++ xdg-utils-1.0.1/scripts/man/xdg-icon-resource.1 2006-12-19 15:52:35.000000000 -0600
@@ -56,7 +56,7 @@
.SH "OPTIONS"
.TP
\fB\-\-noupdate\fR
-Postpone updating the desktop icon system. If multiple icons are added in sequence this flag can be used to indicate that additional changes will follow and that it is not necassery to update the desktop icon system right away.
+Postpone updating the desktop icon system. If multiple icons are added in sequence this flag can be used to indicate that additional changes will follow and that it is not necessary to update the desktop icon system right away.
.TP
\fB\-\-novendor\fR
Normally, xdg\-icon\-resource checks to ensure that an icon file to be installed in the

46
xdg-utils-1.0.2-CVE-2008-0386.patch
View File

@ -1,46 +0,0 @@
Fix for #429513: CVE-2008-0386 xdg-open allows to execute arbitrary commands
From upstream:
http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-open.in?r1=1.17&r2=1.18
http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-open?r1=1.32&r2=1.33
http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-email.in?r1=1.24&r2=1.25
http://webcvs.freedesktop.org/portland/portland/xdg-utils/scripts/xdg-email?r1=1.36&r2=1.37
diff -urp xdg-utils-1.0.2.orig/scripts/xdg-email xdg-utils-1.0.2/scripts/xdg-email
--- xdg-utils-1.0.2.orig/scripts/xdg-email 2007-06-24 21:58:04.000000000 +0200
+++ xdg-utils-1.0.2/scripts/xdg-email 2008-01-25 15:17:51.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#---------------------------------------------
# xdg-email
#
@@ -435,7 +435,8 @@ open_generic()
for browser in $BROWSER; do
if [ x"$browser" != x"" ]; then
- browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
+ IFS=' '
+ browser_with_arg=${browser//'%s'/"$1"}
if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
else $browser_with_arg;
diff -urp xdg-utils-1.0.2.orig/scripts/xdg-open xdg-utils-1.0.2/scripts/xdg-open
--- xdg-utils-1.0.2.orig/scripts/xdg-open 2008-01-25 15:16:43.000000000 +0100
+++ xdg-utils-1.0.2/scripts/xdg-open 2008-01-25 15:17:54.000000000 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#---------------------------------------------
# xdg-open
#
@@ -371,7 +371,8 @@ open_generic()
for browser in $BROWSER; do
if [ x"$browser" != x"" ]; then
- browser_with_arg=`echo "$browser" | sed s#%s#"$1"#`
+ IFS=' '
+ browser_with_arg=${browser//'%s'/"$1"}
if [ x"$browser_with_arg" = x"$browser" ]; then "$browser" "$1";
else $browser_with_arg;

12
xdg-utils-1.0.2-CVE-2009-0068-1.patch
View File

@ -1,12 +0,0 @@
diff -up xdg-utils/scripts/xdg-open.in.CVE-2009-0068 xdg-utils/scripts/xdg-open.in
--- xdg-utils/scripts/xdg-open.in.CVE-2009-0068 2009-04-08 14:04:02.000000000 -0500
+++ xdg-utils/scripts/xdg-open.in 2009-04-08 14:05:05.000000000 -0500
@@ -29,7 +29,7 @@ _USAGE
open_kde()
{
- kfmclient exec "$1"
+ kfmclient openURL "$1"
kfmclient_fix_exit_code $?
if [ $? -eq 0 ]; then

17
xdg-utils-1.0.2-mimeopen.patch
View File

@ -1,17 +0,0 @@
diff -up xdg-utils-1.0.2/scripts/xdg-open.mimeopen xdg-utils-1.0.2/scripts/xdg-open
--- xdg-utils-1.0.2/scripts/xdg-open.mimeopen 2007-06-24 14:58:01.000000000 -0500
+++ xdg-utils-1.0.2/scripts/xdg-open 2008-01-18 08:49:50.000000000 -0600
@@ -360,6 +360,13 @@ open_xfce()
open_generic()
{
+ if mimeopen -v 2>/dev/null 1>&2; then
+ mimeopen -n "$1"
+ if [ $? -eq 0 ]; then
+ exit_success
+ fi
+ fi
+
IFS=":"
for browser in $BROWSER; do
if [ x"$browser" != x"" ]; then

2
xdg-utils-cvs_checkout.sh
View File

@ -12,7 +12,7 @@ rm -rf $MODULE
cvs -z3 -d$CVSUSER@cvs.freedesktop.org:/cvs/portland checkout -P portland/$MODULE
pushd portland
tar czf ../$MODULE-${DATE}cvs.tgz $MODULE
tar czf ../$MODULE-${DATE}.tgz $MODULE
popd
rm -rf portland

22
xdg-utils.spec
View File

@ -3,12 +3,12 @@
%define obsoletes_htmlview 1
%endif
%define cvs 20100118cvs
%define cvs 20100409
Summary: Basic desktop integration functions
Name: xdg-utils
Version: 1.0.2
Release: 17.%{cvs}%{?dist}
Release: 18.%{cvs}%{?dist}
URL: http://portland.freedesktop.org/
%if 0%{?cvs:1}
@ -26,14 +26,6 @@ Source10: htmlview.sh
Patch1: xdg-utils-1.0.2-htmlview.patch
## upstreamable patches
Patch50: xdg-utils-1.0.2-CVE-2009-0068-1.patch
## upstream patches
Patch101: xdg-utils-1.0.2-mimeopen.patch
Patch102: xdg-utils-1.0.1-typo.patch
Patch104: xdg-utils-1.0.2-CVE-2008-0386.patch
BuildRequires: gawk
BuildRequires: xmlto
@ -85,13 +77,6 @@ The following scripts are provided at this time:
%if ! 0%{?obsoletes_htmlview}
%patch1 -p1 -b .htmlview
%endif
#patch50 -p1 -b .CVE-2009-0068-1
%if ! 0%{?cvs:1}
%patch101 -p1 -b .mimeopen
%patch102 -p1 -b .typo
%patch104 -p1 -b .CVE-2008-0386
%endif%
%build
@ -126,6 +111,9 @@ rm -rf %{buildroot}
%changelog
* Fri Apr 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-18.20100409
- xdg-settings fixes (#580715, fdo#26284)
* Mon Jan 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 1.0.2-17.20100118cvs
- xdg-screensaver resume activates the screensaver on KDE4 (fdo#26085)