[X2go-Commits] nx-libs.git - master (branch) updated: nxproxy/3.5.0-1-177-g2fe05f6

X2go dev team git-admin at x2go.org
Sat Dec 31 17:12:58 CET 2011


The branch, master has been updated
       via  2fe05f6adf04c394228b03f37920c60a7ed80ff8 (commit)
       via  6f30998ad933f78ff3d30ab4a69e5ab5c92a00cf (commit)
       via  448872e70311825ed1b19ff47bf06d7732968b98 (commit)
      from  82e5023ed4d48e179b0f999162e0294dd92f8478 (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 2fe05f6adf04c394228b03f37920c60a7ed80ff8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 17:12:52 2011 +0100

    patches/series cleanup

commit 6f30998ad933f78ff3d30ab4a69e5ab5c92a00cf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 17:12:20 2011 +0100

    Add/insert patch: 005_nxcomp_gcc43.patch.

commit 448872e70311825ed1b19ff47bf06d7732968b98
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 31 17:04:48 2011 +0100

    Add patch: 011_nxcomp_sa-restorer.patch.

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

Summary of changes:
 debian/changelog                            |    2 ++
 debian/patches/011_nxcomp_sa-restorer.patch |   25 +++++++++++++++++++++++++
 debian/patches/series                       |    3 ++-
 3 files changed, 29 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/011_nxcomp_sa-restorer.patch

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0a16fd5..efcdc66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ 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.
+  * Add/insert patch: 005_nxcomp_gcc43.patch.
 
  -- Mike Gabriel <mike.gabriel at 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 0000000..de603d6
--- /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 at 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 2ef9a40..5cdde23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,8 +2,10 @@
 002_nxcompshad_build-against-nx-x11-only.patch
 003_nxcompshad_gcc43.patch
 004_nx-x11_fix-nxcompshad-build.patch
+005_nxcomp_gcc43.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
@@ -15,7 +17,6 @@
 101_nxagent_set-rgb-path.patch
 102_xserver-xext_set-securitypolicy-path.patch
 103_nxagent_set-X0-config-path.patch
-#104_nxagent_enable_debug.patch
 105_nxagent_export-remote-keyboard-config.patch
 106_nxagent_utf8-copy-clipboard.patch
 107_nxagent_clipboard-compound-text+small-bed-sheets.patch


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

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 libraries).




More information about the x2go-commits mailing list