Re: [PATCH 5/7] logrotate: upgrade to 3.8.8

[Richard Purdie <richard.purdie@linuxfoundation.org>]

On Sun, 2014-12-21 at 21:28 -0800, Robert Yang wrote:
> * Upgrade to 3.8.8.
> * Remove disable-check-different-filesystems.patch which had been merged
>   by upstream.

Are you sure? Autobuilder shows:

https://autobuilder.yoctoproject.org/main/builders/nightly-qa-logrotate/builds/136/steps/Running%20Sanity%20Tests/logs/stdio

Cheers,

Richard


> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  .../disable-check-different-filesystems.patch      |   34 --------------------
>  .../{logrotate_3.8.7.bb => logrotate_3.8.8.bb}     |    5 ++-
>  2 files changed, 2 insertions(+), 37 deletions(-)
>  delete mode 100644 meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
>  rename meta/recipes-extended/logrotate/{logrotate_3.8.7.bb => logrotate_3.8.8.bb} (89%)
> 
> diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
> deleted file mode 100644
> index 43068bd..0000000
> --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -Disable the check for different filesystems
> -
> -The logrotate supports rotate log across different filesystems now, so
> -disable the check for different filesystems.
> -
> -Upstream-Status: Submitted
> -
> -Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ----
> - config.c |    8 --------
> - 1 files changed, 0 insertions(+), 8 deletions(-)
> -
> -diff --git a/config.c b/config.c
> -index a85d1df..24575b3 100644
> ---- a/config.c
> -+++ b/config.c
> -@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
> - 						dirName, strerror(errno));
> - 					goto error;
> - 					}
> --
> --					if (sb.st_dev != sb2.st_dev) {
> --					message(MESS_ERROR,
> --						"%s:%d olddir %s and log file %s "
> --						"are on different devices\n", configFile,
> --						lineNum, newlog->oldDir, newlog->files[i]);
> --					goto error;
> --					}
> - 				}
> - 				}
> - 
> --- 
> -1.7.4.1
> -
> diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb
> similarity index 89%
> rename from meta/recipes-extended/logrotate/logrotate_3.8.7.bb
> rename to meta/recipes-extended/logrotate/logrotate_3.8.8.bb
> index faa8e02..8d32938 100644
> --- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb
> +++ b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb
> @@ -9,12 +9,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
>  
>  SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
>             file://act-as-mv-when-rotate.patch \
> -           file://disable-check-different-filesystems.patch \
>             file://update-the-manual.patch \
>              "
>  
> -SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213"
> -SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64"
> +SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca"
> +SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f"
>  
>  PACKAGECONFIG ?= "\
>      ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
> -- 
> 1.7.9.5
>