diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-07 13:09:02 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-02-07 13:09:02 +0100 |
| commit | 2f8b190c8c2d3d56b52cb86d9824bba11b9beb99 (patch) | |
| tree | 9a72b61aa686fb696ef2153e5ee7d8bd38a5c126 | |
| parent | 6ae5c16b8865d14ba034c836a76c7a059d8865c0 (diff) | |
| download | nx-libs-2f8b190c8c2d3d56b52cb86d9824bba11b9beb99.tar.gz nx-libs-2f8b190c8c2d3d56b52cb86d9824bba11b9beb99.tar.bz2 nx-libs-2f8b190c8c2d3d56b52cb86d9824bba11b9beb99.zip | |
Reintroduce patch: 008_nxcomp_sa_restorer.full+lite.patch, now in a version found on etersoft.ru, fixes build on ia64 architecture.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/008_nxcomp_sa_restorer.full+lite.patch | 46 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b0e8fc27a..59d305cc3 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@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 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); + diff --git a/debian/patches/series b/debian/patches/series index 92917666d..9133bf604 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 |