[X2Go-Commits] [x2gobroker] 01/10: patches/: Drop pre-history patch for python2.6 in squeeze.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gobroker.

commit 854d84ea450a596b767cdef7f4a6043f26fa0a6f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Sep 7 08:25:20 2018 +0200

    patches/: Drop pre-history patch for python2.6 in squeeze.
---
 debian/python3-x2gobroker.docs                     |  1 -
 .../python26_debian-squeeze_asyncore.patch         | 41 ----------------------
 2 files changed, 42 deletions(-)

diff --git a/debian/python3-x2gobroker.docs b/debian/python3-x2gobroker.docs
index 37d2b55..5502ed8 100644
--- a/debian/python3-x2gobroker.docs
+++ b/debian/python3-x2gobroker.docs
@@ -1,4 +1,3 @@
 NEWS
 README
 TODO
-patches/python-x2gobroker
\ No newline at end of file
diff --git a/patches/python-x2gobroker/python26_debian-squeeze_asyncore.patch b/patches/python-x2gobroker/python26_debian-squeeze_asyncore.patch
deleted file mode 100644
index c5d30e8..0000000
--- a/patches/python-x2gobroker/python26_debian-squeeze_asyncore.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Author: Charles-François Natali (neologix)
-Description: 100% cpu usage when using asyncore with UNIX socket
-Origin: http://bugs.python.org/issue12502
-Abstract:
- It's looping in Lib/asyncore.py:poll
- .
- select(4, [3], [3], [3], {30, 0})       = 1 (out [3], left {29, 999994})
- select(4, [3], [3], [3], {30, 0})       = 1 (out [3], left {29, 999994})
- select(4, [3], [3], [3], {30, 0})       = 1 (out [3], left {29, 999994})
- .
- loop sets the Unix domain socket in the writable set, and contrarily to
- AF_INET/AF_INET6 sockets, bound AF_UNIX SOCK_STREAM sockets are reported
- as writable before any client connects to them, which triggers the loop.
- .
- The patch just doesn't add the socket to the writable set if it's in the
- accepting state. It fixes the loop, and doesn't seem to cause any regression
- in test_asyncore.
- .
- Apply this patch to python2.6 package on Debian squeeze.
---- /usr/lib/python2.6/asyncore.py.orig	2013-11-20 14:39:41.000000000 +0100
-+++ /usr/lib/python2.6/asyncore.py	2013-11-20 14:39:00.000000000 +0100
-@@ -128,7 +128,8 @@
-             is_w = obj.writable()
-             if is_r:
-                 r.append(fd)
--            if is_w:
-+            # accepting sockets should not be writable
-+            if is_w and not obj.accepting:
-                 w.append(fd)
-             if is_r or is_w:
-                 e.append(fd)
-@@ -175,7 +176,8 @@
-             flags = 0
-             if obj.readable():
-                 flags |= select.POLLIN | select.POLLPRI
--            if obj.writable():
-+            # accepting sockets should not be writable
-+            if obj.writable() and not obj.accepting:
-                 flags |= select.POLLOUT
-             if flags:
-                 # Only check for exceptions if object was either readable

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git