| /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-filter-out-non-signal-messages-from.patch |
Annotation of /trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-filter-out-non-signal-messages-from.patch
Parent Directory
| 
Revision Log
Revision 2575 -
(hide annotations)
(download)
Mon Jun 15 12:22:48 2015 UTC (8 years, 11 months ago) by niro
File size: 11819 byte(s)
Mon Jun 15 12:22:48 2015 UTC (8 years, 11 months ago) by niro
File size: 11819 byte(s)
-serveral upstream patches
| 1 | niro | 2575 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
| 2 | "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| 3 | <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> | ||
| 4 | <head> | ||
| 5 | <title>svntogit/packages.git - Git clone of the 'packages' repository | ||
| 6 | </title> | ||
| 7 | <meta name='generator' content='cgit v0.10.2'/> | ||
| 8 | <meta name='robots' content='index, nofollow'/> | ||
| 9 | <link rel='stylesheet' type='text/css' href='/cgit.css'/> | ||
| 10 | <link rel='shortcut icon' href='/favicon.ico'/> | ||
| 11 | <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server' type='application/atom+xml'/> | ||
| 12 | <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
| 13 | <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
| 14 | <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
| 15 | <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/> | ||
| 16 | </head> | ||
| 17 | <body> | ||
| 18 | <div id="archnavbar"><!-- Arch Linux global navigation bar --> | ||
| 19 | <div id="archnavbarlogo"> | ||
| 20 | <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p> | ||
| 21 | </div> | ||
| 22 | <div id="archnavbarmenu"> | ||
| 23 | <ul id="archnavbarlist"> | ||
| 24 | <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li> | ||
| 25 | <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li> | ||
| 26 | <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li> | ||
| 27 | <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li> | ||
| 28 | <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li> | ||
| 29 | <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li> | ||
| 30 | <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li> | ||
| 31 | </ul> | ||
| 32 | </div> | ||
| 33 | </div><!-- #archnavbar --> | ||
| 34 | <div id='cgit'><table id='header'> | ||
| 35 | <tr> | ||
| 36 | <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr> | ||
| 37 | <tr><td class='sub'>Git clone of the 'packages' repository | ||
| 38 | </td><td class='sub right'></td></tr></table> | ||
| 39 | <table class='tabs'><tr><td> | ||
| 40 | <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/systemd-logind-filter-out-non-signal-messages-from.patch'> | ||
| 41 | <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'> | ||
| 42 | <option value='grep'>log msg</option> | ||
| 43 | <option value='author'>author</option> | ||
| 44 | <option value='committer'>committer</option> | ||
| 45 | <option value='range'>range</option> | ||
| 46 | </select> | ||
| 47 | <input class='txt' type='text' size='10' name='q' value=''/> | ||
| 48 | <input type='submit' value='search'/> | ||
| 49 | </form> | ||
| 50 | </td></tr></table> | ||
| 51 | <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>systemd-logind-filter-out-non-signal-messages-from.patch</a></div><div class='content'>blob: af319c599ba353d7c9f91fee80bcbd9458c37f49 (<a href='/svntogit/packages.git/plain/trunk/systemd-logind-filter-out-non-signal-messages-from.patch?h=packages/xorg-server'>plain</a>) | ||
| 52 | <table summary='blob content' class='blob'> | ||
| 53 | <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> | ||
| 54 | <a id='n2' href='#n2'>2</a> | ||
| 55 | <a id='n3' href='#n3'>3</a> | ||
| 56 | <a id='n4' href='#n4'>4</a> | ||
| 57 | <a id='n5' href='#n5'>5</a> | ||
| 58 | <a id='n6' href='#n6'>6</a> | ||
| 59 | <a id='n7' href='#n7'>7</a> | ||
| 60 | <a id='n8' href='#n8'>8</a> | ||
| 61 | <a id='n9' href='#n9'>9</a> | ||
| 62 | <a id='n10' href='#n10'>10</a> | ||
| 63 | <a id='n11' href='#n11'>11</a> | ||
| 64 | <a id='n12' href='#n12'>12</a> | ||
| 65 | <a id='n13' href='#n13'>13</a> | ||
| 66 | <a id='n14' href='#n14'>14</a> | ||
| 67 | <a id='n15' href='#n15'>15</a> | ||
| 68 | <a id='n16' href='#n16'>16</a> | ||
| 69 | <a id='n17' href='#n17'>17</a> | ||
| 70 | <a id='n18' href='#n18'>18</a> | ||
| 71 | <a id='n19' href='#n19'>19</a> | ||
| 72 | <a id='n20' href='#n20'>20</a> | ||
| 73 | <a id='n21' href='#n21'>21</a> | ||
| 74 | <a id='n22' href='#n22'>22</a> | ||
| 75 | <a id='n23' href='#n23'>23</a> | ||
| 76 | <a id='n24' href='#n24'>24</a> | ||
| 77 | <a id='n25' href='#n25'>25</a> | ||
| 78 | <a id='n26' href='#n26'>26</a> | ||
| 79 | <a id='n27' href='#n27'>27</a> | ||
| 80 | <a id='n28' href='#n28'>28</a> | ||
| 81 | <a id='n29' href='#n29'>29</a> | ||
| 82 | <a id='n30' href='#n30'>30</a> | ||
| 83 | <a id='n31' href='#n31'>31</a> | ||
| 84 | <a id='n32' href='#n32'>32</a> | ||
| 85 | <a id='n33' href='#n33'>33</a> | ||
| 86 | <a id='n34' href='#n34'>34</a> | ||
| 87 | <a id='n35' href='#n35'>35</a> | ||
| 88 | <a id='n36' href='#n36'>36</a> | ||
| 89 | <a id='n37' href='#n37'>37</a> | ||
| 90 | <a id='n38' href='#n38'>38</a> | ||
| 91 | <a id='n39' href='#n39'>39</a> | ||
| 92 | <a id='n40' href='#n40'>40</a> | ||
| 93 | <a id='n41' href='#n41'>41</a> | ||
| 94 | <a id='n42' href='#n42'>42</a> | ||
| 95 | <a id='n43' href='#n43'>43</a> | ||
| 96 | <a id='n44' href='#n44'>44</a> | ||
| 97 | <a id='n45' href='#n45'>45</a> | ||
| 98 | <a id='n46' href='#n46'>46</a> | ||
| 99 | <a id='n47' href='#n47'>47</a> | ||
| 100 | <a id='n48' href='#n48'>48</a> | ||
| 101 | <a id='n49' href='#n49'>49</a> | ||
| 102 | <a id='n50' href='#n50'>50</a> | ||
| 103 | <a id='n51' href='#n51'>51</a> | ||
| 104 | <a id='n52' href='#n52'>52</a> | ||
| 105 | <a id='n53' href='#n53'>53</a> | ||
| 106 | <a id='n54' href='#n54'>54</a> | ||
| 107 | <a id='n55' href='#n55'>55</a> | ||
| 108 | <a id='n56' href='#n56'>56</a> | ||
| 109 | <a id='n57' href='#n57'>57</a> | ||
| 110 | <a id='n58' href='#n58'>58</a> | ||
| 111 | <a id='n59' href='#n59'>59</a> | ||
| 112 | <a id='n60' href='#n60'>60</a> | ||
| 113 | <a id='n61' href='#n61'>61</a> | ||
| 114 | <a id='n62' href='#n62'>62</a> | ||
| 115 | <a id='n63' href='#n63'>63</a> | ||
| 116 | <a id='n64' href='#n64'>64</a> | ||
| 117 | <a id='n65' href='#n65'>65</a> | ||
| 118 | <a id='n66' href='#n66'>66</a> | ||
| 119 | <a id='n67' href='#n67'>67</a> | ||
| 120 | <a id='n68' href='#n68'>68</a> | ||
| 121 | <a id='n69' href='#n69'>69</a> | ||
| 122 | <a id='n70' href='#n70'>70</a> | ||
| 123 | <a id='n71' href='#n71'>71</a> | ||
| 124 | <a id='n72' href='#n72'>72</a> | ||
| 125 | <a id='n73' href='#n73'>73</a> | ||
| 126 | <a id='n74' href='#n74'>74</a> | ||
| 127 | <a id='n75' href='#n75'>75</a> | ||
| 128 | <a id='n76' href='#n76'>76</a> | ||
| 129 | <a id='n77' href='#n77'>77</a> | ||
| 130 | <a id='n78' href='#n78'>78</a> | ||
| 131 | <a id='n79' href='#n79'>79</a> | ||
| 132 | <a id='n80' href='#n80'>80</a> | ||
| 133 | <a id='n81' href='#n81'>81</a> | ||
| 134 | <a id='n82' href='#n82'>82</a> | ||
| 135 | <a id='n83' href='#n83'>83</a> | ||
| 136 | <a id='n84' href='#n84'>84</a> | ||
| 137 | <a id='n85' href='#n85'>85</a> | ||
| 138 | <a id='n86' href='#n86'>86</a> | ||
| 139 | <a id='n87' href='#n87'>87</a> | ||
| 140 | <a id='n88' href='#n88'>88</a> | ||
| 141 | <a id='n89' href='#n89'>89</a> | ||
| 142 | <a id='n90' href='#n90'>90</a> | ||
| 143 | </pre></td> | ||
| 144 | <td class='lines'><pre><code>From e90798c142dedc4fd296936b69fe34a40d0aa35a Mon Sep 17 00:00:00 2001 | ||
| 145 | From: Ray Strode <rstrode@redhat.com> | ||
| 146 | Date: Fri, 10 Apr 2015 14:19:50 -0400 | ||
| 147 | Subject: [PATCH] systemd-logind: filter out non-signal messages from message | ||
| 148 | filter | ||
| 149 | |||
| 150 | It's possible to receive a message reply in the message filter if a | ||
| 151 | previous message call timed out locally before the reply arrived. | ||
| 152 | |||
| 153 | The message_filter function only handles signals, at the moment, and | ||
| 154 | does not properly handle message replies. | ||
| 155 | |||
| 156 | This commit changes the message_filter function to filter out all | ||
| 157 | non-signal messages, including spurious message replies. | ||
| 158 | |||
| 159 | https://bugzilla.redhat.com/show_bug.cgi?id=1209347 | ||
| 160 | <span class="hl kwb">---</span> | ||
| 161 | hw/xfree86/os-support/linux/systemd-logind.c | 3 +++ | ||
| 162 | 1 file changed, 3 insertions(+) | ||
| 163 | |||
| 164 | diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c | ||
| 165 | index 49758f4..57c87c0 100644 | ||
| 166 | <span class="hl kwb">--- a/hw/xfree86/os-support/linux/systemd-logind.c</span> | ||
| 167 | <span class="hl kwa">+++ b/hw/xfree86/os-support/linux/systemd-logind.c</span> | ||
| 168 | @@ -286,60 +286,63 @@ systemd_logind_ack_pause(struct systemd_logind_info *info, | ||
| 169 | DBUS_TYPE_INVALID)) { | ||
| 170 | LogMessage(X_ERROR, "systemd-logind: out of memory\n"); | ||
| 171 | goto cleanup; | ||
| 172 | } | ||
| 173 | |||
| 174 | reply = dbus_connection_send_with_reply_and_block(info->conn, msg, | ||
| 175 | DBUS_TIMEOUT, &error); | ||
| 176 | if (!reply) | ||
| 177 | LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n", | ||
| 178 | error.message); | ||
| 179 | |||
| 180 | cleanup: | ||
| 181 | if (msg) | ||
| 182 | dbus_message_unref(msg); | ||
| 183 | if (reply) | ||
| 184 | dbus_message_unref(reply); | ||
| 185 | dbus_error_free(&error); | ||
| 186 | } | ||
| 187 | |||
| 188 | static DBusHandlerResult | ||
| 189 | message_filter(DBusConnection * connection, DBusMessage * message, void *data) | ||
| 190 | { | ||
| 191 | struct systemd_logind_info *info = data; | ||
| 192 | struct xf86_platform_device *pdev = NULL; | ||
| 193 | InputInfoPtr pInfo = NULL; | ||
| 194 | int ack = 0, pause = 0, fd = -1; | ||
| 195 | DBusError error; | ||
| 196 | dbus_int32_t major, minor; | ||
| 197 | char *pause_str; | ||
| 198 | |||
| 199 | <span class="hl kwa">+ if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)</span> | ||
| 200 | <span class="hl kwa">+ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;</span> | ||
| 201 | <span class="hl kwa">+</span> | ||
| 202 | dbus_error_init(&error); | ||
| 203 | |||
| 204 | if (dbus_message_is_signal(message, | ||
| 205 | "org.freedesktop.DBus", "NameOwnerChanged")) { | ||
| 206 | char *name, *old_owner, *new_owner; | ||
| 207 | |||
| 208 | dbus_message_get_args(message, &error, | ||
| 209 | DBUS_TYPE_STRING, &name, | ||
| 210 | DBUS_TYPE_STRING, &old_owner, | ||
| 211 | DBUS_TYPE_STRING, &new_owner, DBUS_TYPE_INVALID); | ||
| 212 | if (dbus_error_is_set(&error)) { | ||
| 213 | LogMessage(X_ERROR, "systemd-logind: NameOwnerChanged: %s\n", | ||
| 214 | error.message); | ||
| 215 | dbus_error_free(&error); | ||
| 216 | return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; | ||
| 217 | } | ||
| 218 | |||
| 219 | if (name && strcmp(name, "org.freedesktop.login1") == 0) | ||
| 220 | FatalError("systemd-logind disappeared (stopped/restarted?)\n"); | ||
| 221 | |||
| 222 | return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; | ||
| 223 | } | ||
| 224 | |||
| 225 | if (strcmp(dbus_message_get_path(message), info->session) != 0) | ||
| 226 | return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; | ||
| 227 | |||
| 228 | if (dbus_message_is_signal(message, "org.freedesktop.login1.Session", | ||
| 229 | "PauseDevice")) { | ||
| 230 | if (!dbus_message_get_args(message, &error, | ||
| 231 | DBUS_TYPE_UINT32, &major, | ||
| 232 | <span class="hl kwb">-- </span> | ||
| 233 | 2.3.3 | ||
| 234 | </code></pre></td></tr></table> | ||
| 235 | </div> <!-- class=content --> | ||
| 236 | <div class="foot" style="padding-left:1em;padding-right:1em;"> | ||
| 237 | <p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org" | ||
| 238 | title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org" | ||
| 239 | title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo | ||
| 240 | are recognized trademarks. Some rights reserved. The registered trademark | ||
| 241 | Linux® is used pursuant to a sublicense from LMI, the exclusive licensee | ||
| 242 | of Linus Torvalds, owner of the mark on a world-wide basis.</p> | ||
| 243 | </div> | ||
| 244 | </div> <!-- id=cgit --> | ||
| 245 | </body> | ||
| 246 | </html> |