wok-next annotate greenbone-security-assistant/stuff/patches/gsa.patch @ rev 20849
syslinux: prevent shell expansion, specify CONFIG_FILES
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sat Jun 23 17:39:19 2018 +0300 (2018-06-23) |
parents | |
children |
rev | line source |
---|---|
al@20384 | 1 Unsuccessful attempt to redefine G_LOG_FATAL_MASK: |
al@20384 | 2 |
al@20384 | 3 In file included from /usr/include/glib-2.0/glib.h:62:0, |
al@20384 | 4 from ${src}/src/gsad.c:62: |
al@20384 | 5 /usr/include/glib-2.0/glib/gmessages.h:70:0: error: "G_LOG_FATAL_MASK" redefined [-Werror] |
al@20384 | 6 #define G_LOG_FATAL_MASK (G_LOG_FLAG_RECURSION | G_LOG_LEVEL_ERROR) |
al@20384 | 7 |
al@20384 | 8 ${src}/src/gsad.c:54:0: note: this is the location of the previous definition |
al@20384 | 9 #define G_LOG_FATAL_MASK G_LOG_LEVEL_ERROR |
al@20384 | 10 |
al@20384 | 11 |
al@20384 | 12 --- a/src/gsad.c |
al@20384 | 13 +++ b/src/gsad.c |
al@20384 | 14 @@ -47,12 +47,6 @@ |
al@20384 | 15 * \verbinclude COPYING |
al@20384 | 16 */ |
al@20384 | 17 |
al@20384 | 18 -/** |
al@20384 | 19 - * @brief The Glib fatal mask, redefined to leave out G_LOG_FLAG_RECURSION. |
al@20384 | 20 - */ |
al@20384 | 21 -#undef G_LOG_FATAL_MASK |
al@20384 | 22 -#define G_LOG_FATAL_MASK G_LOG_LEVEL_ERROR |
al@20384 | 23 - |
al@20384 | 24 #define _GNU_SOURCE /* for strcasecmp */ |
al@20384 | 25 |
al@20384 | 26 #include <arpa/inet.h> |
al@20384 | 27 @@ -5095,7 +5089,7 @@ |
al@20384 | 28 setup_log_handlers (log_config); |
al@20384 | 29 /* Set to ensure that recursion is left out, in case two threads log |
al@20384 | 30 * concurrently. */ |
al@20384 | 31 - g_log_set_always_fatal (G_LOG_FATAL_MASK); |
al@20384 | 32 + g_log_set_always_fatal (G_LOG_LEVEL_ERROR); |
al@20384 | 33 |
al@20384 | 34 /* Finish processing the command line options. */ |
al@20384 | 35 |