summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-extended/logrotate
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-05 16:54:39 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-05 16:56:13 +0300
commit4b740dc9fdbca604749cf15f7ea0e6ead345b5a0 (patch)
tree32dd5f8dd157841cdc123f68651f11c9442b07e2 /poky/meta/recipes-extended/logrotate
parente231d58c35aabcb38dcd6470d232a738291d90fe (diff)
downloadopenbmc-4b740dc9fdbca604749cf15f7ea0e6ead345b5a0.tar.xz
poky: subtree update:a8544811d7..b5763b2f48
Alexander Kanavin (29): rpm: upgrade to 4.15.1 libmodulemd: move from 1.x to 2.x version libdnf: upgrade 0.28.1 -> 0.47.0 dnf: upgrade 4.2.2 -> 4.2.21 dnf: add a patch for base-files installation failures logrotate: update to 3.16.0 rt-tests: further exclusion of development versions kmscube: update to latest commit xcb-proto: update to 1.14 libxcb: update to 1.14 ghostscript: do not hardcode version in SRC_URI ghostscript: update 9.50 -> 9.52 webkitgtk: update to 2.28.2 python3-gitdb: update to 4.0.4 libevdev: update to 1.9.0 python3-dbusmock: add recipe from meta-oe mc: update to 4.8.24 coreutils: update to 8.32 glib-2.0: update 2.62.4 -> 2.64.2 glib-networking: update to 2.64.2 gptfdisk: update to 1.0.5 clutter-1.0: update to 1.26.4 diffoscope: update to 143 wpe: update to 1.6.0 vte: update to 0.60.2 libnotify: update to 0.7.9 connman: update to 1.38 xkeyboard-config: update to 2.29 gcr: update to 3.36.0 Andreas M?ller (1): libsecret: upgrade 0.20.1 -> 0.20.3 / port to meson Anibal Limon (2): ptest-runner: Bump to 2.4.0 oeqa/runtime: Use libdir to run ptest-runner Bartłomiej Burdukiewicz (2): libva: add PACKAGECONFIG and additonal rules for glx. libva: removed opengl from REQUIRED_DISTRO_FEATURES. Benjamin Fair (1): util-linux: fix build error in kill Bruce Ashfield (4): linux-yocto/5.4: update to v5.4.28 linux-yocto/5.4: update to v5.4.32 linux-yocto-dev: bump to v5.7-rc linux-yocto/5.4: update to v5.4.34 Frazer Clews (2): bitbake: lib/toaster: fixup codebase so pydocstyle can parse bitbake: lib/bs4/testing.py: fix bs4 testing Jan Luebbe (1): openssl: upgrade 1.1.1f -> 1.1.1g Joshua Watt (1): jquery: Upgrade 3.4.1 -> 3.5.0 Khem Raj (2): dpkg: Add riscv32 CPU support musl: Remove spurious unused patch Mingli Yu (1): iputils: Initialize libgcrypt Peter Kjellerstedt (1): libdnf: Use single-quotes around string literals used in SQL statements Pierre-Jean Texier (3): timezone: upgrade 2019c -> 2020a curl: upgrade 7.69.1 -> 7.70.0 curl: support mqtt in PACKAGECONFIG Richard Purdie (6): sanity: Require gcc 6 or later gcc-target: Ensure buildtools-extended-tarball doesn't use arch=native abi_version/staging: Bump versions to force rebuild after sstate corruption bitbake: bitdoc: Remove it utils: Drop FILESPATHPKG usage utils: Drop is_machine_specific()/machine_paths() Robert P. J. Day (5): ref-manual: fix excessive command indentation ref-manual: IMAGE_TYPES, add tar.zst, delete elf ref-manual: typo "SSTATE_MIRROR" -> "SSTATE_MIRRORS" ref-manual: Remove long-dead PACKAGE_GROUP variable bitbake: docs: delete reference to obsolete recipe-depends.dot Sakib Sajal (1): sqlite: backport CVE fixes Tim Orling (2): atk: upgrade 2.34.1 -> 2.36.0 at-spi2-core: upgrade 2.34.0 -> 2.36.0 Vyacheslav Yurkov (1): os-release: sanitize required fields Wang Mingyu (1): icu: CVE-2020-10531 Change-Id: Iae5641be5ca6424275d2e0d63ba3a7a5ba90cde2 Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-extended/logrotate')
-rw-r--r--poky/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch (renamed from poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch)15
-rw-r--r--poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch25
-rw-r--r--poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch14
-rw-r--r--poky/meta/recipes-extended/logrotate/logrotate_3.16.0.bb (renamed from poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb)6
4 files changed, 29 insertions, 31 deletions
diff --git a/poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch b/poky/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch
index 725567e0c9..50a3852078 100644
--- a/poky/meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
+++ b/poky/meta/recipes-extended/logrotate/logrotate/0001-Update-the-manual.patch
@@ -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>
Date: Tue, 17 Feb 2015 21:14:37 -0800
Subject: [PATCH] Update the manual
@@ -8,23 +8,24 @@ Update the manual for rotating on different filesystems.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
logrotate.8.in | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/logrotate.8.in b/logrotate.8.in
-index 951e406..581bf48 100644
+index 98fea91..70b4c44 100644
--- a/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
\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,
--\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
--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
+Logs are moved into \fIdirectory\fR for rotation. The \fIdirectory\fR
+is assumed to be relative to the directory holding the log file unless
@@ -34,5 +35,5 @@ index 951e406..581bf48 100644
.TP
--
-1.8.3.1
+2.24.0
diff --git a/poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch b/poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
index 79805b5148..acef5ccbe9 100644
--- a/poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+++ b/poky/meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
@@ -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>
Date: Tue, 17 Feb 2015 21:08:07 -0800
Subject: [PATCH] Act as the "mv" command when rotate log
@@ -9,15 +9,16 @@ read and write.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
logrotate.c | 71 ++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 59 insertions(+), 12 deletions(-)
diff --git a/logrotate.c b/logrotate.c
-index 54dac90..bf3ec23 100644
+index 25902bc..afa1a90 100644
--- a/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;
}
@@ -71,7 +72,7 @@ index 54dac90..bf3ec23 100644
/* find the rotated file with the highest index */
static int findLastRotated(const struct logNames *rotNames,
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,
@@ -90,7 +91,7 @@ index 54dac90..bf3ec23 100644
oldName, newName, strerror(errno));
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;
}
@@ -104,7 +105,8 @@ index 54dac90..bf3ec23 100644
log->files[logNum], tmpFilename,
strerror(errno));
hasErrors = 1;
- }
+@@ -2014,11 +2061,11 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
+ free(tmpFilename);
}
else {
- message(MESS_DEBUG, "renaming %s to %s\n", log->files[logNum],
@@ -118,7 +120,7 @@ index 54dac90..bf3ec23 100644
log->files[logNum], rotNames->finalName,
strerror(errno));
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;
}
@@ -127,7 +129,7 @@ index 54dac90..bf3ec23 100644
{
struct logState *p;
FILE *f;
-@@ -2460,7 +2507,7 @@ static int writeState(const char *stateFilename)
+@@ -2629,7 +2676,7 @@ static int writeState(const char *stateFilename)
fclose(f);
if (error == 0) {
@@ -135,8 +137,8 @@ index 54dac90..bf3ec23 100644
+ if (mvFile(tmpFilename, stateFilename, log, prev_acl)) {
unlink(tmpFilename);
error = 1;
- message(MESS_ERROR, "error renaming temp state file %s\n",
-@@ -2805,7 +2852,7 @@ int main(int argc, const char **argv)
+ message(MESS_ERROR, "error renaming temp state file %s to %s\n",
+@@ -2987,7 +3034,7 @@ int main(int argc, const char **argv)
rc |= rotateLogSet(log, force);
if (!debug)
@@ -145,6 +147,3 @@ index 54dac90..bf3ec23 100644
return (rc != 0);
}
---
-2.18.1
-
diff --git a/poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
index 96ff098a3f..9ba531f815 100644
--- a/poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+++ b/poky/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
@@ -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>
Date: Tue, 8 Jan 2019 06:27:06 +0000
Subject: [PATCH] Disable the check for different filesystems
@@ -9,18 +9,19 @@ disable the check for different filesystems.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
---
config.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/config.c b/config.c
-index 633b843..99a4a3b 100644
+index f027c7e..026136c 100644
--- a/config.c
+++ b/config.c
-@@ -1765,15 +1765,6 @@ duperror:
- goto error;
- }
+@@ -1873,15 +1873,6 @@ duperror:
}
+
+ free(ld);
-
- if (sb.st_dev != sb2.st_dev
- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY | LOG_FLAG_TMPFILENAME))) {
@@ -33,6 +34,3 @@ index 633b843..99a4a3b 100644
}
}
---
-2.18.1
-
diff --git a/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb b/poky/meta/recipes-extended/logrotate/logrotate_3.16.0.bb
index 7c7d51b39e..2b6ee0a19a 100644
--- a/poky/meta/recipes-extended/logrotate/logrotate_3.15.1.bb
+++ b/poky/meta/recipes-extended/logrotate/logrotate_3.16.0.bb
@@ -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 \
file://act-as-mv-when-rotate.patch \
- file://update-the-manual.patch \
+ file://0001-Update-the-manual.patch \
file://disable-check-different-filesystems.patch \
"
-SRC_URI[md5sum] = "afe109afea749c306ff489203fde6beb"
-SRC_URI[sha256sum] = "491fec9e89f1372f02a0ab66579aa2e9d63cac5178dfa672c204c88e693a908b"
+SRC_URI[md5sum] = "faf729e0e24bfaafaa677bc6deb46ed8"
+SRC_URI[sha256sum] = "442f6fdf61c349eeae5f76799878b88fe45a11c8863a38b618bac6988f4a7ce5"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"