summaryrefslogtreecommitdiff
path: root/app-admin/logrotate
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/logrotate')
-rw-r--r--app-admin/logrotate/Manifest1
-rw-r--r--app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch147
2 files changed, 0 insertions, 148 deletions
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index e969fef2fc56..2c3d946486ba 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -1,5 +1,4 @@
AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830bb101dc65b3966eb6dcd96fcbdb6bb1376eac5c0d0c78a26ff2ee6cfad57396d05dd3cae9ff4621a94b80d9a8b5877a52195d SHA512 ed572f12617812b44f7b79e9f3c7fb7aada1fed8f80244ee9e5e7c7f536e493c69790c7c62e0dc1951f979bc5a2cff581f439a8e1fb1a47722e6c0f1dcb4e65d
-AUX logrotate-3.20.1-log-changes.patch 5617 BLAKE2B 775652dc7b8fc70e8ee57efb3f6d5d1763e1519493d72b2e07f0ed927c1f0c02567e5a1413ab22d562efae91e99a52c806aa4bc811637a259bcf5c6b8f7e6e03 SHA512 c934a526e4e8612a2df77912ce010873c0f6fe120a48d4f714ec8b90ac76a0a59df5a21b24da522d664be250153c0ec887b3381568d6389dcca46e523d10ea3e
AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96
AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
DIST logrotate-3.21.0.tar.xz 168532 BLAKE2B f7fa0050bde51e2517eac8456ecf87648bc8423621830894ceb2a3ff6b9dfe32c5b53df6a4ee59aa91bd563ed94376a635159535f4fdc170fbc673354bcef508 SHA512 c576df7d2bc1a1db2f99befdd0ea627aef2d97bdcd4a7cdea76870623ba92fb1f04f1af6d15b75e4a9085f4aef2ae5e9843c4094cdd01e24d89872ccaf9c0d4a
diff --git a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch b/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch
deleted file mode 100644
index b7c4bb5275db..000000000000
--- a/app-admin/logrotate/files/logrotate-3.20.1-log-changes.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://bugs.gentoo.org/847382#c3
-https://github.com/logrotate/logrotate/commit/31cf1099ab8514dfcae5a980bc77352edd5292f8
-https://github.com/logrotate/logrotate/commit/7b1fa328bf70eb8434166f151bd075cd1440d0dc
-
-From 31cf1099ab8514dfcae5a980bc77352edd5292f8 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 27 May 2022 09:56:07 +0200
-Subject: [PATCH] lockState: do not print `error:` when exit code is unaffected
-
-Closes: https://github.com/logrotate/logrotate/pull/448
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -3050,8 +3050,8 @@ static int lockState(const char *stateFilename, int skip_state_lock)
- }
-
- if (sb.st_mode & S_IROTH) {
-- message(MESS_ERROR, "state file %s is world-readable and thus can"
-- " be locked from other unprivileged users."
-+ message(MESS_NORMAL, "warning: state file %s is world-readable"
-+ " and thus can be locked from other unprivileged users."
- " Skipping lock acquisition...\n",
- stateFilename);
- close(lockFd);
-
-From 7b1fa328bf70eb8434166f151bd075cd1440d0dc Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Fri, 27 May 2022 16:02:57 +0200
-Subject: [PATCH] log: unify handling of log levels
-
-Use MESS_WARN instead of MESS_NORMAL and make it always use
-the `warning:` prefix. MESS_WARN is now mapped to LOG_WARNING
-for syslog.
-
-Also drop MESS_VERBOSE, which was not set anywhere.
-
-Closes: https://github.com/logrotate/logrotate/pull/239
-Closes: https://github.com/logrotate/logrotate/pull/449
---- a/config.c
-+++ b/config.c
-@@ -643,7 +643,7 @@ static void set_criterium(enum criterium *pDst, enum criterium src, int *pSet)
- {
- if (*pSet && (*pDst != src)) {
- /* we are overriding a previously set criterium */
-- message(MESS_VERBOSE, "warning: '%s' overrides previously specified '%s'\n",
-+ message(MESS_DEBUG, "note: '%s' overrides previously specified '%s'\n",
- crit_to_string(src), crit_to_string(*pDst));
- }
- *pDst = src;
-@@ -1021,7 +1021,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
-
- if (getuid() == ROOT_UID) {
- if ((sb_config.st_mode & 07533) != 0400) {
-- message(MESS_NORMAL,
-+ message(MESS_WARN,
- "Potentially dangerous mode on %s: 0%o\n",
- configFile, (unsigned) (sb_config.st_mode & 07777));
- }
-@@ -1386,7 +1386,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
- RAISE_ERROR();
- }
- } else if (!strcmp(key, "errors")) {
-- message(MESS_NORMAL,
-+ message(MESS_WARN,
- "%s: %d: the errors directive is deprecated and no longer used.\n",
- configFile, lineNum);
- } else if (!strcmp(key, "mail")) {
---- a/log.c
-+++ b/log.c
-@@ -40,9 +40,12 @@ static void log_once(FILE *where, int level, const char *format, va_list args)
- {
- switch (level) {
- case MESS_DEBUG:
-- case MESS_NORMAL:
-- case MESS_VERBOSE:
- break;
-+
-+ case MESS_WARN:
-+ fprintf(where, "warning: ");
-+ break;
-+
- default:
- fprintf(where, "error: ");
- break;
-@@ -78,10 +81,11 @@ void message(int level, const char *format, ...)
- priority |= LOG_DEBUG;
- break;
- case MESS_DEBUG:
-- case MESS_VERBOSE:
-- case MESS_NORMAL:
- priority |= LOG_INFO;
- break;
-+ case MESS_WARN:
-+ priority |= LOG_WARNING;
-+ break;
- case MESS_ERROR:
- priority |= LOG_ERR;
- break;
---- a/log.h
-+++ b/log.h
-@@ -5,8 +5,7 @@
-
- #define MESS_REALDEBUG 1
- #define MESS_DEBUG 2
--#define MESS_VERBOSE 3
--#define MESS_NORMAL 4
-+#define MESS_WARN 4
- #define MESS_ERROR 5
- #define MESS_FATAL 6
-
---- a/logrotate.c
-+++ b/logrotate.c
-@@ -3050,7 +3050,7 @@ static int lockState(const char *stateFilename, int skip_state_lock)
- }
-
- if (sb.st_mode & S_IROTH) {
-- message(MESS_NORMAL, "warning: state file %s is world-readable"
-+ message(MESS_WARN, "state file %s is world-readable"
- " and thus can be locked from other unprivileged users."
- " Skipping lock acquisition...\n",
- stateFilename);
-@@ -3106,7 +3106,7 @@ int main(int argc, const char **argv)
- POPT_AUTOHELP { NULL, 0, 0, NULL, 0, NULL, NULL }
- };
-
-- logSetLevel(MESS_NORMAL);
-+ logSetLevel(MESS_WARN);
- setlocale (LC_ALL, "");
-
- optCon = poptGetContext("logrotate", argc, argv, options, 0);
-@@ -3117,7 +3117,7 @@ int main(int argc, const char **argv)
- switch (arg) {
- case 'd':
- debug = 1;
-- message(MESS_NORMAL, "WARNING: logrotate in debug mode does nothing"
-+ message(MESS_WARN, "logrotate in debug mode does nothing"
- " except printing debug messages! Consider using verbose"
- " mode (-v) instead if this is not what you want.\n\n");
- /* fallthrough */
---- a/test/test-0080.sh
-+++ b/test/test-0080.sh
-@@ -10,4 +10,4 @@ cleanup 80
- preptest test.log 80 1 0
-
- $RLR -d test-config.80 2>&1 | \
-- grep -q "warning: 'daily' overrides previously specified 'size'"
-+ grep -q "note: 'daily' overrides previously specified 'size'"
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-07 18:19:00 +0000