Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-filter-out-non-signal-messages-from.patch

    Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-systemd-logind-filter-out-non-signal-messages-from.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From e90798c142dedc4fd296936b69fe34a40d0aa35a Mon Sep 17 00:00:00 2001
    2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: Ray Strode <rstrode@redhat.com>
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.10.2'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <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'/>  
     <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <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'>  
     <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <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>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     <a id='n31' href='#n31'>31</a>  
     <a id='n32' href='#n32'>32</a>  
     <a id='n33' href='#n33'>33</a>  
     <a id='n34' href='#n34'>34</a>  
     <a id='n35' href='#n35'>35</a>  
     <a id='n36' href='#n36'>36</a>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     <a id='n48' href='#n48'>48</a>  
     <a id='n49' href='#n49'>49</a>  
     <a id='n50' href='#n50'>50</a>  
     <a id='n51' href='#n51'>51</a>  
     <a id='n52' href='#n52'>52</a>  
     <a id='n53' href='#n53'>53</a>  
     <a id='n54' href='#n54'>54</a>  
     <a id='n55' href='#n55'>55</a>  
     <a id='n56' href='#n56'>56</a>  
     <a id='n57' href='#n57'>57</a>  
     <a id='n58' href='#n58'>58</a>  
     <a id='n59' href='#n59'>59</a>  
     <a id='n60' href='#n60'>60</a>  
     <a id='n61' href='#n61'>61</a>  
     <a id='n62' href='#n62'>62</a>  
     <a id='n63' href='#n63'>63</a>  
     <a id='n64' href='#n64'>64</a>  
     <a id='n65' href='#n65'>65</a>  
     <a id='n66' href='#n66'>66</a>  
     <a id='n67' href='#n67'>67</a>  
     <a id='n68' href='#n68'>68</a>  
     <a id='n69' href='#n69'>69</a>  
     <a id='n70' href='#n70'>70</a>  
     <a id='n71' href='#n71'>71</a>  
     <a id='n72' href='#n72'>72</a>  
     <a id='n73' href='#n73'>73</a>  
     <a id='n74' href='#n74'>74</a>  
     <a id='n75' href='#n75'>75</a>  
     <a id='n76' href='#n76'>76</a>  
     <a id='n77' href='#n77'>77</a>  
     <a id='n78' href='#n78'>78</a>  
     <a id='n79' href='#n79'>79</a>  
     <a id='n80' href='#n80'>80</a>  
     <a id='n81' href='#n81'>81</a>  
     <a id='n82' href='#n82'>82</a>  
     <a id='n83' href='#n83'>83</a>  
     <a id='n84' href='#n84'>84</a>  
     <a id='n85' href='#n85'>85</a>  
     <a id='n86' href='#n86'>86</a>  
     <a id='n87' href='#n87'>87</a>  
     <a id='n88' href='#n88'>88</a>  
     <a id='n89' href='#n89'>89</a>  
     <a id='n90' href='#n90'>90</a>  
     </pre></td>  
     <td class='lines'><pre><code>From e90798c142dedc4fd296936b69fe34a40d0aa35a Mon Sep 17 00:00:00 2001  
     From: Ray Strode &lt;rstrode&#64;redhat.com&gt;  
    3  Date: Fri, 10 Apr 2015 14:19:50 -0400  Date: Fri, 10 Apr 2015 14:19:50 -0400
    4  Subject: [PATCH] systemd-logind: filter out non-signal messages from message  Subject: [PATCH] systemd-logind: filter out non-signal messages from message
    5   filter   filter
    # Line 157  This commit changes the message_filter f Line 14  This commit changes the message_filter f
    14  non-signal messages, including spurious message replies.  non-signal messages, including spurious message replies.
    15    
    16  https://bugzilla.redhat.com/show_bug.cgi?id=1209347  https://bugzilla.redhat.com/show_bug.cgi?id=1209347
    17  <span class="hl kwb">---</span>  ---
    18   hw/xfree86/os-support/linux/systemd-logind.c | 3 +++   hw/xfree86/os-support/linux/systemd-logind.c | 3 +++
    19   1 file changed, 3 insertions(+)   1 file changed, 3 insertions(+)
    20    
    21  diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c  diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c
    22  index 49758f4..57c87c0 100644  index 49758f4..57c87c0 100644
    23  <span class="hl kwb">--- a/hw/xfree86/os-support/linux/systemd-logind.c</span>  --- a/hw/xfree86/os-support/linux/systemd-logind.c
    24  <span class="hl kwa">+++ b/hw/xfree86/os-support/linux/systemd-logind.c</span>  +++ b/hw/xfree86/os-support/linux/systemd-logind.c
    25  &#64;&#64; -286,60 +286,63 &#64;&#64; systemd_logind_ack_pause(struct systemd_logind_info *info,  @@ -286,60 +286,63 @@ systemd_logind_ack_pause(struct systemd_logind_info *info,
    26                                          DBUS_TYPE_INVALID)) {                                          DBUS_TYPE_INVALID)) {
    27           LogMessage(X_ERROR, &quot;systemd-logind: out of memory\n&quot;);           LogMessage(X_ERROR, "systemd-logind: out of memory\n");
    28           goto cleanup;           goto cleanup;
    29       }       }
    30    
    31       reply = dbus_connection_send_with_reply_and_block(info-&gt;conn, msg,       reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
    32                                                         DBUS_TIMEOUT, &amp;error);                                                         DBUS_TIMEOUT, &error);
    33       if (!reply)       if (!reply)
    34           LogMessage(X_ERROR, &quot;systemd-logind: failed to ack pause: %s\n&quot;,           LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n",
    35                      error.message);                      error.message);
    36    
    37   cleanup:   cleanup:
    # Line 182  index 49758f4..57c87c0 100644 Line 39  index 49758f4..57c87c0 100644
    39           dbus_message_unref(msg);           dbus_message_unref(msg);
    40       if (reply)       if (reply)
    41           dbus_message_unref(reply);           dbus_message_unref(reply);
    42       dbus_error_free(&amp;error);       dbus_error_free(&error);
    43   }   }
    44    
    45   static DBusHandlerResult   static DBusHandlerResult
    # Line 196  index 49758f4..57c87c0 100644 Line 53  index 49758f4..57c87c0 100644
    53       dbus_int32_t major, minor;       dbus_int32_t major, minor;
    54       char *pause_str;       char *pause_str;
    55    
    56  <span class="hl kwa">+    if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)</span>  +    if (dbus_message_get_type (message) != DBUS_MESSAGE_TYPE_SIGNAL)
    57  <span class="hl kwa">+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;</span>  +        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    58  <span class="hl kwa">+</span>  +
    59       dbus_error_init(&amp;error);       dbus_error_init(&error);
    60    
    61       if (dbus_message_is_signal(message,       if (dbus_message_is_signal(message,
    62                                  &quot;org.freedesktop.DBus&quot;, &quot;NameOwnerChanged&quot;)) {                                  "org.freedesktop.DBus", "NameOwnerChanged")) {
    63           char *name, *old_owner, *new_owner;           char *name, *old_owner, *new_owner;
    64    
    65           dbus_message_get_args(message, &amp;error,           dbus_message_get_args(message, &error,
    66                                 DBUS_TYPE_STRING, &amp;name,                                 DBUS_TYPE_STRING, &name,
    67                                 DBUS_TYPE_STRING, &amp;old_owner,                                 DBUS_TYPE_STRING, &old_owner,
    68                                 DBUS_TYPE_STRING, &amp;new_owner, DBUS_TYPE_INVALID);                                 DBUS_TYPE_STRING, &new_owner, DBUS_TYPE_INVALID);
    69           if (dbus_error_is_set(&amp;error)) {           if (dbus_error_is_set(&error)) {
    70               LogMessage(X_ERROR, &quot;systemd-logind: NameOwnerChanged: %s\n&quot;,               LogMessage(X_ERROR, "systemd-logind: NameOwnerChanged: %s\n",
    71                          error.message);                          error.message);
    72               dbus_error_free(&amp;error);               dbus_error_free(&error);
    73               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;               return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    74           }           }
    75    
    76           if (name &amp;&amp; strcmp(name, &quot;org.freedesktop.login1&quot;) == 0)           if (name && strcmp(name, "org.freedesktop.login1") == 0)
    77               FatalError(&quot;systemd-logind disappeared (stopped/restarted?)\n&quot;);               FatalError("systemd-logind disappeared (stopped/restarted?)\n");
    78    
    79           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    80       }       }
    81    
    82       if (strcmp(dbus_message_get_path(message), info-&gt;session) != 0)       if (strcmp(dbus_message_get_path(message), info->session) != 0)
    83           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;           return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
    84    
    85       if (dbus_message_is_signal(message, &quot;org.freedesktop.login1.Session&quot;,       if (dbus_message_is_signal(message, "org.freedesktop.login1.Session",
    86                                  &quot;PauseDevice&quot;)) {                                  "PauseDevice")) {
    87           if (!dbus_message_get_args(message, &amp;error,           if (!dbus_message_get_args(message, &error,
    88                                  DBUS_TYPE_UINT32, &amp;major,                                  DBUS_TYPE_UINT32, &major,
    89  <span class="hl kwb">-- </span>  --
    90  2.3.3  2.3.3
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2575  
    changed lines
      Added in v.2576