summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib/xtrans
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-05-11 11:01:38 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-13 10:28:59 +0100
commitfc1859ea661d77067774c7fa3c1cbd49cebf90d3 (patch)
tree4d0376ab86a09fb7d3eb01eb7708b762b2545acb /meta/recipes-graphics/xorg-lib/xtrans
parent6a7b1fe1bb3b723f7c985978660628d0c0d39922 (diff)
downloadpoky-fc1859ea661d77067774c7fa3c1cbd49cebf90d3.tar.gz
recpies: add Upstream-Status for multiple recipes' patches
tcf-agent: update its patch's Upstream-Status screen: update its patch's Upstream-Status which (GPLv2): update its patch's Upstream-Status gnome-vfs: update its patch's Upstream-Status libart-lgpl: update its patch's Upstream-Status librsvg: update its patch's Upstream-Status fontconfig: update its patch's Upstream-Status freetype: update its patch's Upstream-Status libxsettings-client: update its patch's Upstream-Status libxcb: update its patch's Upstream-Status libx11: update its patch's Upstream-Status - remove 2 unused xim.patch. libx11-trim: update its patch's Upstream-Status libxcalibrate: update its patch's Upstream-Status libxcomposite: update its patch's Upstream-Status libxfont: update its patch's Upstream-Status xtrans: update its patch's Upstream-Status - remove abstract_socket_fix.patch as it's not used at all for long. calibrateproto: update its patch's Upstream-Status latencytop: update its patch's Upstream-Status powertop: update its patch's Upstream-Status settings-daemon: update its patch's Upstream-Status gnome-settings-daemon: update its patch's Upstream-Status libxklavier: update its patch's Upstream-Status liblbxutil: update its patch's Upstream-Status oprofile: update its patch's Upstream-Status and remove an unused patch - delete xml_callgraph_details.patch as it's not used at all. (From OE-Core rev: 94991fb73586887bfc740eacf190032dfb206a65) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/xtrans')
-rw-r--r--meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch b/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
deleted file mode 100644
index 197da0735d..0000000000
--- a/meta/recipes-graphics/xorg-lib/xtrans/abstract_socket_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
1From 556a351de83fc6f401b02213dae95731553c216d Mon Sep 17 00:00:00 2001
2From: Loïc Minier <lool@dooz.org>
3Date: Mon, 24 Mar 2008 19:38:27 +0000
4Subject: Bug #10489: Don't retry unix socket connect()s on ENOENT.
5
6If the socket isn't there, it's not gonna magically appear. Either it's
7a server socket and you should have just waited for the SIGUSR1 from the
8server, or it's a stale reference to an ICE socket.
9
10However, do retry once, so fallback from abstract to filesystem namespace
11works.
12
13Originally Debian bug #385976.
14---
15diff --git a/Xtranssock.c b/Xtranssock.c
16index 8a7d2ec..da4afe9 100644
17--- a/Xtranssock.c
18+++ b/Xtranssock.c
19@@ -2146,8 +2146,13 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
20 errno = olderrno;
21
22 /*
23- * If the error was ENOENT, the server may be starting up
24- * and we should try again.
25+ * If the error was ENOENT, the server may be starting up; we used
26+ * to suggest to try again in this case with
27+ * TRANS_TRY_CONNECT_AGAIN, but this introduced problems for
28+ * processes still referencing stale sockets in their environment.
29+ * Hence, we now return a hard error, TRANS_CONNECT_FAILED, and it
30+ * is suggested that higher level stacks handle retries on their
31+ * level when they face a slow starting server.
32 *
33 * If the error was EWOULDBLOCK or EINPROGRESS then the socket
34 * was non-blocking and we should poll using select
35@@ -2161,14 +2166,14 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
36 else if (olderrno == EINTR)
37 return TRANS_TRY_CONNECT_AGAIN;
38 else if (olderrno == ENOENT) {
39- /*
40- * If opening as abstract socket failed, try again "normally"
41- */
42- if (abstract)
43+ /* If opening as abstract socket failed, try again normally */
44+ if (abstract) {
45 ciptr->transptr->flags &= ~(TRANS_ABSTRACT);
46- return TRANS_TRY_CONNECT_AGAIN;
47- }
48- else {
49+ return TRANS_TRY_CONNECT_AGAIN;
50+ } else {
51+ return TRANS_CONNECT_FAILED;
52+ }
53+ } else {
54 PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
55 EGET(),0, 0);
56
57--
58cgit v0.7.2-37-g538c