summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2017-03-19 15:38:40 +0100
committerMichael Weber <xmw@gentoo.org>2017-03-19 15:39:00 +0100
commit178b40ba7e7998de7f87c13616d3188996e84790 (patch)
treee9e5fcabdc04396e7faee25acfe31a1532c5e5ef /x11-wm/xpra/files
parentnet-misc/minidlna: Remove old versions. (diff)
downloadgentoo-178b40ba7e7998de7f87c13616d3188996e84790.tar.gz
gentoo-178b40ba7e7998de7f87c13616d3188996e84790.tar.bz2
gentoo-178b40ba7e7998de7f87c13616d3188996e84790.zip
x11-wm/xpra: Version bump (bug 612946), backport fixes/cleanups to 1.0.4 as revbump.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'x11-wm/xpra/files')
-rw-r--r--x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch11
-rw-r--r--x11-wm/xpra/files/xpra-2.0-suid-warning.patch11
2 files changed, 22 insertions, 0 deletions
diff --git a/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
new file mode 100644
index 000000000000..9af267cb4505
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-1.0.4-suid-warning.patch
@@ -0,0 +1,11 @@
+--- xpra-1.0.4/xpra/scripts/config.py
++++ xpra-1.0.4/xpra/scripts/config.py
+@@ -130,7 +130,7 @@
+ xorg_stat = os.stat(xorg_bin)
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+ use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-2.0-suid-warning.patch b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
new file mode 100644
index 000000000000..806694f24312
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-2.0-suid-warning.patch
@@ -0,0 +1,11 @@
+--- xpra-2.0/xpra/scripts/config.py
++++ xpra-2.0/xpra/scripts/config.py
+@@ -127,7 +127,7 @@
+ xorg_stat = os.stat(xorg_bin)
+ if (xorg_stat.st_mode & stat.S_ISUID)!=0:
+ if (xorg_stat.st_mode & stat.S_IROTH)==0:
+- warn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
++ debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
+ return get_Xvfb_command()
+ debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
+ use_wrapper = True