commit: 132bceef3c592d8df0463dd0ea101ff24d3d4939 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Oct 24 15:20:47 2022 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Oct 24 15:21:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=132bceef
app-admin/rsyslog: add hostname log patch Closes: https://bugs.gentoo.org/878121 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> .../files/rsyslog-8.2210.0-5004-hostname.patch | 40 ++++++++++++++++++++++ ...-8.2210.0.ebuild => rsyslog-8.2210.0-r1.ebuild} | 2 ++ 2 files changed, 42 insertions(+) diff --git a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch new file mode 100644 index 000000000000..4f6c6cf944b6 --- /dev/null +++ b/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch @@ -0,0 +1,40 @@ +From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001 +From: Rainer Gerhards <rgerha...@adiscon.com> +Date: Thu, 20 Oct 2022 18:08:11 +0200 +Subject: [PATCH] core bugfix: local hostname invalid if no global() config + object given + +The local hostname is invalidly set to "[localhost]" on rsyslog startup +if no global() config object is present in rsyslog.conf. Sending a HUP +corrects the hostname. + +This is a regression from ba00a9f25293f + +closes https://github.com/rsyslog/rsyslog/issues/4975, +closes https://github.com/rsyslog/rsyslog/issues/4825 +--- + runtime/glbl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/runtime/glbl.c b/runtime/glbl.c +index 3a9350b903..ed9a307804 100644 +--- a/runtime/glbl.c ++++ b/runtime/glbl.c +@@ -1396,6 +1396,7 @@ glblDoneLoadCnf(void) + stddbg = -1; + } + ++finalize_it: + /* we have now read the config. We need to query the local host name now + * as it was set by the config. + * +@@ -1404,8 +1405,7 @@ glblDoneLoadCnf(void) + * are taken from that queue, the hostname will be adapted. + */ + queryLocalHostname(); +- +-finalize_it: RETiRet; ++ RETiRet; + } + + diff --git a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild similarity index 99% rename from app-admin/rsyslog/rsyslog-8.2210.0.ebuild rename to app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild index 87f42ed5e63c..124a6ec61a3d 100644 --- a/app-admin/rsyslog/rsyslog-8.2210.0.ebuild +++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild @@ -114,6 +114,8 @@ if [[ ${PV} == "9999" ]]; then BDEPEND+=" >=dev-python/docutils-0.12" fi +PATCHES=( "${FILESDIR}"/${P}-5004-hostname.patch ) + CONFIG_CHECK="~INOTIFY_USER" WARNING_INOTIFY_USER="CONFIG_INOTIFY_USER isn't set. Imfile module on this system will only support polling mode!"
