aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-22 09:14:35 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2014-06-22 09:14:35 +0200
commitead0f653f9f44484b6fb8eb458538adbe0c7bebc (patch)
tree8ce417a32b956f420a6c51112ab2af9bfab0d8d8 /debian/patches/008_nxcomp_sa-restorer.full+lite.patch
parent53a0a47b87986eace410addd1af546e7f6925423 (diff)
downloadnx-libs-ead0f653f9f44484b6fb8eb458538adbe0c7bebc.tar.gz
nx-libs-ead0f653f9f44484b6fb8eb458538adbe0c7bebc.tar.bz2
nx-libs-ead0f653f9f44484b6fb8eb458538adbe0c7bebc.zip
Rename patches to match our naming scheme:
+ 008_nxcomp_sa-restorer.full+lite.patch + 009_nxagent_add-man-page.full.patch + 009_nxproxy_add-man-page.full+lite.patch + 056_nx-X11_Werror-format-security.full.patch + 209_x2goagent_add-man-page.full.patch + 220_nxproxy_bind-loopback-only.full+lite.patch
Diffstat (limited to 'debian/patches/008_nxcomp_sa-restorer.full+lite.patch')
-rw-r--r--debian/patches/008_nxcomp_sa-restorer.full+lite.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch b/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
new file mode 100644
index 000000000..f1447ccb0
--- /dev/null
+++ b/debian/patches/008_nxcomp_sa-restorer.full+lite.patch
@@ -0,0 +1,46 @@
+Description: sa_restorer vs. memset
+ Use memset instead of setting sa_restorer to NULL.
+Forwarded: pending
+Author: Alexander Morozov
+Last-Update: 2012-02-07
+--- a/nxcomp/Loop.cpp
++++ b/nxcomp/Loop.cpp
+@@ -5884,20 +5884,9 @@
+
+ struct sigaction newAction;
+
+- newAction.sa_handler = HandleSignal;
+-
+- //
+- // This field doesn't exist on most OSes except
+- // Linux. We keep setting the field to NULL to
+- // avoid side-effects in the case the field is
+- // a value return.
+- //
++ memset(&newAction, 0, sizeof(newAction));
+
+- #if defined(__linux__)
+-
+- newAction.sa_restorer = NULL;
+-
+- #endif
++ newAction.sa_handler = HandleSignal;
+
+ sigemptyset(&(newAction.sa_mask));
+
+@@ -6509,13 +6498,9 @@
+
+ struct sigaction action;
+
+- action.sa_handler = HandleTimer;
+-
+- #if defined(__linux__)
++ memset(&action, 0, sizeof(action));
+
+- action.sa_restorer = NULL;
+-
+- #endif
++ action.sa_handler = HandleTimer;
+
+ sigemptyset(&action.sa_mask);
+