[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/

[Thomas Deutschmann]

commit:     0d1455ab4a584695dfd81f7a1df9ce05aea4f27d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  5 23:36:48 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 23:37:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1455ab

app-admin/rsyslog: update systemd service file

Bug: https://bugs.gentoo.org/740262
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 app-admin/rsyslog/files/rsyslog.service | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app-admin/rsyslog/files/rsyslog.service b/app-admin/rsyslog/files/rsyslog.service
index c64a9ea122a..8af064d2cef 100644
--- a/app-admin/rsyslog/files/rsyslog.service
+++ b/app-admin/rsyslog/files/rsyslog.service
@@ -1,13 +1,18 @@
 [Unit]
 Description=System Logging Service
-Requires=syslog.socket
+;Requires=syslog.socket
+Conflicts=syslog-ng.service syslogd.service
 Documentation=man:rsyslogd(8)
 Documentation=man:rsyslog.conf(5)
 Documentation=https://www.rsyslog.com/doc/
 
 [Service]
 Type=notify
-ExecStart=/usr/sbin/rsyslogd -n -iNONE
+Environment=RSYSLOGD_PARAMS=
+EnvironmentFile=-/etc/default/rsyslog
+ExecStart=/usr/sbin/rsyslogd -n -iNONE $RSYSLOGD_PARAMS
+ExecReload=/bin/kill -HUP $MAINPID
+UMask=0066
 StandardOutput=null
 Restart=on-failure
 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/

[Maciej Barć]

commit:     b00c8b2026655fdf9b823f907c60c9e949afd56b
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 11:01:07 2023 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 11:29:20 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b00c8b20

app-admin/rsyslog: patch cleanup

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 .../files/rsyslog-8.2210.0-5004-hostname.patch     | 40 ----------------------
 1 file changed, 40 deletions(-)

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
deleted file mode 100644
index 4f6c6cf944b6..000000000000
--- a/app-admin/rsyslog/files/rsyslog-8.2210.0-5004-hostname.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e2beca531157a4c0a27bcdda689bc53373e305b3 Mon Sep 17 00:00:00 2001
-From: Rainer Gerhards <rgerhards@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;
- }
- 
- 

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/

[Maciej Barć]

commit:     39a474b2619e7862aeaf2d3c8ded5fa7440036e7
Author:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 25 15:22:22 2024 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Jun 25 15:26:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a474b2

app-admin/rsyslog: fix README.gentoo-r1 spelling

Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>

 app-admin/rsyslog/files/README.gentoo-r1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-admin/rsyslog/files/README.gentoo-r1 b/app-admin/rsyslog/files/README.gentoo-r1
index 98f63a39cada..cdb2c2e5a046 100644
--- a/app-admin/rsyslog/files/README.gentoo-r1
+++ b/app-admin/rsyslog/files/README.gentoo-r1
@@ -34,6 +34,6 @@ Important changes
 
    Before version 8.2404.0-r1 there was an additional input socket in
    "/var/empty/dev/log" (default chroot location) in 8.2404.0-r1 that socket
-   was removed form the default configuration. Users can enable that socket
+   was removed from the default configuration. Users can enable that socket
    if they need to on their own but it shouldn't be necessary when running new
-   versions of openssh.
+   versions of OpenSSH.

[gentoo-commits] repo/gentoo:master commit in: app-admin/rsyslog/files/

[Conrad Kostecki]

commit:     3a09b60b52a3fd392326e2cf70ddfec9c6b72d0b
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 24 07:12:51 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 09:02:18 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a09b60b

app-admin/rsyslog: remove unused file

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-admin/rsyslog/files/50-default-r1.conf | 107 -----------------------------
 1 file changed, 107 deletions(-)

diff --git a/app-admin/rsyslog/files/50-default-r1.conf b/app-admin/rsyslog/files/50-default-r1.conf
deleted file mode 100644
index 920c214ff6ca..000000000000
--- a/app-admin/rsyslog/files/50-default-r1.conf
+++ /dev/null
@@ -1,107 +0,0 @@
-#######################
-### DEFAULT ACTIONS ###
-#######################
-
-auth,authpriv.* action(
-	name="action_auth"
-	type="omfile"
-	File="/var/log/auth.log"
-	FileCreateMode="0600"
-	FileOwner="root"
-	FileGroup="adm"
-	Sync="off"
-)
-
-cron.* action(
-	name="action_cron"
-	type="omfile"
-	File="/var/log/cron.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-daemon.* action(
-	name="action_daemon"
-	type="omfile"
-	File="/var/log/daemon.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-kern.* action(
-	name="action_kern"
-	type="omfile"
-	File="/var/log/kern.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-lpr.* action(
-	name="action_lpr"
-	type="omfile"
-	File="/var/log/lpr.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-mail.* action(
-	name="action_mail"
-	type="omfile"
-	File="/var/log/mail.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-news.* action(
-	name="action_news"
-	type="omfile"
-	File="/var/log/news.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-user.* action(
-	name="action_user"
-	type="omfile"
-	File="/var/log/user.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.=debug;auth,authpriv,news,mail.none action(
-	name="action_debug"
-	type="omfile"
-	File="/var/log/debug.log"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-*.info;auth,authpriv,cron,daemon,lpr,mail,news.none action(
-	name="action_messages"
-	type="omfile"
-	File="/var/log/messages"
-	FileOwner="root"
-	FileGroup="adm"
-)
-
-# Uncomment the following directive to re-enable the
-# deprecated "/var/log/syslog" log file (don't forget to re-enable log
-# rotation in "/etc/logrotate.d/rsyslog" if you do that!)
-#*.*;auth,authpriv.none action(
-#	name="action_syslog"
-#	type="omfile"
-#	File="/var/log/syslog"
-#	FileOwner="root"
-#	FileGroup="adm"
-#)
-
-*.emerg action(
-	name="action_emerge"
-	type="omusrmsg"
-	Users="*"
-	action.execOnlyOnceEveryInterval="10"
-)
-
-# Create an additional socket for the default chroot location
-# (used by net-misc/openssh[hpn], see https://bugs.gentoo.org/490744)
-input(type="imuxsock" Socket="/var/empty/dev/log")