diff options
Diffstat (limited to 'app-admin/syslog-ng')
| -rw-r--r-- | app-admin/syslog-ng/Manifest | 3 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch | 320 | ||||
| -rw-r--r-- | app-admin/syslog-ng/syslog-ng-3.25.1.ebuild | 4 |
3 files changed, 325 insertions, 2 deletions
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest index 79167a5f8815..94d045a39de3 100644 --- a/app-admin/syslog-ng/Manifest +++ b/app-admin/syslog-ng/Manifest @@ -1,4 +1,5 @@ AUX README.hardened 358 BLAKE2B a816cf461b4c3553e979c309ced21537841e24ad805b67f43d5bf06fb77b86959a75c7680df87e7ded7fd72073ad469a06bdec1e739784c82776d04a91bd3add SHA512 75b4af1543436506e28d9b0e2625985ab864d1452604b1514ec030df822c36d90ae062508381610cc1f750082a52545f8678102dc475abff15f0f3c9a838128e +AUX patches/syslog-ng-fno-common.patch 8521 BLAKE2B 6dc0654aefed1c480507269766f18eb9c1c88e8d9a5fe3c5394c108ea750aafe33858bc3c99957e3989b121a39345b6feffc80c588551145720573d5991fcae9 SHA512 c011f0973c8e3c3220bf9e7dc68176b6b4ec36d7e3030680a42862d31d951c499c81b5bd438622c9f7d41af61c2e24750d38b1c869e3e240e7c22ff8cd5d1f2f AUX syslog-ng.conf.gentoo.hardened.in 4509 BLAKE2B 39f130c008df8d5e31c121246997f8f31d2d8e2a78f1a881f4ca07ade0b3a5386c6e8c3fd8518e2ae471751564263886b8e3b78e8651efe0eeccd1d06c23c2a5 SHA512 0670952e6f5d0405e90bb5cb1ea168832bb2293095250c01a9baaf9e4fcdf8578ecf5b60809bd9e5089096a4d97fa966fcc47324fbe70cfd14266a10eb0001c6 AUX syslog-ng.conf.gentoo.in 1198 BLAKE2B a95b1fb9f46655502a41b0381c7388c9b54cfe9b8c3fd68dc68bd473175688e8ae72145a0ef718ef65220ecced7ecab00b39755cf41d4e21a6d375059cf6f309 SHA512 2830d1c5071a50c4aea6288b35c2880988111f29a11a641ee89f001a4ca4319943f87fdb1fd7079988888efa55401e2ed62f7a507c452de137f2e97a445d60e1 AUX syslog-ng.confd 1557 BLAKE2B 42b5b1593c877b7395a8470bdf19571705f0c586a1a3530903659828565018dff71d62e56bfba28afa6c5e9fcb55aee2a41bcfff53c9ad006ee319124adbd66a SHA512 c945d27560afa310ac7f15e0cde3a564d5296892c747827d68df1b49c728998b056b596f93ac2564a5cb349f88db6585de58ec64cdaa13b92f20f5aac213ef44 @@ -10,5 +11,5 @@ DIST syslog-ng-3.24.1.tar.gz 4909513 BLAKE2B 4b8d05899f9767784b6d24008d55808bee0 DIST syslog-ng-3.25.1.tar.gz 4938596 BLAKE2B bfcbd19b5a06c7ea15899bb919564661043bc7ab87bed147f77ab1aed153d70522aba9a42ab7dfa66d3b52a5f8432954b8a00594f428ddeb202979c5b9260da3 SHA512 79e09f1ba11080179c572016ce27328a28d479e68e663d39fb16624c03dc37d8439020ede922f78680e31e21629a6c13a4671464a31213c1dcf6acd2c5cd4b13 EBUILD syslog-ng-3.22.1.ebuild 4939 BLAKE2B 54b5c8436d431e3ffa6cba23d663cc8f73f6cba61837023ac775695f6844bd9f783fc7ef4ef624544a563fc8c15846e4227fc83477ee0b2eeac027b3a24f58ba SHA512 5a0e30fb6e759052e5018d2315abfd55ea3e0fb8bc008ed17dfaab70de6d34a471f1981efcc16c0087f91dc11de0cb08e1da63156c1c1843b4cc42a16c16c26f EBUILD syslog-ng-3.24.1.ebuild 4887 BLAKE2B 7950fc8fed41219ea4f7ffb7493cd8366f57dab738595b2326efccc5261e1e84e926dff63644e719e7a43d6b305deef7b3a9ed871e97333631ffaee38230a39a SHA512 018ba2ad27069103f3afe8f662f2efc43904e0556da2df12c5b864535925e931247ac3c26be95e1969fb47ea137f42cc72dfe66c50a50afe0f814f61cef50eab -EBUILD syslog-ng-3.25.1.ebuild 4855 BLAKE2B 25a40382fc792fabe62e33fd44ba08fb86ff733cd110d3df5295411a95d2fecb7f41e9d2362cc9cc8b96b377a363d90741e4b9ffbe2f5474e06ad6ac1954fdae SHA512 e388af0421d156fbcea5b6d9f3696e19a052b09c23246a56cae01ec972cf28d0701789ef5f7dfebf2b98fb5525145ed2404c1ab8a1604525be6f3d17d042ac26 +EBUILD syslog-ng-3.25.1.ebuild 4913 BLAKE2B 4c218effef9a8b58a1df5a75affbb9ed67b3185bf5ff93c575c9607c7b84ded0c9ca67819364f4d0c3449fac05596c222bf28ec51b826f78643b630a90c67d58 SHA512 bdf400344c4a82819ce404ff01d4d848f0dd24ff83f28834fe7db245299bb91c18825aa9d761e5ea030f4b8386545d70a7c17efe56f9a3db63fd052e176b3f17 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158 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 new file mode 100644 index 000000000000..abec9213cd18 --- /dev/null +++ b/app-admin/syslog-ng/files/patches/syslog-ng-fno-common.patch @@ -0,0 +1,320 @@ +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 <stdlib.h> + #include <glib/gprintf.h> + ++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 <criterion/criterion.h> + +-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 <string.h> + #include <criterion/criterion.h> +@@ -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 <criterion/criterion.h> + ++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.", "<directory>" }, +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 <stdlib.h> + #include <stdio.h> + ++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 <stdlib.h> + #include <string.h> + ++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/syslog-ng-3.25.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild index 5566d7e43e41..6a918ed857db 100644 --- a/app-admin/syslog-ng/syslog-ng-3.25.1.ebuild +++ b/app-admin/syslog-ng/syslog-ng-3.25.1.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=7 @@ -50,6 +50,8 @@ DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunO contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened" "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" ) +PATCHES=( "${FILESDIR}/patches/${PN}-fno-common.patch" ) + pkg_setup() { use python && python-single-r1_pkg_setup } |