[python-xlib/f13/master] Add patch to not depend on the existence of ~/.Xauthority

tomspur tomspur at fedoraproject.org
Thu Sep 9 07:45:03 UTC 2010


commit 16a65e8c7b52dcaef345d545d83959a557fa3c52
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Sat Sep 4 14:18:12 2010 +0200

    Add patch to not depend on the existence of ~/.Xauthority
    
    This fixes #552491.
    See upstream conversation:
    https://sourceforge.net/tracker/?func=detail&atid=110350&aid=3057898&group_id=10350
    
    Signed-off-by: Thomas Spura <tomspur at fedoraproject.org>

 python-xlib-0.15rc1-xauthority.patch |   17 +++++++++++++++++
 python-xlib.spec                     |    7 ++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/python-xlib-0.15rc1-xauthority.patch b/python-xlib-0.15rc1-xauthority.patch
new file mode 100644
index 0000000..4e35f53
--- /dev/null
+++ b/python-xlib-0.15rc1-xauthority.patch
@@ -0,0 +1,17 @@
+Index: Xlib/support/unix_connect.py
+===================================================================
+--- Xlib/support/unix_connect.py
++++ Xlib/support/unix_connect.py	2010-09-03 00:49:15.066186229 +0200
+@@ -112,7 +112,11 @@
+         family = xauth.FamilyLocal
+         addr = socket.gethostname()
+ 
+-    au = xauth.Xauthority()
++    try:
++        au = xauth.Xauthority()
++    except error.XauthError:
++        return old_get_auth(sock, dname, host, dno)
++
+     while 1:
+         try:
+             return au.get_best_auth(family, addr, dno)
diff --git a/python-xlib.spec b/python-xlib.spec
index 53f467a..905cd33 100644
--- a/python-xlib.spec
+++ b/python-xlib.spec
@@ -3,7 +3,7 @@
 %define pre_release rc1 
 Name:           python-xlib
 Version:        0.15
-Release:        0.1.%{pre_release}%{?dist}
+Release:        0.3.%{pre_release}%{?dist}
 Summary:        X client library for Python
 
 Group:          Development/Languages
@@ -16,6 +16,7 @@ Patch0:         increase-receiving-buffer
 Patch1:         fix-unix-socket-in-display
 Patch2:         fix-ssh-tunnel-auth 
 Patch3:         fix-rhomboid-examples 
+Patch4:         python-xlib-0.15rc1-xauthority.patch
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  texinfo-tex tetex-dvips
@@ -41,6 +42,7 @@ that tell you how to program with python-xlib.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
 
 %build
 %{__python} setup.py build
@@ -71,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Sep  3 2010 Thomas Spura <tomspur at fedoraproject.org> - 0.15-0.3.rc1
+- try a workaround proposed by upstream for #552491
+
 * Mon Dec 14  2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.15-0.1.rc1
 - New upstream pre-release and some cherry picked patches from Debian from Fedora bug 537264 
 


More information about the scm-commits mailing list