2e84c784d5
- update to 3.20.0: * fix potential DoS from unprivileged users via the state file (CVE-2022-1348) * fix a misleading debug message with copytruncate and rotate 0 (#443) * add support for unsigned time_t (#438) * do not lock state file /dev/null (#433) OBS-URL: https://build.opensuse.org/request/show/979197 OBS-URL: https://build.opensuse.org/package/show/Base:System/logrotate?expand=0&rev=97
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
diff -ur logrotate-3.20.0.orig/logrotate.8.in logrotate-3.20.0/logrotate.8.in
|
|
--- logrotate-3.20.0.orig/logrotate.8.in 2022-03-31 14:00:36.000000000 +0200
|
|
+++ logrotate-3.20.0/logrotate.8.in 2022-05-25 15:40:21.015424608 +0200
|
|
@@ -48,6 +48,17 @@
|
|
is given on the command line, every file in that directory is used as
|
|
a config file.
|
|
.P
|
|
+If \fBlogrotate\fR is called via \fBsystemd\fR(1), following order of
|
|
+parsed config files is defined in the \fIlogrotate.service\fR file:
|
|
+.TS
|
|
+tab(:);
|
|
+l l l.
|
|
+\fI/usr/etc/logrotate.conf\fR:Default configuration file defined by the vendor.
|
|
+\fI/usr/etc/logrotate.d/*\fR:Directory for additional configuration files defined by the vendor.
|
|
+\fI/etc/logrotate.conf\fR:Default configuration file defined by the administrator. (optional)
|
|
+\fI/etc/logrotate.d/*\fR:Directory for additional configuration files defined by the administrator. (optional)
|
|
+.TE
|
|
+.P
|
|
If no command line arguments are given, \fBlogrotate\fR will print
|
|
version and copyright information, along with a short usage summary. If
|
|
any errors occur while rotating logs, \fBlogrotate\fR will exit with
|
|
@@ -752,7 +763,8 @@
|
|
tab(:);
|
|
l l l.
|
|
\fI@STATE_FILE_PATH@\fR:Default state file.
|
|
-\fI/etc/logrotate.conf\fR:Configuration options.
|
|
+\fI/usr/etc/logrotate.conf\fR:Configuration options defined by the vendor.
|
|
+\fI/etc/logrotate.conf\fR:Configuration options defined by the administrator.
|
|
.TE
|
|
|
|
|