Merge branch '3.6.x'

1 files changed, 0 insertions, 24 deletions

diff --git a/debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch b/debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch
deleted file mode 100644
index a2dcdd653..000000000
--- a/debian/patches/1002-Fix-CVE-2011-4028-File-disclosure-vulnerability.full.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From df4a3b7270539843ae76275485ca76efcdf361d9 Mon Sep 17 00:00:00 2001
-From: Mike DePaulo <mikedep333@gmail.com>
-Date: Sun, 8 Feb 2015 19:16:38 -0500
-Subject: [PATCH 02/40] Fix CVE-2011-4028: File disclosure vulnerability.
- upstream xorg/xserver commit 6ba44b91e37622ef8c146d8f2ac92d708a18ed34
-
-use O_NOFOLLOW to open the existing lock file, so symbolic links
-aren't followed, thus avoid revealing if it point to an existing
-file.
----
- nx-X11/programs/Xserver/os/utils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/nx-X11/programs/Xserver/os/utils.c
-+++ b/nx-X11/programs/Xserver/os/utils.c
-@@ -483,7 +483,7 @@ LockServer(void)
-       /*
-        * Read the pid from the existing file
-        */
--      lfd = open(LockFile, O_RDONLY);
-+      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
-       if (lfd < 0) {
-         unlink(tmp);
-         FatalError("Can't read lock file %s\n", LockFile);