mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

logrotate: update to 3.16.0

Browse Source 
(From OE-Core rev: a719c1bc44e47b34f70090f7c299b4d97650234c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-04-30 11:58:01 +02:00
committed by Richard Purdie
parent 3741e216d1
commit 36c82447e2
4 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/logrotate/logrotate/update-the-manual.patch → meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch
+8 -7
View File
@@ -1,4 +1,4 @@
From bf22e8805df69344f6f20cea390e829a22fa741b Mon Sep 17 00:00:00 2001 From 3e2cfa88b6538bb0fee3d9a6e99622055d05ac4a Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 17 Feb 2015 21:14:37 -0800 Date: Tue, 17 Feb 2015 21:14:37 -0800
Subject: [PATCH] Update the manual Subject: [PATCH] Update the manual
@@ -8,23 +8,24 @@ Update the manual for rotating on different filesystems.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
logrotate.8.in | 10 ++++------ logrotate.8.in | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-) 1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/logrotate.8.in b/logrotate.8.in diff --git a/logrotate.8.in b/logrotate.8.in
index 951e406..581bf48 100644 index 98fea91..70b4c44 100644
--- a/logrotate.8.in --- a/logrotate.8.in
+++ b/logrotate.8.in +++ b/logrotate.8.in
@@ -445,12 +445,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option). @@ -202,12 +202,10 @@ at all (use with caution, may waste performance and disk space). Default is 0.
.TP .TP
\fBolddir \fIdirectory\fR \fBolddir \fIdirectory\fR
-Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be -Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR must be
-on the same physical device as the log file being rotated, unless \fBcopy\fR, -on the same physical device as the log file being rotated, unless \fBcopy\fR,
-\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR -\fBcopytruncate\fR or \fBrenamecopy\fR option is used. The \fIdirectory\fR
-is assumed to be relative to the directory holding the log file -is assumed to be relative to the directory holding the log file
-unless an absolute path name is specified. When this option is used all -unless an absolute path name is specified. When this option is used all
-old versions of the log end up in \fIdirectory\fR. This option may be -old versions of the log end up in \fIdirectory\fR. This option may be
+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR +Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
+is assumed to be relative to the directory holding the log file unless +is assumed to be relative to the directory holding the log file unless
@@ -34,5 +35,5 @@ index 951e406..581bf48 100644
.TP .TP
-- --
1.8.3.1 2.24.0
meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+12 -13
View File
@@ -1,4 +1,4 @@
From c637948ebab5aff5641700c5cf613321ca0a6e6b Mon Sep 17 00:00:00 2001 From ef1ea905831c5bcd63e04149571c10d75ff8f028 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 17 Feb 2015 21:08:07 -0800 Date: Tue, 17 Feb 2015 21:08:07 -0800
Subject: [PATCH] Act as the "mv" command when rotate log Subject: [PATCH] Act as the "mv" command when rotate log
@@ -9,15 +9,16 @@ read and write.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
logrotate.c | 71 ++++++++++++++++++++++++++++++++++++++++++++--------- logrotate.c | 71 ++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 59 insertions(+), 12 deletions(-) 1 file changed, 59 insertions(+), 12 deletions(-)
diff --git a/logrotate.c b/logrotate.c diff --git a/logrotate.c b/logrotate.c
index 54dac90..bf3ec23 100644 index 25902bc..afa1a90 100644
--- a/logrotate.c --- a/logrotate.c
+++ b/logrotate.c +++ b/logrotate.c
@@ -1360,6 +1360,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force) @@ -1434,6 +1434,53 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force)
return 0; return 0;
} }
@@ -71,7 +72,7 @@ index 54dac90..bf3ec23 100644
/* find the rotated file with the highest index */ /* find the rotated file with the highest index */
static int findLastRotated(const struct logNames *rotNames, static int findLastRotated(const struct logNames *rotNames,
const char *fileext, const char *compext) const char *fileext, const char *compext)
@@ -1800,15 +1847,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum, @@ -1911,15 +1958,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
} }
message(MESS_DEBUG, message(MESS_DEBUG,
@@ -90,7 +91,7 @@ index 54dac90..bf3ec23 100644
oldName, newName, strerror(errno)); oldName, newName, strerror(errno));
hasErrors = 1; hasErrors = 1;
} }
@@ -1891,21 +1938,21 @@ static int rotateSingleLog(struct logInfo *log, int logNum, @@ -2002,10 +2049,10 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
return 1; return 1;
} }
@@ -104,7 +105,8 @@ index 54dac90..bf3ec23 100644
log->files[logNum], tmpFilename, log->files[logNum], tmpFilename,
strerror(errno)); strerror(errno));
hasErrors = 1; hasErrors = 1;
} @@ -2014,11 +2061,11 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
free(tmpFilename);
} }
else { else {
- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum], - message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
@@ -118,7 +120,7 @@ index 54dac90..bf3ec23 100644
log->files[logNum], rotNames->finalName, log->files[logNum], rotNames->finalName,
strerror(errno)); strerror(errno));
hasErrors = 1; hasErrors = 1;
@@ -2297,7 +2344,7 @@ static int rotateLogSet(struct logInfo *log, int force) @@ -2424,7 +2471,7 @@ static int rotateLogSet(struct logInfo *log, int force)
return hasErrors; return hasErrors;
} }
@@ -127,7 +129,7 @@ index 54dac90..bf3ec23 100644
{ {
struct logState *p; struct logState *p;
FILE *f; FILE *f;
@@ -2460,7 +2507,7 @@ static int writeState(const char *stateFilename) @@ -2629,7 +2676,7 @@ static int writeState(const char *stateFilename)
fclose(f); fclose(f);
if (error == 0) { if (error == 0) {
@@ -135,8 +137,8 @@ index 54dac90..bf3ec23 100644
+ if (mvFile(tmpFilename, stateFilename, log, prev_acl)) { + if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
unlink(tmpFilename); unlink(tmpFilename);
error = 1; error = 1;
message(MESS_ERROR, "error renaming temp state file %s\n", message(MESS_ERROR, "error renaming temp state file %s to %s\n",
@@ -2805,7 +2852,7 @@ int main(int argc, const char **argv) @@ -2987,7 +3034,7 @@ int main(int argc, const char **argv)
rc |= rotateLogSet(log, force); rc |= rotateLogSet(log, force);
if (!debug) if (!debug)
@@ -145,6 +147,3 @@ index 54dac90..bf3ec23 100644
return (rc != 0); return (rc != 0);
} }
--
2.18.1
meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+6 -8
View File
@@ -1,4 +1,4 @@
From e47796c8e8270a3d14f0b06af8a9e916c2225514 Mon Sep 17 00:00:00 2001 From a3fdf3dbdd6ecc0f2550a765dcb9bb274bce8ea8 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 8 Jan 2019 06:27:06 +0000 Date: Tue, 8 Jan 2019 06:27:06 +0000
Subject: [PATCH] Disable the check for different filesystems Subject: [PATCH] Disable the check for different filesystems
@@ -9,18 +9,19 @@ disable the check for different filesystems.
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
--- ---
config.c | 9 --------- config.c | 9 ---------
1 file changed, 9 deletions(-) 1 file changed, 9 deletions(-)
diff --git a/config.c b/config.c diff --git a/config.c b/config.c
index 633b843..99a4a3b 100644 index f027c7e..026136c 100644
--- a/config.c --- a/config.c
+++ b/config.c +++ b/config.c
@@ -1765,15 +1765,6 @@ duperror: @@ -1873,15 +1873,6 @@ duperror:
goto error;
}
} }
free(ld);
- -
- if (sb.st_dev != sb2.st_dev - if (sb.st_dev != sb2.st_dev
- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) { - && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
@@ -33,6 +34,3 @@ index 633b843..99a4a3b 100644
} }
} }
--
2.18.1
meta/recipes-extended/logrotate/logrotate_3.15.1.bb → meta/recipes-extended/logrotate/logrotate_3.16.0.bb
+3 -3
View File
@@ -21,12 +21,12 @@ UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar"
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
file://act-as-mv-when-rotate.patch \ file://act-as-mv-when-rotate.patch \
file://update-the-manual.patch \ file://0001-Update-the-manual.patch \
file://disable-check-different-filesystems.patch \ file://disable-check-different-filesystems.patch \
" "
SRC_URI[md5sum] = "afe109afea749c306ff489203fde6beb" SRC_URI[md5sum] = "faf729e0e24bfaafaa677bc6deb46ed8"
SRC_URI[sha256sum] = "491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b" SRC_URI[sha256sum] = "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"