From 185fa19bbf68a4d4dca534d2b46729207a177f16 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 11 May 2021 19:55:43 +0100 Subject: gentoo resync : 11.05.2021 --- app-admin/syslog-ng/Manifest | 10 +- .../files/patches/syslog-ng-fno-common.patch | 320 --------------------- .../patches/syslog-ng-glib-2.64-support.patch | 63 ---- app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild | 170 ----------- app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild | 171 ----------- app-admin/syslog-ng/syslog-ng-3.29.1.ebuild | 171 ----------- app-admin/syslog-ng/syslog-ng-3.31.2.ebuild | 172 +++++++++++ 7 files changed, 174 insertions(+), 903 deletions(-) delete mode 100644 app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch delete mode 100644 app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch delete mode 100644 app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild delete mode 100644 app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild delete mode 100644 app-admin/syslog-ng/syslog-ng-3.29.1.ebuild create mode 100644 app-admin/syslog-ng/syslog-ng-3.31.2.ebuild (limited to 'app-admin/syslog-ng') diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index aad4044f9137..3a9860506378 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,6 +1,4 @@ AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e -AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f -AUX patches/syslog-ng-glib-2.64-support.patch 2751 BLAKE2B bf80fb569292f4a467b3fcc39776943e847d1900bda7e80d7f279259a8f82b9b4c9f85d06bca5629c69a0ca0aedfe955017718d96094e48603a387f73af82476 SHA512 1eead04652764352f9ef0064ecec4b408b4fe8f9cf94c2e9f1a985b6383de0e1098df9bf2dcd352aeb17dd6dae2cda8313a1bfc0a70b2cf56bf8f323bbe1f169 AUX syslog-ng-3.28.1-net-snmp.patch 292 BLAKE2B 7833709af12ab6531596bdb3b2c327fd2df3a5da3e3b00a597926f5bc5a1053dd2f37dbf0e89784946e169b9d3408c26da84b5355a309b76e424fc48f07ae4b6 SHA512 3b4b62b6e10fcca501891ce878202f1171c8f6bbd69098215015d1a9a1c571e11aa2d8d83d35145f0b5da9c6231952758b60a7116160d64d995d5b2b870b1904 AUX syslog-ng-3.30.1-esmtp-pkgconfig.patch 777 BLAKE2B b9994f5381e2bc53174b5758aeb00def4cc2c26e6e6148223f6cf98337ab707b1025e410c9bde90907b55fc1dc4db343bbf6f6e6df7d151b7108fef801995be5 SHA512 dbc0333c26be61b4d57db79d37529b896f90cf03af46f5df93bf96bfe5966a9781317dac4509906469a5b5d90273623379afbc5480168a99b6b5cd6dc27fdbc9 AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6 @@ -9,13 +7,9 @@ AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530 AUX syslog-ng.logrotate.hardened.in 1662 BLAKE2B 488ab7e26b081267bdeecd91013ce5118e79dca89567789be9b85f8712a0f8f11005c2459eb334ab5bdfab08c780063e7025a242330367f710717a79352e0d96 SHA512 1c19837570da6c77d49252303abe0ac91280c500bd82c1eab45c4c1534b83d758782dd576b12006bdd738508892d4b898ba29c0969aba536b333ab9b99e6bd83 AUX syslog-ng.logrotate.in 237 BLAKE2B dd2851749f3f56b2099442610fcd85cbfd50a52a8c1ae60726b312ea845f3f0b20e436a4e11a377b9faecb1fa3f0febc008ae262e56018775b82d923ba5f2340 SHA512 4e59f8537579caa249ebe12c53946266633972ac6805b7ccd684a5749deeb897783a4e74570ceec15311edb3531aa4278bba468058227ab4c664a697cc604376 AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a007d8f4978e1bbd4ce1f1e8f9daefb60c586aa58756d7d98ca59a869ae8e3f4addac732b6086ba5 SHA512 9e21637b684a48093d00ad9b5d4dbb79178ea8cc280cb03dbce235193e916bf3bd10b091a901cf13842f1c080b707a36efe8833bbde9d2721245598a3fe038df -DIST syslog-ng-3.26.1.tar.gz 5040993 BLAKE2B 235971547c8febe61191014d971b9e5d71560f51ebc3a74fbae1c95b86653f1de8d0b99788f5b00cc75926dc67e7a80f650e9d2d12f191a4400c5b8edbbd01b7 SHA512 2cf6a8bd70addec3bef0888539f4a4686c30655698835d0c211ea929a0cae91a6f3dc9903f29fe717fd9d48b5cdc9918796f196ca84af6f5733bedff09ffab5a -DIST syslog-ng-3.28.1.tar.gz 5149671 BLAKE2B bfc33f2a595cb4fbcc5a69b60d283673922873434b21ca8ce9685a0f54b355f162b11242704419349a561f412573c84df30a49a4dc0cc95699e98720e3e65247 SHA512 d70b435a6c9d1d0d22ecebc051dc294b6e7f841159edabf229c772c40342a28014ea1599b2277f0514236f545bac63c9879988fd85d634e9ab4fe4f079c984cb -DIST syslog-ng-3.29.1.tar.gz 5111614 BLAKE2B 1dba62290d6354d0cda7d43783327a19f69e05963c6d2e75f42c61c30984d49d28f1c6474e68ccdd806f38022bf6799e69e12f2444da391b2bccb736ca597c72 SHA512 c8ec6527cab9e46effe23aaa1306b5bde1e13c3e62a092a62af630a744cc41e81d861e6e2ebfbaad8a9199d3b75ba4ac5fb4b4215d03f80a41f57a2e7a074a49 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52 -EBUILD syslog-ng-3.26.1-r1.ebuild 4850 BLAKE2B 582ee36edfa4813345b5084652db3e2e61e0fbf8e58dd362714b23be6e284c0064be29c93ef50d7e8f62d472831c71b3a90ee2f361e986685c9b1dbfdb3d3b68 SHA512 1d9acc712b93cabc46f5ae1a716b64749cee6b37b33d24c3299554e76faeecf5dbd442924bbc5cf93997770828d01ac6c697a2cad33bb70bb896b729ef1fd275 -EBUILD syslog-ng-3.28.1-r2.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b -EBUILD syslog-ng-3.29.1.ebuild 4845 BLAKE2B 3a644b90bc4aa739233304147293b0443934011e368b10b558571977c619a1a2438f48299993bbba323bd2fa425ee990b9e6b1f693986d0f68df4ec50a6e72fe SHA512 8f990c10d4fe5503e264d3462ba40047c0ec3fd8bcad26c38a83f26bbd89172338c603a573386c4c8f052d4bf98596d482c29044151116d60329ccd8a493721b +DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385 EBUILD syslog-ng-3.30.1-r1.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2 +EBUILD syslog-ng-3.31.2.ebuild 4915 BLAKE2B 486d6ab3bfc3710a8e06e4301e0ec00771ba451613a205f3c914f5905079ed833d8a59f17df9698f72a8964ca2cc9fae25501b8a6f5339b030cf95c6b3f98bfd SHA512 164db058356bc4fc5c68783ed9f97ba85166ef306f63c186c53c7538100254f2e4cd47fdc5e037a91308e3e4880d8f2d6d4e50ed6193b0e7f37c52076af44eff MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964 diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch deleted file mode 100644 index abec9213cd18..000000000000 --- a/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch +++ /dev/null @@ -1,320 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9b4183fc..1f8f16c13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -331,8 +331,7 @@ endif() - add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -j $$(nproc) --output-on-failure) - - set(IMPORTANT_WARNINGS -- -Wshadow -- -fcommon) -+ -Wshadow) - - set(ACCEPTABLE_WARNINGS - -Wno-stack-protector -diff --git a/Makefile.am b/Makefile.am -index 8b24eeaed..86c090638 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -54,8 +54,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/modules -I$(top_builddir)/lib - - # Important warnings - AM_CFLAGS = \ -- -Wshadow \ -- -fcommon -+ -Wshadow - - # Acceptable warnings - AM_CFLAGS += \ -diff --git a/lib/logmsg/tests/test_log_message.c b/lib/logmsg/tests/test_log_message.c -index 245568ce5..e51d78b94 100644 ---- a/lib/logmsg/tests/test_log_message.c -+++ b/lib/logmsg/tests/test_log_message.c -@@ -32,6 +32,8 @@ - #include - #include - -+MsgFormatOptions parse_options; -+ - typedef struct _LogMessageTestParams - { - LogMessage *message; -@@ -151,7 +153,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/libtest/cr_template.c b/libtest/cr_template.c -index 35e47aa3f..4f0913368 100644 ---- a/libtest/cr_template.c -+++ b/libtest/cr_template.c -@@ -34,10 +34,12 @@ - - #include "msg_parse_lib.h" - -+static MsgFormatOptions parse_options; -+ - void - init_template_tests(void) - { -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/libtest/msg_parse_lib.c b/libtest/msg_parse_lib.c -index ae0d1654b..b3c7cb652 100644 ---- a/libtest/msg_parse_lib.c -+++ b/libtest/msg_parse_lib.c -@@ -27,15 +27,13 @@ - - #include - --MsgFormatOptions parse_options; -- - void --init_and_load_syslogformat_module(void) -+init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options) - { - configuration = cfg_new_snippet(); - cfg_load_module(configuration, "syslogformat"); -- msg_format_options_defaults(&parse_options); -- msg_format_options_init(&parse_options, configuration); -+ msg_format_options_defaults(parse_options); -+ msg_format_options_init(parse_options, configuration); - } - - void -diff --git a/libtest/msg_parse_lib.h b/libtest/msg_parse_lib.h -index d86f178c2..5a9b4277b 100644 ---- a/libtest/msg_parse_lib.h -+++ b/libtest/msg_parse_lib.h -@@ -30,9 +30,7 @@ - #include "cfg.h" - #include "logmsg/logmsg.h" - --extern MsgFormatOptions parse_options; -- --void init_and_load_syslogformat_module(void); -+void init_parse_options_and_load_syslogformat(MsgFormatOptions *parse_options); - void deinit_syslogformat_module(void); - - void assert_log_messages_equal(LogMessage *log_message_a, LogMessage *log_message_b); -diff --git a/libtest/proto_lib.c b/libtest/proto_lib.c -index b69195865..105e390b9 100644 ---- a/libtest/proto_lib.c -+++ b/libtest/proto_lib.c -@@ -23,7 +23,7 @@ - */ - - #include "proto_lib.h" --#include "msg_parse_lib.h" -+#include "cfg.h" - - #include - #include -@@ -164,7 +164,8 @@ assert_proto_server_fetch_ignored_eof(LogProtoServer *proto) - void - init_proto_tests(void) - { -- init_and_load_syslogformat_module(); -+ configuration = cfg_new_snippet(); -+ cfg_load_module(configuration, "syslogformat"); - log_proto_server_options_defaults(&proto_server_options); - } - -@@ -172,5 +173,7 @@ void - deinit_proto_tests(void) - { - log_proto_server_options_destroy(&proto_server_options); -- deinit_syslogformat_module(); -+ -+ if (configuration) -+ cfg_free(configuration); - } -diff --git a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -index 79a4b97ad..d4d0d45a9 100644 ---- a/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -+++ b/modules/linux-kmsg-format/tests/test_linux_format_kmsg.c -@@ -31,6 +31,8 @@ - - #include - -+MsgFormatOptions parse_options; -+ - static LogMessage * - kmsg_parse_message(const gchar *raw_message_str) - { -diff --git a/modules/python/tests/test_python_logmsg.c b/modules/python/tests/test_python_logmsg.c -index 9a0343b07..51651ee9d 100644 ---- a/modules/python/tests/test_python_logmsg.c -+++ b/modules/python/tests/test_python_logmsg.c -@@ -30,6 +30,8 @@ - static PyObject *_python_main; - static PyObject *_python_main_dict; - -+MsgFormatOptions parse_options; -+ - static void - _py_init_interpreter(void) - { -@@ -95,7 +97,7 @@ void setup(void) - { - app_startup(); - -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - - _py_init_interpreter(); - _init_python_main(); -diff --git a/modules/stardate/tests/test_stardate.c b/modules/stardate/tests/test_stardate.c -index e48cfb6cd..7d55fc1d0 100644 ---- a/modules/stardate/tests/test_stardate.c -+++ b/modules/stardate/tests/test_stardate.c -@@ -33,6 +33,8 @@ - - #include "msg_parse_lib.h" - -+MsgFormatOptions parse_options; -+ - void - stardate_assert(const gchar *msg_str, const int precision, const gchar *expected) - { -@@ -58,6 +60,7 @@ void - setup(void) - { - app_startup(); -+ init_parse_options_and_load_syslogformat(&parse_options); - init_template_tests(); - cfg_load_module(configuration, "stardate"); - } -@@ -66,6 +69,7 @@ void - teardown(void) - { - deinit_template_tests(); -+ deinit_syslogformat_module(); - app_shutdown(); - } - -diff --git a/persist-tool/add.h b/persist-tool/add.h -index 981e0cc61..2d3524cb0 100644 ---- a/persist-tool/add.h -+++ b/persist-tool/add.h -@@ -32,8 +32,8 @@ - #include "cfg.h" - #include "persist-tool.h" - --gchar *persist_state_dir; --gchar *persist_state_name; -+extern gchar *persist_state_dir; -+extern gchar *persist_state_name; - - gint add_main(int argc, char *argv[]); - -diff --git a/persist-tool/generate.h b/persist-tool/generate.h -index 237a8ae24..34f7dfec9 100644 ---- a/persist-tool/generate.h -+++ b/persist-tool/generate.h -@@ -32,8 +32,8 @@ - #include "persist-state.h" - #include "cfg.h" - --gboolean force_generate; --gchar *generate_output_dir; -+extern gboolean force_generate; -+extern gchar *generate_output_dir; - - gint generate_main(int argc, char *argv[]); - -diff --git a/persist-tool/persist-tool.c b/persist-tool/persist-tool.c -index fd96c856d..4e4adc88f 100644 ---- a/persist-tool/persist-tool.c -+++ b/persist-tool/persist-tool.c -@@ -135,11 +135,17 @@ void persist_tool_free(PersistTool *self) - g_free(self); - } - -+gchar *persist_state_dir; -+gchar *persist_state_name; -+gboolean force_generate; -+gchar *generate_output_dir; -+ - static GOptionEntry dump_options[] = - { - { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL } - }; - -+ - static GOptionEntry add_options[] = - { - { "output-dir", 'o', 0, G_OPTION_ARG_STRING, &persist_state_dir, "The directory where persist file is located.", "" }, -diff --git a/tests/unit/test_clone_logmsg.c b/tests/unit/test_clone_logmsg.c -index 57c0b181f..7b738b1e5 100644 ---- a/tests/unit/test_clone_logmsg.c -+++ b/tests/unit/test_clone_logmsg.c -@@ -38,6 +38,8 @@ - #include - #include - -+MsgFormatOptions parse_options; -+ - void - assert_new_log_message_attributes(LogMessage *log_message) - { -@@ -69,7 +71,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/tests/unit/test_matcher.c b/tests/unit/test_matcher.c -index a92c8e458..d43755bea 100644 ---- a/tests/unit/test_matcher.c -+++ b/tests/unit/test_matcher.c -@@ -31,6 +31,8 @@ - #include - #include - -+MsgFormatOptions parse_options; -+ - static LogMessage * - _create_log_message(const gchar *log) - { -@@ -128,7 +130,7 @@ void - setup(void) - { - app_startup(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - } - - void -diff --git a/tests/unit/test_msgparse.c b/tests/unit/test_msgparse.c -index 6b9e1045f..0ed91f638 100644 ---- a/tests/unit/test_msgparse.c -+++ b/tests/unit/test_msgparse.c -@@ -49,6 +49,8 @@ struct sdata_pair - struct sdata_pair ignore_sdata_pairs[] = { { NULL, NULL } }; - struct sdata_pair empty_sdata_pairs[] = { { NULL, NULL } }; - -+MsgFormatOptions parse_options; -+ - static unsigned long - _absolute_value(signed long diff) - { -@@ -130,7 +132,7 @@ setup(void) - app_startup(); - setenv("TZ", "MET-1METDST", TRUE); - tzset(); -- init_and_load_syslogformat_module(); -+ init_parse_options_and_load_syslogformat(&parse_options); - /* Fri Feb 8 09:37:49 CET 2019 */ - fake_time(1549615069); - } diff --git a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch b/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch deleted file mode 100644 index fdd98624a6ea..000000000000 --- a/app-admin/syslog-ng/files/patches/syslog-ng-glib-2.64-support.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/lib/compat/glib.c b/lib/compat/glib.c -index 8b6e52447..5b8ed8891 100644 ---- a/lib/compat/glib.c -+++ b/lib/compat/glib.c -@@ -315,3 +315,18 @@ slng_g_hash_table_insert(GHashTable *hash_table, gpointer key, gpointer value) - return exists; - } - #endif -+ -+ -+#if !GLIB_CHECK_VERSION(2, 64, 0) -+gunichar -+g_utf8_get_char_validated_fixed(const gchar *p, gssize max_len) -+{ -+ // https://github.com/GNOME/glib/commit/1963821a57584b4674c20895e8a5adccd2d9effd -+ -+#undef g_utf8_get_char_validated -+ if (*p == '\0' && max_len > 0) -+ return (gunichar)-2; -+ -+ return g_utf8_get_char_validated(p, max_len); -+} -+#endif -diff --git a/lib/compat/glib.h b/lib/compat/glib.h -index a9782ed2d..0fbdbd12d 100644 ---- a/lib/compat/glib.h -+++ b/lib/compat/glib.h -@@ -109,4 +109,9 @@ gchar *g_base64_encode_fixed(const guchar *data, gsize len); - gboolean slng_g_hash_table_insert (GHashTable *hash_table, gpointer key, gpointer value); - #endif - -+#if !GLIB_CHECK_VERSION(2, 64, 0) -+#define g_utf8_get_char_validated g_utf8_get_char_validated_fixed -+gunichar g_utf8_get_char_validated_fixed (const gchar *p, gssize max_len); -+#endif -+ - #endif -diff --git a/modules/cef/tests/test-format-cef-extension.c b/modules/cef/tests/test-format-cef-extension.c -index d7f6ee3c1..f4233f96f 100644 ---- a/modules/cef/tests/test-format-cef-extension.c -+++ b/modules/cef/tests/test-format-cef-extension.c -@@ -104,7 +104,7 @@ Test(format_cef, test_null_in_value) - - configuration->template_options.on_error = ON_ERROR_DROP_MESSAGE | ON_ERROR_SILENT; - log_msg_set_value_by_name(msg, ".cef.k", "a\0b", 3); -- assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\u0000b", msg); -+ assert_template_format_msg("$(format-cef-extension --subkeys .cef.)", "k=a\\x00b", msg); - log_msg_unref(msg); - } - -diff --git a/modules/json/tests/test_format_json.c b/modules/json/tests/test_format_json.c -index 92c61e9f1..1224ddb33 100644 ---- a/modules/json/tests/test_format_json.c -+++ b/modules/json/tests/test_format_json.c -@@ -55,7 +55,7 @@ Test(format_json, test_format_json) - assert_template_format("$(format-json MSG=$escaping)", - "{\"MSG\":\"binary stuff follows \\\"\\\\xad árvíztűrőtükörfúrógép\"}"); - assert_template_format("$(format-json MSG=$escaping2)", "{\"MSG\":\"\\\\xc3\"}"); -- assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\u0000stuff\"}"); -+ assert_template_format("$(format-json MSG=$null)", "{\"MSG\":\"binary\\\\x00stuff\"}"); - assert_template_format_with_context("$(format-json MSG=$MSG)", - "{\"MSG\":\"árvíztűrőtükörfúrógép\"}{\"MSG\":\"árvíztűrőtükörfúrógép\"}"); - assert_template_format("$(format-json --scope rfc3164)", diff --git a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild deleted file mode 100644 index c720da246944..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.26.1-r1.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -DESCRIPTION="syslog replacement with advanced filtering features" -HOMEPAGE="https://syslog-ng.com/open-source-log-management" -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.10.1:2 - >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre-6.1:= - !dev-libs/eventlog - amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) - caps? ( sys-libs/libcap ) - dbi? ( >=dev-db/libdbi-0.9.0 ) - geoip2? ( dev-libs/libmaxminddb:= ) - http? ( net-misc/curl ) - json? ( >=dev-libs/json-c-0.9:= ) - kafka? ( >=dev-libs/librdkafka-1.0.0:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp ) - spoof-source? ( net-libs/libnet:1.1= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} - contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) - -PATCHES=( "${FILESDIR}/patches/syslog-ng-glib-2.64-support.patch" ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local f - - use python && python_fix_shebang . - - # remove bundled libs - rm -r lib/ivykis || die - - # drop scl modules requiring json - if use !json; then - sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die - fi - - # drop scl modules requiring http - if use !http; then - sed -i -r '/slack|telegram/d' scl/Makefile.am || die - fi - - # use gentoo default path - if use systemd; then - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ - -i contrib/systemd/syslog-ng@default || die - fi - - for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do - sed \ - -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ - "/etc/init.d/syslog-ng reload")#g" \ - "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - for f in syslog-ng.conf.gentoo.hardened.in \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --enable-manpages - --localstatedir=/var/lib/syslog-ng - --sysconfdir=/etc/syslog-ng - --with-embedded-crypto - --with-ivykis=system - --with-module-dir=/usr/$(get_libdir)/syslog-ng - --with-pidfile-dir=/var/run - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable amqp) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") - $(use_enable pacct) - $(use_enable python) - $(use_enable redis) - $(use_enable smtp) - $(use_enable snmp snmp-dest) - $(use_enable spoof-source) - $(use_enable systemd) - $(use_enable tcpd tcp-wrapper) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - # Install default configuration - insinto /etc/default - doins contrib/systemd/syslog-ng@default - - insinto /etc/syslog-ng - newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf - - insinto /etc/logrotate.d - newins "${T}/syslog-ng.logrotate" syslog-ng - - newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng - newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng - find "${D}" -name '*.la' -delete || die - - use python && python_optimize -} - -pkg_postinst() { - # bug #355257 - if ! has_version app-admin/logrotate ; then - elog "It is highly recommended that app-admin/logrotate be emerged to" - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" - elog "for logrotate to use." - fi - - if use systemd; then - ewarn "The service file for systemd has changed to support multiple instances." - ewarn "To start the default instance issue:" - ewarn "# systemctl start syslog-ng@default" - fi -} diff --git a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild b/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild deleted file mode 100644 index 80e2a64e5b52..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.28.1-r2.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -DESCRIPTION="syslog replacement with advanced filtering features" -HOMEPAGE="https://syslog-ng.com/open-source-log-management" -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.10.1:2 - >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre-6.1:= - !dev-libs/eventlog - amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) - caps? ( sys-libs/libcap ) - dbi? ( >=dev-db/libdbi-0.9.0 ) - geoip2? ( dev-libs/libmaxminddb:= ) - http? ( net-misc/curl ) - json? ( >=dev-libs/json-c-0.9:= ) - kafka? ( >=dev-libs/librdkafka-1.0.0:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp:0= ) - spoof-source? ( net-libs/libnet:1.1= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} - contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) -PATCHES=( - "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local f - - use python && python_fix_shebang . - - # remove bundled libs - rm -r lib/ivykis || die - - # drop scl modules requiring json - if use !json; then - sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die - fi - - # drop scl modules requiring http - if use !http; then - sed -i -r '/slack|telegram/d' scl/Makefile.am || die - fi - - # use gentoo default path - if use systemd; then - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ - -i contrib/systemd/syslog-ng@default || die - fi - - for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do - sed \ - -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ - "/etc/init.d/syslog-ng reload")#g" \ - "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - for f in syslog-ng.conf.gentoo.hardened.in \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --enable-manpages - --localstatedir=/var/lib/syslog-ng - --sysconfdir=/etc/syslog-ng - --with-embedded-crypto - --with-ivykis=system - --with-module-dir=/usr/$(get_libdir)/syslog-ng - --with-pidfile-dir=/var/run - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable amqp) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") - $(use_enable pacct) - $(use_enable python) - $(use_enable redis) - $(use_enable smtp) - $(use_enable snmp afsnmp) - $(use_enable spoof-source) - $(use_enable systemd) - $(use_enable tcpd tcp-wrapper) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - # Install default configuration - insinto /etc/default - doins contrib/systemd/syslog-ng@default - - insinto /etc/syslog-ng - newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf - - insinto /etc/logrotate.d - newins "${T}/syslog-ng.logrotate" syslog-ng - - newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng - newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng - find "${D}" -name '*.la' -delete || die - - use python && python_optimize -} - -pkg_postinst() { - # bug #355257 - if ! has_version app-admin/logrotate ; then - elog "It is highly recommended that app-admin/logrotate be emerged to" - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" - elog "for logrotate to use." - fi - - if use systemd; then - ewarn "The service file for systemd has changed to support multiple instances." - ewarn "To start the default instance issue:" - ewarn "# systemctl start syslog-ng@default" - fi -} diff --git a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild deleted file mode 100644 index 80e2a64e5b52..000000000000 --- a/app-admin/syslog-ng/syslog-ng-3.29.1.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit autotools python-single-r1 systemd - -MY_PV_MM=$(ver_cut 1-2) -DESCRIPTION="syslog replacement with advanced filtering features" -HOMEPAGE="https://syslog-ng.com/open-source-log-management" -SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/glib-2.10.1:2 - >=dev-libs/ivykis-0.42.4 - >=dev-libs/libpcre-6.1:= - !dev-libs/eventlog - amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) - caps? ( sys-libs/libcap ) - dbi? ( >=dev-db/libdbi-0.9.0 ) - geoip2? ( dev-libs/libmaxminddb:= ) - http? ( net-misc/curl ) - json? ( >=dev-libs/json-c-0.9:= ) - kafka? ( >=dev-libs/librdkafka-1.0.0:= ) - mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) - python? ( ${PYTHON_DEPS} ) - redis? ( >=dev-libs/hiredis-0.11.0:= ) - smtp? ( net-libs/libesmtp ) - snmp? ( net-analyzer/net-snmp:0= ) - spoof-source? ( net-libs/libnet:1.1= ) - systemd? ( sys-apps/systemd:= ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - dev-libs/openssl:0=" -DEPEND="${RDEPEND} - test? ( dev-libs/criterion )" -BDEPEND=" - sys-devel/flex - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} - contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" - "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) -PATCHES=( - "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local f - - use python && python_fix_shebang . - - # remove bundled libs - rm -r lib/ivykis || die - - # drop scl modules requiring json - if use !json; then - sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die - fi - - # drop scl modules requiring http - if use !http; then - sed -i -r '/slack|telegram/d' scl/Makefile.am || die - fi - - # use gentoo default path - if use systemd; then - sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ - -i contrib/systemd/syslog-ng@default || die - fi - - for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do - sed \ - -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ - "/etc/init.d/syslog-ng reload")#g" \ - "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - for f in syslog-ng.conf.gentoo.hardened.in \ - syslog-ng.conf.gentoo.in; do - sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die - done - - default - eautoreconf -} - -src_configure() { - local myconf=( - --disable-docs - --disable-java - --disable-java-modules - --disable-riemann - --enable-manpages - --localstatedir=/var/lib/syslog-ng - --sysconfdir=/etc/syslog-ng - --with-embedded-crypto - --with-ivykis=system - --with-module-dir=/usr/$(get_libdir)/syslog-ng - --with-pidfile-dir=/var/run - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" - $(use_enable amqp) - $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) - $(use_enable caps linux-caps) - $(use_enable dbi sql) - $(use_enable geoip2) - $(use_enable http) - $(use_enable ipv6) - $(use_enable json) - $(use_enable kafka) - $(use_enable mongodb) - $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") - $(use_enable pacct) - $(use_enable python) - $(use_enable redis) - $(use_enable smtp) - $(use_enable snmp afsnmp) - $(use_enable spoof-source) - $(use_enable systemd) - $(use_enable tcpd tcp-wrapper) - ) - - econf "${myconf[@]}" -} - -src_install() { - default - - # Install default configuration - insinto /etc/default - doins contrib/systemd/syslog-ng@default - - insinto /etc/syslog-ng - newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf - - insinto /etc/logrotate.d - newins "${T}/syslog-ng.logrotate" syslog-ng - - newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng - newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng - keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng - find "${D}" -name '*.la' -delete || die - - use python && python_optimize -} - -pkg_postinst() { - # bug #355257 - if ! has_version app-admin/logrotate ; then - elog "It is highly recommended that app-admin/logrotate be emerged to" - elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" - elog "for logrotate to use." - fi - - if use systemd; then - ewarn "The service file for systemd has changed to support multiple instances." - ewarn "To start the default instance issue:" - ewarn "# systemctl start syslog-ng@default" - fi -} diff --git a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild new file mode 100644 index 000000000000..2c85e035f7e0 --- /dev/null +++ b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +inherit autotools python-single-r1 systemd + +MY_PV_MM=$(ver_cut 1-2) +DESCRIPTION="syslog replacement with advanced filtering features" +HOMEPAGE="https://syslog-ng.com/open-source-log-management" +SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz" + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-libs/glib-2.10.1:2 + >=dev-libs/ivykis-0.42.4 + >=dev-libs/libpcre-6.1:= + !dev-libs/eventlog + amqp? ( >=net-libs/rabbitmq-c-0.8.0:=[ssl] ) + caps? ( sys-libs/libcap ) + dbi? ( >=dev-db/libdbi-0.9.0 ) + geoip2? ( dev-libs/libmaxminddb:= ) + http? ( net-misc/curl ) + json? ( >=dev-libs/json-c-0.9:= ) + kafka? ( >=dev-libs/librdkafka-1.0.0:= ) + mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) + python? ( ${PYTHON_DEPS} ) + redis? ( >=dev-libs/hiredis-0.11.0:= ) + smtp? ( >=net-libs/libesmtp-1.0.6_p20200824:= ) + snmp? ( net-analyzer/net-snmp:0= ) + spoof-source? ( net-libs/libnet:1.1= ) + systemd? ( sys-apps/systemd:= ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + dev-libs/openssl:0=" +DEPEND="${RDEPEND} + test? ( dev-libs/criterion )" +BDEPEND=" + sys-devel/flex + virtual/pkgconfig" + +DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc} + contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" + "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( + "${FILESDIR}"/${PN}-3.28.1-net-snmp.patch + "${FILESDIR}"/${PN}-3.30.1-esmtp-pkgconfig.patch +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + local f + + use python && python_fix_shebang . + + # remove bundled libs + rm -r lib/ivykis || die + + # drop scl modules requiring json + if use !json; then + sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic|netskope|nodejs|osquery|slack/d' scl/Makefile.am || die + fi + + # drop scl modules requiring http + if use !http; then + sed -i -r '/slack|telegram/d' scl/Makefile.am || die + fi + + # use gentoo default path + if use systemd; then + sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \ + -i contrib/systemd/syslog-ng@default || die + fi + + for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do + sed \ + -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \ + "/etc/init.d/syslog-ng reload")#g" \ + "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + for f in syslog-ng.conf.gentoo.hardened.in \ + syslog-ng.conf.gentoo.in; do + sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die + done + + default + eautoreconf +} + +src_configure() { + local myconf=( + --disable-docs + --disable-java + --disable-java-modules + --disable-riemann + --enable-manpages + --localstatedir=/var/lib/syslog-ng + --sysconfdir=/etc/syslog-ng + --with-embedded-crypto + --with-ivykis=system + --with-module-dir=/usr/$(get_libdir)/syslog-ng + --with-pidfile-dir=/var/run + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + $(use_enable amqp) + $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client) + $(use_enable caps linux-caps) + $(use_enable dbi sql) + $(use_enable geoip2) + $(use_enable http) + $(use_enable ipv6) + $(use_enable json) + $(use_enable kafka) + $(use_enable mongodb) + $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options") + $(use_enable pacct) + $(use_enable python) + $(use_enable redis) + $(use_enable smtp) + $(use_enable snmp afsnmp) + $(use_enable spoof-source) + $(use_enable systemd) + $(use_enable tcpd tcp-wrapper) + ) + + econf "${myconf[@]}" +} + +src_install() { + default + + # Install default configuration + insinto /etc/default + doins contrib/systemd/syslog-ng@default + + insinto /etc/syslog-ng + newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf + + insinto /etc/logrotate.d + newins "${T}/syslog-ng.logrotate" syslog-ng + + newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng + newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng + keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng + find "${D}" -name '*.la' -delete || die + + use python && python_optimize +} + +pkg_postinst() { + # bug #355257 + if ! has_version app-admin/logrotate ; then + elog "It is highly recommended that app-admin/logrotate be emerged to" + elog "manage the log files. ${PN} installs a file in /etc/logrotate.d" + elog "for logrotate to use." + fi + + if use systemd; then + ewarn "The service file for systemd has changed to support multiple instances." + ewarn "To start the default instance issue:" + ewarn "# systemctl start syslog-ng@default" + fi +} -- cgit v1.2.3