gentoo resync : 25.11.2020

3 files changed, 103 insertions, 1 deletions

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index abc6a1cffaf6..2d6ab791e62f 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -3,6 +3,7 @@ AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0
 AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
 AUX gvmd-8.0.1-sbin.patch 2224 BLAKE2B 84e13415d01e3ce996af11f3ffde68a803c8db0a25b9a13986fde763739be95c95a547078a0a65a4cdeb2256c2daf9ed022381ba75e681198071364d2bf40320 SHA512 3cf3d8d12650f6905eef7c5b2b73fef9e228c13330d85916ed52bbad2911dc186c81e25650fd0381e0c878d2712df063cd42f18ceb9e6c9afac908bc9a2d7980
 AUX gvmd-8.0.1-tmplock.patch 746 BLAKE2B afba3139cd18734d9d9b89b05e7e5a3120c44b5099463cfa74f26142c2a779f75e473b0742e21d86171b5026af0d834bbedb2fb61edb3d1b83711898c0b6fcf9 SHA512 d5b12df500cef0c598aba6d0489ec18d6882ad0c111dce970ae4268af79df9b0aba66a5c9148b91af0e579aa82afb397bab1daced11b6f0ab2918472181800b2
+AUX gvmd-9.0.1-glibc_siglist.patch 3599 BLAKE2B 91844507e01a3a7faa017ae98ae066b856993bfeaef7404fa884add53ccb8954eb7c3eebb74a1de1a01a6ec61960347595ba9418e9a2b814598288d488a92a03 SHA512 c3fb56954c55181cbfc52828a0d87703e237b945e5c5239b3dd429910d8a65ceef41b2ee7a7df522c8e9da9e86cd07fc383fb62fdccd73ab9380ae139fea2a7f
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
 AUX gvmd-startpre.sh 223 BLAKE2B 2b12ff7077464d089591e53c631c3b38f4d9351d98326ef65f50ef0501f165bc8393af86c21a3e9663464526dcd2b435eb1a89ba3a05946cb862f959d3efe5d7 SHA512 d532037beb7b05037c136c5b7d7bcea65d166d11c4eb3c580fdabd4a99b110d230b67f633a9661674d3186c09baaf50089b222c7c17e57b4c0a234a4470af531
 AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d
@@ -11,5 +12,5 @@ AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c5665
 DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
 DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
 EBUILD gvmd-8.0.1.ebuild 2896 BLAKE2B b882c80f53ac49d1ed63f9666a124dd16c2f391587de6b23256e4105cab6549973b97dc83f0afdd24506b139059dd0c9cebd943845bc8db895291f78889c681e SHA512 527c8838fed46ee3b851b6edfdf62243e2b64c99dea52e84f345391f124e783266ba21656295b5b9688c1f2cfa2b732fffc7c34c6fdd0a010cf7a39daa17b7b8
-EBUILD gvmd-9.0.1.ebuild 2728 BLAKE2B b22f1f879f7290657d4e49f0314e2fb81bd80e02e6383a0dcffc764a72e8883cc6d65b97846b9de2c28d46de4e97490334b52e1fd685706beea78a0addf795c1 SHA512 88b4d1d6266db00cd2b5ca7530d0746b54414963372c5537a3b19ed661ba5ae2cbba56ccc2ac90f80a5b35e09a8332ca184f41550e2942c72d3a26e663200e42
+EBUILD gvmd-9.0.1.ebuild 2837 BLAKE2B 2cdae3d6192e4cf4ba8f10a0e6d706d7f0c40173f5271209716e01f050c7e19f16eeefddf66520245db56c2288948a86f42b9d8d565ae6ddb72bc8626785a383 SHA512 9d2c0ff8c0ae32a300f98e5e51e429b253b71fec9f6d6c2a6134b856c86fa650622fead51009588e7b39a95d693058ea0af3be41cbbb5e94ff47ff2a316f9dc3
 MISC metadata.xml 1043 BLAKE2B 589df7f1076a8797197ce4446df8030e6529db7abb704d5638059bb6f1b381cf80a609c08812434a2cfa17225b1f9b267a145b9358b2304de1be3dcd7d9b5c7b SHA512 3f0bc3b7bf085c5d86b2ac0c7671658955fb0951104f1fe308826a4100fe3ee56b6cf31a5f34e57ee0d7c4c02ce2d062e6e93b1eea1f2c72bfc70ab500b4d8ed
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
new file mode 100644
index 000000000000..186bd882bdd8
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
@@ -0,0 +1,96 @@
+From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Tue, 1 Sep 2020 10:03:34 +0200
+Subject: [PATCH] Replace deprecated sys_siglist with strsignal
+
+Required to work with glibc >= 2.32.
+
+https://sourceware.org/pipermail/libc-announce/2020/000029.html
+
+  The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
+  are no longer available to newly linked binaries, and their declarations
+  have been removed from <string.h>. They are exported solely as
+  compatibility symbols to support old binaries. All programs should use
+  strsignal instead.
+
+--- ./src/manage.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage.c	2020-10-27 13:32:20.423421085 +0100
+@@ -3283,7 +3283,7 @@
+               {
+                 g_debug ("%s: Received %s signal.",
+                          __FUNCTION__,
+-                         sys_siglist[get_termination_signal()]);
++                         strsignal(get_termination_signal()));
+               }
+             if (global_current_report)
+               {
+@@ -3305,7 +3305,7 @@
+         {
+           g_debug ("%s: Received %s signal.",
+                    __FUNCTION__,
+-                   sys_siglist[get_termination_signal()]);
++                   strsignal(get_termination_signal()));
+           if (global_current_report)
+             {
+               set_report_scan_run_status (global_current_report,
+--- ./src/gvmd.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/gvmd.c	2020-10-27 13:34:47.606424207 +0100
+@@ -922,7 +922,7 @@
+   if (sigaction (signal, &action, NULL) == -1)
+     {
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(termination_signal));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -953,7 +953,7 @@
+   if (sigaction (signal, &action, NULL) == -1)
+     {
+       g_critical ("%s: failed to register %s handler",
+-                  __FUNCTION__, sys_siglist[signal]);
++                  __FUNCTION__, strsignal(termination_signal));
+       exit (EXIT_FAILURE);
+     }
+ }
+@@ -1258,7 +1258,7 @@
+       if (termination_signal)
+         {
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
+           cleanup ();
+           /* Raise signal again, to exit with the correct return value. */
+           setup_signal_handler (termination_signal, SIG_DFL, 0);
+@@ -1347,7 +1347,7 @@
+       if (termination_signal)
+         {
+           g_debug ("Received %s signal",
+-                   sys_siglist[termination_signal]);
++                   strsignal(termination_signal));
+           cleanup ();
+           /* Raise signal again, to exit with the correct return value. */
+           setup_signal_handler (termination_signal, SIG_DFL, 0);
+--- ./src/manage_sql.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage_sql.c	2020-10-27 13:36:19.071426148 +0100
+@@ -18711,7 +18711,7 @@
+ void
+ manage_cleanup_process_error (int signal)
+ {
+-  g_debug ("Received %s signal", sys_siglist[signal]);
++  g_debug ("Received %s signal", strsignal(signal));
+   if (sql_is_open ())
+     {
+       if (current_scanner_task)
+--- ./src/gmpd.c	2020-05-12 18:54:26.000000000 +0200
++++ ./src/gmpd.c	2020-10-27 13:46:29.687439101 +0100
+@@ -496,8 +496,7 @@
+         {
+           g_debug ("%s: Received %s signal.",
+                    __FUNCTION__,
+-                   sys_siglist[get_termination_signal()]);
+-
++                   strsignal(get_termination_signal()));
+           goto client_free;
+         }
+ 
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
index 837980d8e687..b48b9a9102a3 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@@ -45,6 +45,11 @@ BDEPEND="
 	)
 	test? ( dev-libs/cgreen )"
 
+PATCHES=(
+	# Replace deprecated glibc sys_siglist with strsignal 
+	"${FILESDIR}/${P}-glibc_siglist.patch"
+)
+
 src_prepare() {
 	cmake_src_prepare
 	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0