From a0b2fd836883e8ec429d5f31779c61f31b1a204d Mon Sep 17 00:00:00 2001 From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon, 9 Feb 2015 14:20:22 +0100 Subject: sa_restorer vs. memset (008_nxcomp_sa-restorer.full+lite.patch). Use memset instead of setting sa_restorer to NULL. Original-Author: Alexander Morozov --- .../patches/008_nxcomp_sa-restorer.full+lite.patch | 46 ---------------------- debian/patches/series | 1 - 2 files changed, 47 deletions(-) delete mode 100644 debian/patches/008_nxcomp_sa-restorer.full+lite.patch (limited to 'debian/patches') diff --git a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch b/debian/patches/008_nxcomp_sa-restorer.full+lite.patch deleted file mode 100644 index f1447ccb0..000000000 --- a/debian/patches/008_nxcomp_sa-restorer.full+lite.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 81a71d3a1..9f56169bf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -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 -- cgit v1.2.3