1 |
commit: e20fff237b4292f8f82d57e7dbbfcc8a32c675e7 |
2 |
Author: CyriusGentoo <cyrius <AT> linog-consulting <DOT> com> |
3 |
AuthorDate: Tue Oct 27 18:44:31 2020 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 28 07:51:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20fff23 |
7 |
|
8 |
net-analyzer/gvmd: Replace deprecated sys_siglist with strsignal |
9 |
|
10 |
Signed-off-by: François Logier <cyrius <AT> linog-consulting.com> |
11 |
Closes: https://bugs.gentoo.org/740558 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18050 |
13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
14 |
|
15 |
.../gvmd/files/gvmd-9.0.1-glibc_siglist.patch | 82 ++++++++++++++++++++++ |
16 |
net-analyzer/gvmd/gvmd-9.0.1.ebuild | 5 ++ |
17 |
2 files changed, 87 insertions(+) |
18 |
|
19 |
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..6b8ed7dfe1c |
22 |
--- /dev/null |
23 |
+++ b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch |
24 |
@@ -0,0 +1,82 @@ |
25 |
+# Solve Gentoo Bug 740558 : Replace deprecated sys_siglist with strsignal |
26 |
+--- ./src/manage.c 2020-05-12 18:54:26.000000000 +0200 |
27 |
++++ ./src/manage.c 2020-10-27 13:32:20.423421085 +0100 |
28 |
+@@ -3283,7 +3283,7 @@ |
29 |
+ { |
30 |
+ g_debug ("%s: Received %s signal.", |
31 |
+ __FUNCTION__, |
32 |
+- sys_siglist[get_termination_signal()]); |
33 |
++ strsignal(get_termination_signal())); |
34 |
+ } |
35 |
+ if (global_current_report) |
36 |
+ { |
37 |
+@@ -3305,7 +3305,7 @@ |
38 |
+ { |
39 |
+ g_debug ("%s: Received %s signal.", |
40 |
+ __FUNCTION__, |
41 |
+- sys_siglist[get_termination_signal()]); |
42 |
++ strsignal(get_termination_signal())); |
43 |
+ if (global_current_report) |
44 |
+ { |
45 |
+ set_report_scan_run_status (global_current_report, |
46 |
+--- ./src/gvmd.c 2020-05-12 18:54:26.000000000 +0200 |
47 |
++++ ./src/gvmd.c 2020-10-27 13:34:47.606424207 +0100 |
48 |
+@@ -922,7 +922,7 @@ |
49 |
+ if (sigaction (signal, &action, NULL) == -1) |
50 |
+ { |
51 |
+ g_critical ("%s: failed to register %s handler", |
52 |
+- __FUNCTION__, sys_siglist[signal]); |
53 |
++ __FUNCTION__, strsignal(termination_signal)); |
54 |
+ exit (EXIT_FAILURE); |
55 |
+ } |
56 |
+ } |
57 |
+@@ -953,7 +953,7 @@ |
58 |
+ if (sigaction (signal, &action, NULL) == -1) |
59 |
+ { |
60 |
+ g_critical ("%s: failed to register %s handler", |
61 |
+- __FUNCTION__, sys_siglist[signal]); |
62 |
++ __FUNCTION__, strsignal(termination_signal)); |
63 |
+ exit (EXIT_FAILURE); |
64 |
+ } |
65 |
+ } |
66 |
+@@ -1258,7 +1258,7 @@ |
67 |
+ if (termination_signal) |
68 |
+ { |
69 |
+ g_debug ("Received %s signal", |
70 |
+- sys_siglist[termination_signal]); |
71 |
++ strsignal(termination_signal)); |
72 |
+ cleanup (); |
73 |
+ /* Raise signal again, to exit with the correct return value. */ |
74 |
+ setup_signal_handler (termination_signal, SIG_DFL, 0); |
75 |
+@@ -1347,7 +1347,7 @@ |
76 |
+ if (termination_signal) |
77 |
+ { |
78 |
+ g_debug ("Received %s signal", |
79 |
+- sys_siglist[termination_signal]); |
80 |
++ strsignal(termination_signal)); |
81 |
+ cleanup (); |
82 |
+ /* Raise signal again, to exit with the correct return value. */ |
83 |
+ setup_signal_handler (termination_signal, SIG_DFL, 0); |
84 |
+--- ./src/manage_sql.c 2020-05-12 18:54:26.000000000 +0200 |
85 |
++++ ./src/manage_sql.c 2020-10-27 13:36:19.071426148 +0100 |
86 |
+@@ -18711,7 +18711,7 @@ |
87 |
+ void |
88 |
+ manage_cleanup_process_error (int signal) |
89 |
+ { |
90 |
+- g_debug ("Received %s signal", sys_siglist[signal]); |
91 |
++ g_debug ("Received %s signal", strsignal(signal)); |
92 |
+ if (sql_is_open ()) |
93 |
+ { |
94 |
+ if (current_scanner_task) |
95 |
+--- ./src/gmpd.c 2020-05-12 18:54:26.000000000 +0200 |
96 |
++++ ./src/gmpd.c 2020-10-27 13:46:29.687439101 +0100 |
97 |
+@@ -496,8 +496,7 @@ |
98 |
+ { |
99 |
+ g_debug ("%s: Received %s signal.", |
100 |
+ __FUNCTION__, |
101 |
+- sys_siglist[get_termination_signal()]); |
102 |
+- |
103 |
++ strsignal(get_termination_signal())); |
104 |
+ goto client_free; |
105 |
+ } |
106 |
+ |
107 |
|
108 |
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild |
109 |
index 837980d8e68..b48b9a9102a 100644 |
110 |
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild |
111 |
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild |
112 |
@@ -45,6 +45,11 @@ BDEPEND=" |
113 |
) |
114 |
test? ( dev-libs/cgreen )" |
115 |
|
116 |
+PATCHES=( |
117 |
+ # Replace deprecated glibc sys_siglist with strsignal |
118 |
+ "${FILESDIR}/${P}-glibc_siglist.patch" |
119 |
+) |
120 |
+ |
121 |
src_prepare() { |
122 |
cmake_src_prepare |
123 |
# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0 |