diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-02-26 08:14:28 +0100 |
commit | abd6cf1bdd661f126af2a721cb3f467f3a6db9f7 (patch) | |
tree | aa109d560c5c340aa537c1e59b866be5acd62205 /doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch | |
parent | 2eb85d140fdd582e6bf7086f0bbba08fa58c836c (diff) | |
download | nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.gz nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.tar.bz2 nx-libs-abd6cf1bdd661f126af2a721cb3f467f3a6db9f7.zip |
rename original NX patches, so that we can see the patched file's name in the patch file name.
Diffstat (limited to 'doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch')
-rw-r--r-- | doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch b/doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch deleted file mode 100644 index 84c5b130a..000000000 --- a/doc/nx-X11_vs_XOrg69_patches/NXextension.c.NX.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- ./nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c.X.original 2015-02-13 14:03:44.744441510 +0100 -+++ ./nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c 2015-02-10 19:13:13.804685886 +0100 -@@ -1,3 +1,20 @@ -+/**************************************************************************/ -+/* */ -+/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ -+/* */ -+/* NXAGENT, NX protocol compression and NX extensions to this software */ -+/* are copyright of NoMachine. Redistribution and use of the present */ -+/* software is allowed according to terms specified in the file LICENSE */ -+/* which comes in the source distribution. */ -+/* */ -+/* Check http://www.nomachine.com/licensing.html for applicability. */ -+/* */ -+/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -+/* */ -+/* All rights reserved. */ -+/* */ -+/**************************************************************************/ -+ - /* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.11 2001/12/14 19:59:31 dawes Exp $ */ - /*********************************************************** - -@@ -60,7 +77,7 @@ - #include "extnsionst.h" - #include "gcstruct.h" - #include "scrnintstr.h" --#include "dispatch.h" -+#include "../../dix/dispatch.h" - #ifdef XCSECURITY - #define _SECURITY_SERVER - #include <X11/extensions/security.h> -@@ -69,6 +86,8 @@ - #include "lbxserve.h" - #endif - -+#include "Trap.h" -+ - #define EXTENSION_BASE 128 - #define EXTENSION_EVENT_BASE 64 - #define LAST_EVENT 128 -@@ -324,6 +343,13 @@ - { - i = FindExtension((char *)&stuff[1], stuff->nbytes); - if (i < 0 -+ -+ /* -+ * Hide RENDER if our implementation -+ * is faulty. -+ */ -+ -+ || (nxagentRenderTrap && strcmp(extensions[i]->name, "RENDER") == 0) - #ifdef XCSECURITY - /* don't show insecure extensions to untrusted clients */ - || (client->trustLevel == XSecurityClientUntrusted && -@@ -370,6 +396,14 @@ - !extensions[i]->secure) - continue; - #endif -+ /* -+ * Hide RENDER if our implementation -+ * is faulty. -+ */ -+ -+ if (nxagentRenderTrap && strcmp(extensions[i]->name, "RENDER") == 0) -+ continue; -+ - total_length += strlen(extensions[i]->name) + 1; - reply.nExtensions += 1 + extensions[i]->num_aliases; - for (j = extensions[i]->num_aliases; --j >= 0;) |