mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

logrotate: Bump to 3.12.3

Browse Source 
This commit updates the recipe to the last upstream tag. Then, as the
tarball no longer contains the pre-generated Makefile, inherit from
autotools

(From OE-Core rev: 72490b7a327867872987e63d340051c4980044b2)

Signed-off-by: Romain Perier <romain.perier@collabora.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Romain Perier
2017-07-11 08:46:05 +02:00
committed by Richard Purdie
parent c2318ef416
commit 98d3a094d0
4 changed files with 37 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-extended/logrotate/logrotate/0001-Support-system-dates-back-to-the-year-1970.patch
-27
View File
@@ -1,27 +0,0 @@
Support system dates back to the year 1970
The system time on Linux can be set back as far as 1970 (the epoch time).
Currently logrotate stops working correctly if the time goes before 1996.
This value (1996) appears to have been hard coded since the code was written
back in 1996. Testing and code analysis shows this can simply be modified
to 1970.
The patch is provided by Matt Bennett <matt.bennett@alliedtelesis.co.nz>
Upstream-Status: Backport +
Signed-off-by: Zhenbo Gao <zhenbo.gao@windriver.com>
diff --git a/logrotate.c.orig b/logrotate.c
index cf8bf2c..a7dadfb 100644
--- a/logrotate.c.orig
+++ b/logrotate.c
@@ -2381,7 +2381,7 @@ static int readState(char *stateFilename)
}
/* Hack to hide earlier bug */
- if ((year != 1900) && (year < 1996 || year > 2100)) {
+ if ((year != 1900) && (year < 1970 || year > 2100)) {
message(MESS_ERROR,
"bad year %d for file %s in state file %s\n", year,
argv[0], stateFilename);
meta/recipes-extended/logrotate/logrotate/act-as-mv-when-rotate.patch
+18 -14
View File
@@ -1,4 +1,4 @@
From 68f29ab490cf987aa34b5f4caf1784b58a021308 Mon Sep 17 00:00:00 2001
From 517cbff66c8bdbf455bc3b7c1a85a4f990d0f9a6 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
@@ -10,14 +10,14 @@ Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
logrotate.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 59 insertions(+), 12 deletions(-)
logrotate.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 60 insertions(+), 12 deletions(-)
diff --git a/logrotate.c b/logrotate.c
index d3deb6a..cf8bf2c 100644
index 4ad58d4..ba05884 100644
--- a/logrotate.c
+++ b/logrotate.c
@@ -1157,6 +1157,53 @@ int findNeedRotating(struct logInfo *log, int logNum, int force)
@@ -1315,6 +1315,54 @@ static int findNeedRotating(struct logInfo *log, int logNum, int force)
return 0;
}
@@ -68,10 +68,11 @@ index d3deb6a..cf8bf2c 100644
+ return 1;
+}
+
int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
struct logNames *rotNames)
+
static int prerotateSingleLog(struct logInfo *log, int logNum,
struct logState *state, struct logNames *rotNames)
{
@@ -1523,15 +1570,15 @@ int prerotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
@@ -1674,15 +1722,15 @@ static int prerotateSingleLog(struct logInfo *log, int logNum,
}
message(MESS_DEBUG,
@@ -90,7 +91,7 @@ index d3deb6a..cf8bf2c 100644
oldName, newName, strerror(errno));
hasErrors = 1;
}
@@ -1669,21 +1716,21 @@ int rotateSingleLog(struct logInfo *log, int logNum, struct logState *state,
@@ -1767,21 +1815,21 @@ static int rotateSingleLog(struct logInfo *log, int logNum,
return 1;
}
@@ -115,19 +116,19 @@ index d3deb6a..cf8bf2c 100644
- message(MESS_ERROR, "failed to rename %s to %s: %s\n",
+ mvFile(log->files[logNum], rotNames->finalName, log, prev_acl)) {
+ message(MESS_ERROR, "failed to move %s to %s: %s\n",
log->files[logNum], tmpFilename,
log->files[logNum], rotNames->finalName,
strerror(errno));
hasErrors = 1;
@@ -2063,7 +2110,7 @@ int rotateLogSet(struct logInfo *log, int force)
@@ -2170,7 +2218,7 @@ static int rotateLogSet(struct logInfo *log, int force)
return hasErrors;
}
-static int writeState(char *stateFilename)
-static int writeState(const char *stateFilename)
+static int writeState(struct logInfo *log, char *stateFilename)
{
struct logState *p;
FILE *f;
@@ -2227,7 +2274,7 @@ static int writeState(char *stateFilename)
@@ -2322,7 +2370,7 @@ static int writeState(const char *stateFilename)
fclose(f);
if (error == 0) {
@@ -136,7 +137,7 @@ index d3deb6a..cf8bf2c 100644
unlink(tmpFilename);
error = 1;
message(MESS_ERROR, "error renaming temp state file %s\n",
@@ -2525,7 +2572,7 @@ int main(int argc, const char **argv)
@@ -2648,7 +2696,7 @@ int main(int argc, const char **argv)
rc |= rotateLogSet(log, force);
if (!debug)
@@ -145,3 +146,6 @@ index d3deb6a..cf8bf2c 100644
return (rc != 0);
}
--
1.8.3.1
meta/recipes-extended/logrotate/logrotate/update-the-manual.patch
+8 -8
View File
@@ -1,4 +1,4 @@
From e0b0fe30e9c49234994a20a86aacfaf80e690087 Mon Sep 17 00:00:00 2001
From bf22e8805df69344f6f20cea390e829a22fa741b 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
@@ -9,14 +9,14 @@ Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
logrotate.8 | 10 ++++------
logrotate.8.in | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/logrotate.8 b/logrotate.8
index e4e5f48..84407d0 100644
--- a/logrotate.8
+++ b/logrotate.8
@@ -405,12 +405,10 @@ Do not rotate the log if it is empty (this overrides the \fBifempty\fR option).
diff --git a/logrotate.8.in b/logrotate.8.in
index 951e406..581bf48 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).
.TP
\fBolddir \fIdirectory\fR
@@ -34,5 +34,5 @@ index e4e5f48..84407d0 100644
.TP
--
1.7.9.5
1.8.3.1
meta/recipes-extended/logrotate/logrotate_3.9.1.bb → meta/recipes-extended/logrotate/logrotate_3.12.3.bb
+11 -16
View File
@@ -3,32 +3,30 @@ SECTION = "console/utils"
HOMEPAGE = "https://github.com/logrotate/logrotate/issues"
LICENSE = "GPLv2"
# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it.
# TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
DEPENDS="coreutils popt"
LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
# When updating logrotate to latest upstream, SRC_URI should point to
# a proper release tarball from https://github.com/logrotate/logrotate/releases
# and we have to take the snapshot for now because there is no such
# tarball available for 3.9.1.
S = "${WORKDIR}/${BPN}-r3-9-1"
S = "${WORKDIR}/${BPN}-${PV}"
UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
UPSTREAM_CHECK_REGEX = "logrotate-(?P<pver>\d+(\.\d+)+).tar"
SRC_URI = "https://github.com/${BPN}/${BPN}/archive/r3-9-1.tar.gz \
file://act-as-mv-when-rotate.patch \
file://update-the-manual.patch \
file://disable-check-different-filesystems.patch \
file://0001-Support-system-dates-back-to-the-year-1970.patch \
SRC_URI = "https://github.com/${BPN}/${BPN}/archive/${PV}.tar.gz \
file://act-as-mv-when-rotate.patch \
file://update-the-manual.patch \
file://disable-check-different-filesystems.patch \
"
SRC_URI[md5sum] = "8572b7c2cf9ade09a8a8e10098500fb3"
SRC_URI[sha256sum] = "5bf8e478c428e7744fefa465118f8296e7e771c981fb6dffb7527856a0ea3617"
SRC_URI[md5sum] = "d1c41bdf63b9993c8e4e8b48a7bd5b8b"
SRC_URI[sha256sum] = "683ccb7fff74082471aa6bd9e962ae7a3f4d55eea7df41fd97aa12ec6f55e657"
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
@@ -55,17 +53,14 @@ EXTRA_OEMAKE = "\
# INSTALL=install and BASEDIR=/usr.
OS_NAME = "Linux"
do_compile_prepend() {
# Make sure the recompile is OK
rm -f ${B}/.depend
}
inherit autotools
do_install(){
oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
mkdir -p ${D}${sysconfdir}/logrotate.d
mkdir -p ${D}${sysconfdir}/cron.daily
mkdir -p ${D}${localstatedir}/lib
install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
install -p -m 644 ${S}/examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
install -p -m 755 ${S}/examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
touch ${D}${localstatedir}/lib/logrotate.status
}