gentoo resync : 05.02.2020

5 files changed, 48 insertions, 5 deletions

diff --git a/net-analyzer/mk-livestatus/Manifest b/net-analyzer/mk-livestatus/Manifest
index d2f922c2e752..5f75ef3cde4d 100644
--- a/net-analyzer/mk-livestatus/Manifest
+++ b/net-analyzer/mk-livestatus/Manifest
@@ -1,5 +1,7 @@
 AUX 1.2.8_p10-MEDIUM-Drop-default-strip.patch 812 BLAKE2B f02aee31116dede718ef3671fe86b228ce3031f01fad987ed8622e7e434747e07fc535798f9c5122125f951257a7446f76fc42f7b1f063cc1b5897eeca0cfbf2 SHA512 6fc48bbda7b235e50fb7cfa1298b9c7a2c6730e14639371a811febf84c2f7ed30d43cef6e54c794c50dc2e78fba5ead8a3a5c852bc1d605d5d202c92527242cf
 AUX 1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch 1111 BLAKE2B fb036de5371602ad2ef36ad4916d2f6193a8e8fef4ea2adebe1ace6225ae9c76ffc3ec72ec6649b3ed45e423e3cf6351f86d82d0f524c1a6842066f1e43be99e SHA512 162daa81e2122dfd806e3227b3d22775fa3c36d97e92ce638328e46b99d54d2ff9c1ee51b525677a48a40c180ee0cac2c5c8fbcf50bebdb2f6a18ff836310404
+AUX mk-livestatus-1.2.8_p26-fno-common.patch 671 BLAKE2B a0f49e00c040cc8fab5bc343042195d62087172c549d331375d51832a3234e56cff09a0f0c3c9a53ddeb7e824db26084ac16ce7051d1c4bc885e4d8610ebae06 SHA512 067b1c5af81ff668dda6a713306bedb9b3c6795a1bc146988ff9f351a62cb39cea889bfe77474a918ab69c8f97fee506372ff3115deabea400ced605e60f0520
+AUX mk-livestatus-1.2.8_p26-rm.patch 254 BLAKE2B 789318a34cbedb65595e930c3e9c3f3a641d581cc1f9045c54445f501c8173475bb4fef49bc16352749036ceff380e81c83e18aff386150ed85014ef8d490bf2 SHA512 df8b7337206922a7aa5f980e19a5f1d4b0a8a92d5b0603339a7437d5eb4a78a3a3148d9c27f84869d91e73b42b7aa18e2c3868650efe179cc856cb90491f392c
 AUX mk-livestatus-1.5.0_p22-rm.patch 306 BLAKE2B ac45ad1c89a8a067cf780ae13d24a50e4a983c619846ee1e6dcc5a56e3fe8d541b82b8a3f14e7b32f934acefdaa8890635e1745a6e7f17e04f46dd603e461803 SHA512 b172fbd35f7d9b06017bf9df56f8c8ec106f1d71e77dbf6a6a55d974dcf4ccf3548379164c7b4fdac8c1b28456268433d061049c0d2781d9cf3434682e32ebb7
 DIST mk-livestatus-1.2.8p10.tar.gz 453496 BLAKE2B 5c6cb41dff2d3cc29837088c18c6f7e4bfa6a5a9a3802adafe86fb28523bfc8037fc0c69770861612568db5fc8b61569663c3033201c6293b6da2dba3de55100 SHA512 ff25c2a8d0105fdd156bc922b56df10e3497361620671dc73242db0a7b57fbd34955b5f4fbd9954602c8011b1f6a5ebd4e278df7c3e66639d74110fd0035682d
 DIST mk-livestatus-1.2.8p16.tar.gz 453565 BLAKE2B 73b4f2d245740e9427af391691a3873b2930bbef1de2b147cefdde1b84f24e7acf61aa748a8adaad4290c77d9b1c7aef7540c69d44c420522c5d56115127b49b SHA512 32d4bc014c008ac7afbdca53e6b3e0d71f8eee5f41f4a0299a8e14cee2a1ea93216fe04c4ff9aa7d7b927dde8e63d186f09a2847665851f1063e699cf73a8df4
@@ -7,6 +9,6 @@ DIST mk-livestatus-1.2.8p26.tar.gz 453508 BLAKE2B 75338c65b2c323d4ef2637ef2507f6
 DIST mk-livestatus-1.5.0p22.tar.gz 477418 BLAKE2B fcb33852fafd6ddbbae5fc2989dd694200dc046386e3add07afed0051c2299828afdd13c7e13a862edf10ecd25d522817d1248b05b0bc73cce4e6f4962ec0f1d SHA512 a689d20230651e4cc6708f678fda9c34a4834b68580bff3b012eb7ec7ff2bbd70dff85121e73665ab0266831f36338bd0976731f7d4a68a2595757dccbcac9b6
 EBUILD mk-livestatus-1.2.8_p10.ebuild 2680 BLAKE2B 728452886719f88780462c99d9f946028b5d19efeae9b9838bc4a65bc6b3d8237938cb7b6d7dd499c442ace03390aee0f93932409ab9f92afcf73c69abfa0bea SHA512 ccf4d955a9d2e250e4c6b2f1619ced6eb54486a45f4f19a47717eae2217d2372a177caa6e45b85de3711bd15c977700a2d6fc9860f1a640c1e3f049c07d78d8b
 EBUILD mk-livestatus-1.2.8_p16.ebuild 3422 BLAKE2B b74281fdd86bb819ead989d84c3feb3dbf3d7d24fdd4dd8ff723445dfe94e30b3cf3daf25acb8da3549d5c907524df1605cfe51679cf02d17fbc12b6552dfbc3 SHA512 af5de45ec84d07af5c10b47b74e2e4f752cb85a913981d3c4a0ed4202c781506148314959dc8e360d92c94d944dc956b5e5c2268f563d26e3432fc33c644edab
-EBUILD mk-livestatus-1.2.8_p26.ebuild 3390 BLAKE2B 380082a961401822aa98abc221becf7bc7fae44bf2064e41f4847ee218f746b82bf83b79533e4a6061ad869e79674acd3f1468f11df4fc99c13db60183e9559a SHA512 fe3029d2dc50db99c3be8407befca9023bb83cdcbffdab82fe671cbbc60cb71c17fd32257f752b4f93be8f728f3698a76273d316409dffc9ae314e48141bb156
-EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3564 BLAKE2B ab61245038fdd308462b21281e73670bcd0ec64a7e18a6afffdcc3df1fc3bbb8d1e93b13967626b8bd5721faa8777df29ecde3a1a75b75dd141746e789cf2a7f SHA512 ab4458b4797ba6171314863018b4020538e85d355197fb760f557ef249bdc2eb66f724d727fe1bb9e482bba5dbe7eb9785a319d3ba2bc342722cf46aafb798d6
+EBUILD mk-livestatus-1.2.8_p26-r1.ebuild 3458 BLAKE2B 377a5248a9c79b7a5b372ca17fd3589c1a503c7bee8d0f6fd1c0fe7763be532d000aea495eecd9332db5000a220edb6f08997380b993fd8e59693d15ca381f2a SHA512 e4ebf2170393ca705be4defbd6a439b139bdde80e87bf357981b5cbef0283708f270b05f74e47bc6a42dd6bc385d4a4e6a7a09250d64d874280b497dc2a97126
+EBUILD mk-livestatus-1.5.0_p22-r1.ebuild 3562 BLAKE2B 26e5dbf7ab2d0fba9d357f55dbcf665d510f1a9f27aa2f2827711224d44524a462106b3e39aa091e8ab8009db1d404ed6a0a0e8e4fb8b526d182f8a5ce652d9c SHA512 0a7854b54d63c01473f07a01ab5888d3b0fa62288599ecb552142123a9154af15c5697deb7c36c7e13c8910f976e86f553f7bf65b19f9196965df4fce8dcc328
 MISC metadata.xml 764 BLAKE2B 6cdc02ae09a5f2ee8264648a31feaddce015eaa21824d2466462dc359ca4b9eff656d6714e6e7bed8b6312d10a8e89712287417fee55cd8bf1707f5837849298 SHA512 a113631d9036af5c65ecd6ab393ecd14af3c05511f8c99adac6106a7f54ec172c2bd86eaa5289021baebdb65c62d1f26e72a13ae47aab8245e4e4da8f19142e2
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
new file mode 100644
index 000000000000..e0dc8469c15a
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-fno-common.patch
@@ -0,0 +1,29 @@
+--- a/src/logger.h
++++ b/src/logger.h
+@@ -27,6 +27,7 @@
+ 
+ #include "config.h"  // IWYU pragma: keep
+ #include <syslog.h>
++#include <pthread.h>
+ 
+ #ifdef CMC
+ #define LG_DEBUG LOG_INFO
+@@ -49,6 +50,8 @@
+ extern "C" {
+ #endif
+ 
++extern pthread_t g_mainthread_id;
++
+ void logger(int priority, const char *loginfo, ...)
+     __attribute__((format(printf, 2, 3)));
+ void open_logfile();
+--- a/src/module.c
++++ b/src/module.c
+@@ -95,7 +95,6 @@
+ char g_logfile_path[4096];
+ int g_debug_level = 0;
+ int g_should_terminate = false;
+-pthread_t g_mainthread_id;
+ pthread_t *g_clientthread_id;
+ unsigned long g_max_cached_messages = 500000;
+ unsigned long g_max_lines_per_logfile =
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
new file mode 100644
index 000000000000..abdb2e01691b
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.8_p26-rm.patch
@@ -0,0 +1,10 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -62,7 +62,6 @@
+ install-data-local:
+ 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
+ 	$(INSTALL_PROGRAM) livestatus.o $(DESTDIR)$(pkglibdir)
+-	rm -f $(DESTDIR)$(pkglibdir)/livestatus.so
+ 
+ clean-local:
+ 	rm -f *~
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
index a1b4fa136b85..481cb302ca67 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p26-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -58,6 +58,8 @@ S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	"${FILESDIR}/1.2.8_p10-MEDIUM-Drop-default-strip.patch"
 	"${FILESDIR}/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch"
+	"${FILESDIR}"/${PN}-1.2.8_p26-fno-common.patch
+	"${FILESDIR}"/${PN}-1.2.8_p26-rm.patch
 )
 
 src_prepare() {
@@ -140,7 +142,7 @@ EOF
 	fi
 
 	if use python; then
-		python_foreach_impl python_domodule api/python/livestatus.py
+		python_domodule api/python/livestatus.py
 
 		if use examples; then
 			docinto /
diff --git a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
index 658d951078ac..a0d42e5b3a7e 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.5.0_p22-r1.ebuild
@@ -120,7 +120,7 @@ src_install() {
 	cat <<EOF >"${T}"/nagios.cfg
 # Ensure all data is set to event brokers
 event_broker_options=-1
-broker_module=${EPREFIX%/}/usr/$(get_libdir)/${PN}/livestatus.o
+broker_module=${EPREFIX}/usr/$(get_libdir)/${PN}/livestatus.o
 EOF
 	# same for icinga
 	cat <<EOF >"${T}"/icinga.cfg