aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/011_nxcomp_sa-restorer.patch25
-rw-r--r--debian/patches/series1
3 files changed, 27 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 0a16fd5c9..a06a5102b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,7 @@ nx-libs (2:3.5.0-2) UNRELEASED; urgency=low
* Fix linking of doc folders for nxcomp*-dev.
* Transfer patch: 009_nxproxy_add-man-page.patch into man page file
in /debian/man.
+ * Add patch: 011_nxcomp_sa-restorer.patch.
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 28 Dec 2011 19:06:26 +0100
diff --git a/debian/patches/011_nxcomp_sa-restorer.patch b/debian/patches/011_nxcomp_sa-restorer.patch
new file mode 100644
index 000000000..de603d60d
--- /dev/null
+++ b/debian/patches/011_nxcomp_sa-restorer.patch
@@ -0,0 +1,25 @@
+Description: sa_restorer vs. memset
+ Use memset instead of setting .sa_restorer to NULL.
+Forwarded: not-yet
+Author: Stéphane Graber <stgraber@ubuntu.com>
+Last-Update: 2011-12-31
+--- a/Loop.cpp
++++ b/Loop.cpp
+@@ -5895,7 +5895,7 @@ void InstallSignal(int signal, int action)
+
+ #if defined(__linux__)
+
+- newAction.sa_restorer = NULL;
++ memset(&newAction, NULL, sizeof(newAction));
+
+ #endif
+
+@@ -6513,7 +6513,7 @@ void SetTimer(int value)
+
+ #if defined(__linux__)
+
+- action.sa_restorer = NULL;
++ memset(&action, NULL, sizeof(action));
+
+ #endif
+
diff --git a/debian/patches/series b/debian/patches/series
index 2ef9a4075..fd8c02c83 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@
004_nx-x11_fix-nxcompshad-build.patch
007_nxcompshad_clean-gch-files.patch
010_nxauth_fix-binary-name-in-man-page.patch
+011_nxcomp_sa-restorer.patch
012_nxcomp_makefile-uninstall.patch
013_nxcompext_makefile-uninstall.patch
014_nxcompshad_makefile-uninstall.patch