summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-12-19 03:06:34 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-25 08:18:12 +0000
commitc924c07dab6caee8b6000a2dfcc60345fd678037 (patch)
tree0a9fab132d82a83799fe5222b6292b92ba3fe78a /meta/recipes-extended
parent01c7d083ef63d16eac083b6c75b5d2bce0073cff (diff)
downloadpoky-c924c07dab6caee8b6000a2dfcc60345fd678037.tar.gz
logrotate: upgrade to 3.8.8
* Upgrade to 3.8.8. * Update disable-check-different-filesystems.patch since we still need it. (From OE-Core rev: e7e9d4b989790e71702e06b26a45f3a380a715dd) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch14
-rw-r--r--meta/recipes-extended/logrotate/logrotate_3.8.8.bb (renamed from meta/recipes-extended/logrotate/logrotate_3.8.7.bb)6
2 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
index 43068bdbd7..43ebcffbae 100644
--- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
+++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
@@ -7,19 +7,20 @@ Upstream-Status: Submitted
7 7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9--- 9---
10 config.c | 8 -------- 10 config.c | 9 ---------
11 1 files changed, 0 insertions(+), 8 deletions(-) 11 1 file changed, 9 deletions(-)
12 12
13diff --git a/config.c b/config.c 13diff --git a/config.c b/config.c
14index a85d1df..24575b3 100644 14index e0eadb7..c23092f 100644
15--- a/config.c 15--- a/config.c
16+++ b/config.c 16+++ b/config.c
17@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) 17@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
18 dirName, strerror(errno)); 18 dirName, strerror(errno));
19 goto error; 19 goto error;
20 } 20 }
21- 21-
22- if (sb.st_dev != sb2.st_dev) { 22- if (sb.st_dev != sb2.st_dev
23- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) {
23- message(MESS_ERROR, 24- message(MESS_ERROR,
24- "%s:%d olddir %s and log file %s " 25- "%s:%d olddir %s and log file %s "
25- "are on different devices\n", configFile, 26- "are on different devices\n", configFile,
@@ -30,5 +31,4 @@ index a85d1df..24575b3 100644
30 } 31 }
31 32
32-- 33--
331.7.4.1 341.7.9.5
34
diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb
index faa8e0264f..133f6d7038 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb
@@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
9 9
10SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ 10SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
11 file://act-as-mv-when-rotate.patch \ 11 file://act-as-mv-when-rotate.patch \
12 file://disable-check-different-filesystems.patch \
13 file://update-the-manual.patch \ 12 file://update-the-manual.patch \
13 file://disable-check-different-filesystems.patch \
14 " 14 "
15 15
16SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213" 16SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
17SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64" 17SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
18 18
19PACKAGECONFIG ?= "\ 19PACKAGECONFIG ?= "\
20 ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ 20 ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \