[X2go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.9-4-g2f8b190

[X2go dev team]

The branch, master has been updated
       via  2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (commit)
      from  6ae5c16b8865d14ba034c836a76c7a059d8865c0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 7 13:09:02 2012 +0100

    Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a version found on etersoft.ru, fixes build on ia64 architecture.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                                   |    2 +
 .../patches/008_nxcomp_sa_restorer.full+lite.patch |   46 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 49 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/008_nxcomp_sa_restorer.full+lite.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b0e8fc2..59d305c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ nx-libs (2:3.5.0.10) UNRELEASED; urgency=low
 
   * Add patch: 006_nxcomp_libpng15.full+lite.patch, fix build against
     libpng 1.5.x.
+  * Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a
+    version found on etersoft.ru, fixes build on ia64 architecture.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 01 Feb 2012 14:48:31 +0100
 
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 0000000..f1447cc
--- /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);
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9291766..9133bf6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
 005_nxcomp_gcc43.full+lite.patch
 006_nxcomp_libpng15.full+lite.patch
 007_nxcompshad_clean-gch-files.full.patch
+008_nxcomp_sa_restorer.full+lite.patch
 009_nxproxy-add-man-page.full+lite.patch
 009_nxagent-add-man-page.full.patch
 010_nxauth_fix-binary-name-in-man-page.full.patch


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).