Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package logrotate for openSUSE:Factory checked in at 2021-02-11 12:47:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/logrotate (Old) and /work/SRC/openSUSE:Factory/.logrotate.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "logrotate" Thu Feb 11 12:47:21 2021 rev:67 rq:869795 version:3.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/logrotate/logrotate.changes 2020-07-30 09:58:53.243160026 +0200 +++ /work/SRC/openSUSE:Factory/.logrotate.new.28504/logrotate.changes 2021-02-11 12:48:16.865566948 +0100 @@ -1,0 +2,8 @@ +Wed Feb 3 07:45:15 UTC 2021 - Pedro Monreal <pmonr...@suse.com> + +- Update to 3.18.0: + * Allow UIDs and GIDs to be specified numerically + * Add support for Zstandard compressed files + * Make delaycompress not to fail with rotate 0 + +------------------------------------------------------------------- Old: ---- logrotate-3.17.0.tar.xz logrotate-3.17.0.tar.xz.asc New: ---- logrotate-3.18.0.tar.xz logrotate-3.18.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logrotate.spec ++++++ --- /var/tmp/diff_new_pack.bnkvuH/_old 2021-02-11 12:48:17.633568066 +0100 +++ /var/tmp/diff_new_pack.bnkvuH/_new 2021-02-11 12:48:17.637568072 +0100 @@ -1,7 +1,7 @@ # # spec file for package logrotate # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: logrotate -Version: 3.17.0 +Version: 3.18.0 Release: 0 Summary: Cron service for rotating, compressing, mailing and removing system log files License: GPL-2.0-or-later ++++++ logrotate-3.17.0.tar.xz -> logrotate-3.18.0.tar.xz ++++++ ++++ 2471 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/.tarball-version new/logrotate-3.18.0/.tarball-version --- old/logrotate-3.17.0/.tarball-version 2020-07-10 11:05:38.000000000 +0200 +++ new/logrotate-3.18.0/.tarball-version 2021-01-08 08:34:25.000000000 +0100 @@ -1 +1 @@ -3.17.0 +3.18.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/.version new/logrotate-3.18.0/.version --- old/logrotate-3.17.0/.version 2020-07-10 11:05:38.000000000 +0200 +++ new/logrotate-3.18.0/.version 2021-01-08 08:34:25.000000000 +0100 @@ -1 +1 @@ -3.17.0 +3.18.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/ChangeLog.md new/logrotate-3.18.0/ChangeLog.md --- old/logrotate-3.17.0/ChangeLog.md 2020-07-10 10:44:33.000000000 +0200 +++ new/logrotate-3.18.0/ChangeLog.md 2021-01-08 08:19:35.000000000 +0100 @@ -4,7 +4,14 @@ ## [UNRELEASED] -[UNRELEASED]: https://github.com/logrotate/logrotate/compare/3.17.0...master +[UNRELEASED]: https://github.com/logrotate/logrotate/compare/3.18.0...master + +## [3.18.0] - 2021-01-08 + - allow UIDs and GIDs to be specified numerically (#217) + - add support for Zstandard compressed files (#355) + - make `delaycompress` not to fail with `rotate 0` (#341) + +[3.18.0]: https://github.com/logrotate/logrotate/compare/3.17.0...3.18.0 ## [3.17.0] - 2020-07-10 - lock state file to prevent parallel execution of logrotate (#295, #297) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/README.md new/logrotate-3.18.0/README.md --- old/logrotate-3.17.0/README.md 2020-07-10 10:22:29.000000000 +0200 +++ new/logrotate-3.18.0/README.md 2021-01-08 08:14:37.000000000 +0100 @@ -6,10 +6,11 @@ The latest release is: -* [logrotate-3.17.0](https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.17.0)) +* [logrotate-3.18.0](https://github.com/logrotate/logrotate/releases/download/3.18.0/logrotate-3.18.0.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.18.0/logrotate-3.18.0.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.18.0)) Previous releases: +* [logrotate-3.17.0](https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.17.0/logrotate-3.17.0.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.17.0)) * [logrotate-3.16.0](https://github.com/logrotate/logrotate/releases/download/3.16.0/logrotate-3.16.0.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.16.0/logrotate-3.16.0.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.16.0)) * [logrotate-3.15.1](https://github.com/logrotate/logrotate/releases/download/3.15.1/logrotate-3.15.1.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.15.1/logrotate-3.15.1.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.15.1)) * [logrotate-3.15.0](https://github.com/logrotate/logrotate/releases/download/3.15.0/logrotate-3.15.0.tar.xz) ([sig](https://github.com/logrotate/logrotate/releases/download/3.15.0/logrotate-3.15.0.tar.xz.asc)) ([Changelog](https://github.com/logrotate/logrotate/releases/tag/3.15.0)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/compile new/logrotate-3.18.0/compile --- old/logrotate-3.17.0/compile 2020-07-10 11:05:36.000000000 +0200 +++ new/logrotate-3.18.0/compile 2021-01-08 08:34:19.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/config.c new/logrotate-3.18.0/config.c --- old/logrotate-3.17.0/config.c 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/config.c 2021-01-05 14:01:16.000000000 +0100 @@ -45,6 +45,10 @@ #include "asprintf.c" #endif +#if !defined(HAVE_SECURE_GETENV) +#define secure_getenv getenv +#endif + #if !defined(HAVE_ASPRINTF) && !defined(_FORTIFY_SOURCE) #include <stdarg.h> @@ -108,6 +112,7 @@ {"gzip", ".gz"}, {"bzip2", ".bz2"}, {"xz", ".xz"}, + {"zstd", ".zst"}, {"compress", ".Z"}, {"zip", "zip"}, }; @@ -247,37 +252,67 @@ /* set *pUid to UID of the given user, return non-zero on failure */ static int resolveUid(const char *userName, uid_t *pUid) { - struct passwd *pw; + const struct passwd *pw; + char *endptr; + unsigned long int parsed_uid; + #ifdef __CYGWIN__ if (strcmp(userName, "root") == 0) { *pUid = 0; return 0; } #endif + pw = getpwnam(userName); - if (!pw) - return -1; - *pUid = pw->pw_uid; - endpwent(); - return 0; + if (pw) { + *pUid = pw->pw_uid; + return 0; + } + + parsed_uid = strtoul(userName, &endptr, 10); + if (userName[0] != '\0' && + *endptr == '\0' && + parsed_uid < INT_MAX && /* parsed_uid != ULONG_MAX && */ + getpwuid((uid_t)parsed_uid) != NULL) { + + *pUid = (uid_t)parsed_uid; + return 0; + } + + return -1; } /* set *pGid to GID of the given group, return non-zero on failure */ static int resolveGid(const char *groupName, gid_t *pGid) { - struct group *gr; + const struct group *gr; + char *endptr; + unsigned long int parsed_gid; + #ifdef __CYGWIN__ if (strcmp(groupName, "root") == 0) { *pGid = 0; return 0; } #endif + gr = getgrnam(groupName); - if (!gr) - return -1; - *pGid = gr->gr_gid; - endgrent(); - return 0; + if (gr) { + *pGid = gr->gr_gid; + return 0; + } + + parsed_gid = strtoul(groupName, &endptr, 10); + if (groupName[0] != '\0' && + *endptr == '\0' && + parsed_gid < INT_MAX && /* parsed_gid != ULONG_MAX && */ + getgrgid((gid_t)parsed_gid) != NULL) { + + *pGid = (gid_t)parsed_gid; + return 0; + } + + return -1; } static int readModeUidGid(const char *configFile, int lineNum, char *key, @@ -285,15 +320,18 @@ gid_t *pGid) { char u[200], g[200]; - unsigned int m = 0; + mode_t m = 0; char tmp; int rc; if (!strcmp("su", directive)) /* do not read <mode> for the 'su' directive */ rc = 0; - else - rc = sscanf(key, "%o %199s %199s%c", &m, u, g, &tmp); + else { + unsigned short int parsed_mode; + rc = sscanf(key, "%ho %199s %199s%c", &parsed_mode, u, g, &tmp); + m = parsed_mode; + } /* We support 'key <owner> <group> notation now */ if (rc == 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/config.h.in new/logrotate-3.18.0/config.h.in --- old/logrotate-3.17.0/config.h.in 2020-07-10 11:05:35.000000000 +0200 +++ new/logrotate-3.18.0/config.h.in 2021-01-08 08:34:18.000000000 +0100 @@ -36,6 +36,9 @@ /* Define to 1 if you have the `qsort' function. */ #undef HAVE_QSORT +/* Define to 1 if you have the `secure_getenv' function. */ +#undef HAVE_SECURE_GETENV + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/configure.ac new/logrotate-3.18.0/configure.ac --- old/logrotate-3.17.0/configure.ac 2020-06-07 16:39:56.000000000 +0200 +++ new/logrotate-3.18.0/configure.ac 2021-01-05 14:01:16.000000000 +0100 @@ -13,7 +13,6 @@ AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC -AC_PROG_CC_C99 AC_CHECK_MEMBERS([struct stat.st_blksize]) AC_STRUCT_ST_BLOCKS @@ -166,7 +165,7 @@ AC_DEFINE_UNQUOTED([ROOT_UID], [0], [Root user-id.]) AC_SUBST(ROOT_UID) -AC_CHECK_FUNCS([asprintf madvise qsort strndup strptime utimensat vsyslog]) +AC_CHECK_FUNCS([asprintf madvise qsort secure_getenv strndup strptime utimensat vsyslog]) AC_CONFIG_HEADERS([config.h]) AM_CFLAGS="\ @@ -176,6 +175,7 @@ -Wextra\ -Wmissing-format-attribute\ -Wmissing-noreturn\ + -Wmissing-prototypes\ -Wpointer-arith\ -Wshadow\ -Wstrict-prototypes\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/examples/logrotate.service new/logrotate-3.18.0/examples/logrotate.service --- old/logrotate-3.17.0/examples/logrotate.service 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/examples/logrotate.service 2020-08-21 15:02:38.000000000 +0200 @@ -18,12 +18,14 @@ # no ProtectHome for userdir logs # no PrivateNetwork for mail deliviery # no NoNewPrivileges for third party rotate scripts +# no RestrictSUIDSGID for creating setgid directories LockPersonality=true MemoryDenyWriteExecute=true PrivateDevices=true PrivateTmp=true ProtectClock=true ProtectControlGroups=true +ProtectHostname=true ProtectKernelLogs=true ProtectKernelModules=true ProtectKernelTunables=true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/logrotate.8 new/logrotate-3.18.0/logrotate.8 --- old/logrotate-3.17.0/logrotate.8 2020-07-10 11:05:38.000000000 +0200 +++ new/logrotate-3.18.0/logrotate.8 2021-01-08 08:34:23.000000000 +0100 @@ -1,4 +1,4 @@ -.TH LOGROTATE 8 "3.17.0" "Linux" "System Administrator's Manual" +.TH LOGROTATE 8 "3.18.0" "Linux" "System Administrator's Manual" .\" Per groff_man(7), the TQ macro should be copied from an-ext.tmac when .\" not running under groff. That's not quite right; not all groff .\" installations include this macro. So bring it in with another name @@ -238,8 +238,9 @@ .TP \fBsu \fIuser\fR \fIgroup\fR Rotate log files set under this user and group instead of using default -user/group (usually root). \fIuser\fR specifies the user name used for -rotation and \fIgroup\fR specifies the group used for rotation. If the +user/group (usually root). \fIuser\fR specifies the user used for +rotation and \fIgroup\fR specifies the group used for rotation (see the +section \fBUSER AND GROUP\fR for details). If the user/group you specify here does not have sufficient privilege to make files with the ownership you've specified in a \fBcreate\fR directive, it will cause an error. If \fBlogrotate\fR runs with root privileges, it is @@ -378,9 +379,10 @@ Immediately after rotation (before the \fBpostrotate\fR script is run) the log file is created (with the same name as the log file just rotated). \fImode\fR specifies the mode for the log file in octal (the same -as \fBchmod\fR(2)), \fIowner\fR specifies the user name who will own the +as \fBchmod\fR(2)), \fIowner\fR specifies the user who will own the log file, and \fIgroup\fR specifies the group the log file will belong -to. Any of the log file attributes may be omitted, in which case those +to (see the section \fBUSER AND GROUP\fR for details). +Any of the log file attributes may be omitted, in which case those attributes for the new file will use the same values as the original log file for the omitted attributes. This option can be disabled using the \fBnocreate\fR option. @@ -393,9 +395,10 @@ \fBcreateolddir \fImode\fR \fIowner\fR \fIgroup\fR If the directory specified by \fBolddir\fR directive does not exist, it is created. \fImode\fR specifies the mode for the \fBolddir\fR directory -in octal (the same as \fBchmod\fR(2)), \fIowner\fR specifies the user name +in octal (the same as \fBchmod\fR(2)), \fIowner\fR specifies the user who will own the \fBolddir\fR directory, and \fIgroup\fR specifies the group -the \fBolddir\fR directory will belong to. This option can be disabled using +the \fBolddir\fR directory will belong to (see the section \fBUSER AND GROUP +\fR for details). This option can be disabled using the \fBnocreateolddir\fR option. .TP @@ -712,6 +715,11 @@ directive. If the \fB\-\-log\fR flag was specified, file descriptor 3 is the log file. +.SH USER AND GROUP + +User and group identifiers are resolved first by trying the textual +representation and, in case it fails, afterwards by the numeric value. + .SH FILES .TS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/logrotate.8.in new/logrotate-3.18.0/logrotate.8.in --- old/logrotate-3.17.0/logrotate.8.in 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/logrotate.8.in 2021-01-05 14:01:16.000000000 +0100 @@ -238,8 +238,9 @@ .TP \fBsu \fIuser\fR \fIgroup\fR Rotate log files set under this user and group instead of using default -user/group (usually root). \fIuser\fR specifies the user name used for -rotation and \fIgroup\fR specifies the group used for rotation. If the +user/group (usually root). \fIuser\fR specifies the user used for +rotation and \fIgroup\fR specifies the group used for rotation (see the +section \fBUSER AND GROUP\fR for details). If the user/group you specify here does not have sufficient privilege to make files with the ownership you've specified in a \fBcreate\fR directive, it will cause an error. If \fBlogrotate\fR runs with root privileges, it is @@ -378,9 +379,10 @@ Immediately after rotation (before the \fBpostrotate\fR script is run) the log file is created (with the same name as the log file just rotated). \fImode\fR specifies the mode for the log file in octal (the same -as \fBchmod\fR(2)), \fIowner\fR specifies the user name who will own the +as \fBchmod\fR(2)), \fIowner\fR specifies the user who will own the log file, and \fIgroup\fR specifies the group the log file will belong -to. Any of the log file attributes may be omitted, in which case those +to (see the section \fBUSER AND GROUP\fR for details). +Any of the log file attributes may be omitted, in which case those attributes for the new file will use the same values as the original log file for the omitted attributes. This option can be disabled using the \fBnocreate\fR option. @@ -393,9 +395,10 @@ \fBcreateolddir \fImode\fR \fIowner\fR \fIgroup\fR If the directory specified by \fBolddir\fR directive does not exist, it is created. \fImode\fR specifies the mode for the \fBolddir\fR directory -in octal (the same as \fBchmod\fR(2)), \fIowner\fR specifies the user name +in octal (the same as \fBchmod\fR(2)), \fIowner\fR specifies the user who will own the \fBolddir\fR directory, and \fIgroup\fR specifies the group -the \fBolddir\fR directory will belong to. This option can be disabled using +the \fBolddir\fR directory will belong to (see the section \fBUSER AND GROUP +\fR for details). This option can be disabled using the \fBnocreateolddir\fR option. .TP @@ -712,6 +715,11 @@ directive. If the \fB\-\-log\fR flag was specified, file descriptor 3 is the log file. +.SH USER AND GROUP + +User and group identifiers are resolved first by trying the textual +representation and, in case it fails, afterwards by the numeric value. + .SH FILES .TS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/logrotate.c new/logrotate-3.18.0/logrotate.c --- old/logrotate-3.17.0/logrotate.c 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/logrotate.c 2020-07-13 14:03:46.000000000 +0200 @@ -2076,7 +2076,9 @@ if (!log->rotateCount) { const char *ext = ""; - if (log->compress_ext && (log->flags & LOG_FLAG_COMPRESS)) + if (log->compress_ext + && (log->flags & LOG_FLAG_COMPRESS) + && !(log->flags & LOG_FLAG_DELAYCOMPRESS)) ext = log->compress_ext; free(rotNames->disposeName); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/logrotate.spec new/logrotate-3.18.0/logrotate.spec --- old/logrotate-3.17.0/logrotate.spec 2020-07-10 11:05:38.000000000 +0200 +++ new/logrotate-3.18.0/logrotate.spec 2021-01-08 08:34:23.000000000 +0100 @@ -1,6 +1,6 @@ Summary: Rotates, compresses, removes and mails system log files Name: logrotate -Version: 3.17.0 +Version: 3.18.0 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Base diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/missing new/logrotate-3.18.0/missing --- old/logrotate-3.17.0/missing 2020-07-10 11:05:36.000000000 +0200 +++ new/logrotate-3.18.0/missing 2021-01-08 08:34:19.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/Makefile.am new/logrotate-3.18.0/test/Makefile.am --- old/logrotate-3.17.0/test/Makefile.am 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/test/Makefile.am 2020-07-13 14:03:46.000000000 +0200 @@ -86,6 +86,7 @@ test-0085.sh \ test-0086.sh \ test-0087.sh \ + test-0088.sh \ test-0100.sh \ test-0101.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/compress new/logrotate-3.18.0/test/compress --- old/logrotate-3.17.0/test/compress 2017-12-06 15:39:03.000000000 +0100 +++ new/logrotate-3.18.0/test/compress 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "gzip $*" > compress-args env > compress-env diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/compress-error new/logrotate-3.18.0/test/compress-error --- old/logrotate-3.17.0/test/compress-error 2017-12-06 15:39:03.000000000 +0100 +++ new/logrotate-3.18.0/test/compress-error 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "compression error" 1>&2 gzip $* \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/mailer new/logrotate-3.18.0/test/mailer --- old/logrotate-3.17.0/test/mailer 2017-12-06 15:39:03.000000000 +0100 +++ new/logrotate-3.18.0/test/mailer 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh echo "$*" > mail-out cat >> mail-out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0001.sh new/logrotate-3.18.0/test/test-0001.sh --- old/logrotate-3.17.0/test/test-0001.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0001.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0002.sh new/logrotate-3.18.0/test/test-0002.sh --- old/logrotate-3.17.0/test/test-0002.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0002.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0003.sh new/logrotate-3.18.0/test/test-0003.sh --- old/logrotate-3.17.0/test/test-0003.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0003.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0004.sh new/logrotate-3.18.0/test/test-0004.sh --- old/logrotate-3.17.0/test/test-0004.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0004.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0005.sh new/logrotate-3.18.0/test/test-0005.sh --- old/logrotate-3.17.0/test/test-0005.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0005.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0006.sh new/logrotate-3.18.0/test/test-0006.sh --- old/logrotate-3.17.0/test/test-0006.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0006.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0007.sh new/logrotate-3.18.0/test/test-0007.sh --- old/logrotate-3.17.0/test/test-0007.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0007.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0008.sh new/logrotate-3.18.0/test/test-0008.sh --- old/logrotate-3.17.0/test/test-0008.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0008.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0009.sh new/logrotate-3.18.0/test/test-0009.sh --- old/logrotate-3.17.0/test/test-0009.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0009.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0010.sh new/logrotate-3.18.0/test/test-0010.sh --- old/logrotate-3.17.0/test/test-0010.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0010.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0011.sh new/logrotate-3.18.0/test/test-0011.sh --- old/logrotate-3.17.0/test/test-0011.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0011.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0012.sh new/logrotate-3.18.0/test/test-0012.sh --- old/logrotate-3.17.0/test/test-0012.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0012.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0013.sh new/logrotate-3.18.0/test/test-0013.sh --- old/logrotate-3.17.0/test/test-0013.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0013.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0014.sh new/logrotate-3.18.0/test/test-0014.sh --- old/logrotate-3.17.0/test/test-0014.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0014.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0015.sh new/logrotate-3.18.0/test/test-0015.sh --- old/logrotate-3.17.0/test/test-0015.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0015.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0016.sh new/logrotate-3.18.0/test/test-0016.sh --- old/logrotate-3.17.0/test/test-0016.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0016.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0017.sh new/logrotate-3.18.0/test/test-0017.sh --- old/logrotate-3.17.0/test/test-0017.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0017.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0018.sh new/logrotate-3.18.0/test/test-0018.sh --- old/logrotate-3.17.0/test/test-0018.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0018.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0019.sh new/logrotate-3.18.0/test/test-0019.sh --- old/logrotate-3.17.0/test/test-0019.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0019.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0020.sh new/logrotate-3.18.0/test/test-0020.sh --- old/logrotate-3.17.0/test/test-0020.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0020.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0021.sh new/logrotate-3.18.0/test/test-0021.sh --- old/logrotate-3.17.0/test/test-0021.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0021.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0022.sh new/logrotate-3.18.0/test/test-0022.sh --- old/logrotate-3.17.0/test/test-0022.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0022.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0023.sh new/logrotate-3.18.0/test/test-0023.sh --- old/logrotate-3.17.0/test/test-0023.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0023.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0024.sh new/logrotate-3.18.0/test/test-0024.sh --- old/logrotate-3.17.0/test/test-0024.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0024.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0025.sh new/logrotate-3.18.0/test/test-0025.sh --- old/logrotate-3.17.0/test/test-0025.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0025.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0026.sh new/logrotate-3.18.0/test/test-0026.sh --- old/logrotate-3.17.0/test/test-0026.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0026.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0027.sh new/logrotate-3.18.0/test/test-0027.sh --- old/logrotate-3.17.0/test/test-0027.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0027.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0028.sh new/logrotate-3.18.0/test/test-0028.sh --- old/logrotate-3.17.0/test/test-0028.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0028.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0029.sh new/logrotate-3.18.0/test/test-0029.sh --- old/logrotate-3.17.0/test/test-0029.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0029.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0030.sh new/logrotate-3.18.0/test/test-0030.sh --- old/logrotate-3.17.0/test/test-0030.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0030.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0031.sh new/logrotate-3.18.0/test/test-0031.sh --- old/logrotate-3.17.0/test/test-0031.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0031.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -10,9 +10,10 @@ $RLR test-config.31 --force -stat -c %f test.log|grep 8180 >/dev/null +$STAT_MODE_FORMAT test.log|grep 8180 >/dev/null if [ $? != 0 ]; then - echo "Bad mode of test.log, should be 0600" + echo "Bad mode of test.log, should be 0600, is:" + $STAT_MODE_FORMAT test.log exit 3 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0032.sh new/logrotate-3.18.0/test/test-0032.sh --- old/logrotate-3.17.0/test/test-0032.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0032.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0033.sh new/logrotate-3.18.0/test/test-0033.sh --- old/logrotate-3.17.0/test/test-0033.sh 2020-03-31 17:52:54.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0033.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0034.sh new/logrotate-3.18.0/test/test-0034.sh --- old/logrotate-3.17.0/test/test-0034.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0034.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -10,9 +10,12 @@ # checks the logrotate -d output. preptest test.log 34 1 0 -$RLR test-config.34 -d -f 2>&1|grep "uid = 0 gid = 0" > /dev/null +OUTPUT=$($RLR test-config.34 -d -f 2>&1) + +echo "${OUTPUT}" | grep "uid = 0 gid = 0" > /dev/null if [ $? != 0 ]; then + echo "${OUTPUT}" echo "logrotate output must contain 'uid = 0 gid = 0'" exit 3 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0035.sh new/logrotate-3.18.0/test/test-0035.sh --- old/logrotate-3.17.0/test/test-0035.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0035.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0036.sh new/logrotate-3.18.0/test/test-0036.sh --- old/logrotate-3.17.0/test/test-0036.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0036.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0037.sh new/logrotate-3.18.0/test/test-0037.sh --- old/logrotate-3.17.0/test/test-0037.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0037.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0038.sh new/logrotate-3.18.0/test/test-0038.sh --- old/logrotate-3.17.0/test/test-0038.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0038.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0039.sh new/logrotate-3.18.0/test/test-0039.sh --- old/logrotate-3.17.0/test/test-0039.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0039.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0040.sh new/logrotate-3.18.0/test/test-0040.sh --- old/logrotate-3.17.0/test/test-0040.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0040.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0041.sh new/logrotate-3.18.0/test/test-0041.sh --- old/logrotate-3.17.0/test/test-0041.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0041.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0042.sh new/logrotate-3.18.0/test/test-0042.sh --- old/logrotate-3.17.0/test/test-0042.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0042.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0043.sh new/logrotate-3.18.0/test/test-0043.sh --- old/logrotate-3.17.0/test/test-0043.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0043.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0044.sh new/logrotate-3.18.0/test/test-0044.sh --- old/logrotate-3.17.0/test/test-0044.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0044.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0045.sh new/logrotate-3.18.0/test/test-0045.sh --- old/logrotate-3.17.0/test/test-0045.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0045.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0046.sh new/logrotate-3.18.0/test/test-0046.sh --- old/logrotate-3.17.0/test/test-0046.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0046.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0047.sh new/logrotate-3.18.0/test/test-0047.sh --- old/logrotate-3.17.0/test/test-0047.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0047.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0048.sh new/logrotate-3.18.0/test/test-0048.sh --- old/logrotate-3.17.0/test/test-0048.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0048.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0049.sh new/logrotate-3.18.0/test/test-0049.sh --- old/logrotate-3.17.0/test/test-0049.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0049.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0050.sh new/logrotate-3.18.0/test/test-0050.sh --- old/logrotate-3.17.0/test/test-0050.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0050.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0051.sh new/logrotate-3.18.0/test/test-0051.sh --- old/logrotate-3.17.0/test/test-0051.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0051.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0052.sh new/logrotate-3.18.0/test/test-0052.sh --- old/logrotate-3.17.0/test/test-0052.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0052.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0053.sh new/logrotate-3.18.0/test/test-0053.sh --- old/logrotate-3.17.0/test/test-0053.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0053.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0054.sh new/logrotate-3.18.0/test/test-0054.sh --- old/logrotate-3.17.0/test/test-0054.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0054.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -12,7 +12,11 @@ DATE="" for i in $(seq 1 60) do - DATE=$(/bin/date "+%Y-%m-%d" --date "$i day ago" 2>/dev/null) + if date -v -1d > /dev/null 2>&1; then + DATE=$(date -v-${i}d "+%Y-%m-%d") + else + DATE=$(date "+%Y-%m-%d" --date "$i day ago") + fi echo "x" > test.log-$DATE done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0055.sh new/logrotate-3.18.0/test/test-0055.sh --- old/logrotate-3.17.0/test/test-0055.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0055.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -12,7 +12,11 @@ DATE="" for i in $(seq 1 60) do - DATE=$(/bin/date "+%s" --date "$i hour ago" 2>/dev/null) + if date -v -1d > /dev/null 2>&1; then + DATE=$(date -v-${i}H "+%s") + else + DATE=$(date "+%s" --date "$i hour ago") + fi echo "x" > test.log-$DATE.gz done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0056.sh new/logrotate-3.18.0/test/test-0056.sh --- old/logrotate-3.17.0/test/test-0056.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0056.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -12,7 +12,11 @@ DATE="" for i in $(seq 1 60) do - DATE=$(/bin/date "+%d-%m-%Y" --date "$i day ago" 2>/dev/null) + if date -v -1d > /dev/null 2>&1; then + DATE=$(date -v-${i}d "+%d-%m-%Y") + else + DATE=$(date "+%d-%m-%Y" --date "$i day ago") + fi echo "x" > test.log-$DATE done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0057.sh new/logrotate-3.18.0/test/test-0057.sh --- old/logrotate-3.17.0/test/test-0057.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0057.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0058.sh new/logrotate-3.18.0/test/test-0058.sh --- old/logrotate-3.17.0/test/test-0058.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0058.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0059.sh new/logrotate-3.18.0/test/test-0059.sh --- old/logrotate-3.17.0/test/test-0059.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0059.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0060.sh new/logrotate-3.18.0/test/test-0060.sh --- old/logrotate-3.17.0/test/test-0060.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0060.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0061.sh new/logrotate-3.18.0/test/test-0061.sh --- old/logrotate-3.17.0/test/test-0061.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0061.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0062.sh new/logrotate-3.18.0/test/test-0062.sh --- old/logrotate-3.17.0/test/test-0062.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0062.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -20,9 +20,9 @@ exit 77 fi -SIZE_OLD=$(du --apparent-size test.log|awk '{print $1}') +SIZE_OLD=$($DU_APPARENT_SIZE test.log|awk '{print $1}') $RLR test-config.62 --force -SIZE_NEW=$(du --apparent-size test.log.1|awk '{print $1}') +SIZE_NEW=$($DU_APPARENT_SIZE test.log.1|awk '{print $1}') SIZE_SPARSE_NEW=$(du test.log.1|awk '{print $1}') if [ $SIZE_OLD != $SIZE_NEW ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0063.sh new/logrotate-3.18.0/test/test-0063.sh --- old/logrotate-3.17.0/test/test-0063.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0063.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -14,9 +14,9 @@ cp test.log test.example SIZE_SPARSE_OLD=$(du test.log|awk '{print $1}') -SIZE_OLD=$(du --apparent-size test.log|awk '{print $1}') +SIZE_OLD=$($DU_APPARENT_SIZE test.log|awk '{print $1}') $RLR test-config.63 --force -SIZE_NEW=$(du --apparent-size test.log.1|awk '{print $1}') +SIZE_NEW=$($DU_APPARENT_SIZE test.log.1|awk '{print $1}') SIZE_SPARSE_NEW=$(du test.log.1|awk '{print $1}') if [ $SIZE_OLD != $SIZE_NEW ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0064.sh new/logrotate-3.18.0/test/test-0064.sh --- old/logrotate-3.17.0/test/test-0064.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0064.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0065.sh new/logrotate-3.18.0/test/test-0065.sh --- old/logrotate-3.17.0/test/test-0065.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0065.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0066.sh new/logrotate-3.18.0/test/test-0066.sh --- old/logrotate-3.17.0/test/test-0066.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0066.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -8,8 +8,13 @@ # When using %Y in the dateformat, the old logs are not removed preptest test.log 66 1 0 -DATESTRING=$(/bin/date +%Y%m%d) -DAYAGO=$(/bin/date "+%Y-%m-%d" --date "1 day ago" 2>/dev/null) +if date -v -1d > /dev/null 2>&1; then + DAYAGO=$(date -v-1d "+%Y-%m-%d") +else + DAYAGO=$(date "+%Y-%m-%d" --date "1 day ago") +fi + +echo "DAYAGO=${DAYAGO}" echo removed > "test.log$DAYAGO" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0067.sh new/logrotate-3.18.0/test/test-0067.sh --- old/logrotate-3.17.0/test/test-0067.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0067.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0068.sh new/logrotate-3.18.0/test/test-0068.sh --- old/logrotate-3.17.0/test/test-0068.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0068.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0069.sh new/logrotate-3.18.0/test/test-0069.sh --- old/logrotate-3.17.0/test/test-0069.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0069.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -12,7 +12,7 @@ mkdir bdir cp test.log adir cp test.log bdir -$RLR test-config.69 --force -v +$RLR test-config.69 --force checkoutput <<EOF adir/test.log 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0070.sh new/logrotate-3.18.0/test/test-0070.sh --- old/logrotate-3.17.0/test/test-0070.sh 2019-12-04 10:17:23.000000000 +0100 +++ new/logrotate-3.18.0/test/test-0070.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -8,7 +8,26 @@ # No rotation should occur because file is too young preptest test.log 70 2 -# Put in place a state file that will force a rotation +# Set log modification time to current date. +# In reprotest (with faketime(1)) environments the logs might not be created +# with the faked system time. +touch -t $(date +%Y%m%d%H%M) test.log + +checkoutput <<EOF +test.log 0 zero +test.log.1 0 first +test.log.2 0 second +EOF + +$RLR test-config.70 + +checkoutput <<EOF +test.log 0 zero +test.log.1 0 first +test.log.2 0 second +EOF + +# Put in place a state with an old rotation date cat > state <<EOF logrotate state -- version 2 "$PWD/test.log" $(($(date "+%Y") - 10))-1-1 @@ -19,4 +38,5 @@ checkoutput <<EOF test.log 0 zero test.log.1 0 first +test.log.2 0 second EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0071.sh new/logrotate-3.18.0/test/test-0071.sh --- old/logrotate-3.17.0/test/test-0071.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0071.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0072.sh new/logrotate-3.18.0/test/test-0072.sh --- old/logrotate-3.17.0/test/test-0072.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0072.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0073.sh new/logrotate-3.18.0/test/test-0073.sh --- old/logrotate-3.17.0/test/test-0073.sh 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0073.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0074.sh new/logrotate-3.18.0/test/test-0074.sh --- old/logrotate-3.17.0/test/test-0074.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0074.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -9,7 +9,7 @@ # https://github.com/logrotate/logrotate/issues/144 preptest test.log 74 1 -$RLR test-config.74 --verbose +$RLR test-config.74 checkoutput <<EOF test.log 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0075.sh new/logrotate-3.18.0/test/test-0075.sh --- old/logrotate-3.17.0/test/test-0075.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0075.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -9,7 +9,7 @@ # https://github.com/logrotate/logrotate/issues/151 preptest test.log 75 2 1 -$RLR test-config.75 --verbose +$RLR test-config.75 checkoutput <<EOF test.log 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0076.sh new/logrotate-3.18.0/test/test-0076.sh --- old/logrotate-3.17.0/test/test-0076.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0076.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -9,7 +9,7 @@ # https://github.com/logrotate/logrotate/issues/154 preptest test.log 76 2 2 -$RLR test-config.76 --verbose <&- >&- +$RLR test-config.76 <&- >&- checkoutput <<EOF test.log 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0077.sh new/logrotate-3.18.0/test/test-0077.sh --- old/logrotate-3.17.0/test/test-0077.sh 2019-12-04 10:17:23.000000000 +0100 +++ new/logrotate-3.18.0/test/test-0077.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -14,7 +14,7 @@ EOF chmod go-w includedir/test-0077.conf -$RLR test-config.77 --force --verbose +$RLR test-config.77 --force rm -rf includedir diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0078.sh new/logrotate-3.18.0/test/test-0078.sh --- old/logrotate-3.17.0/test/test-0078.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0078.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0079.sh new/logrotate-3.18.0/test/test-0079.sh --- old/logrotate-3.17.0/test/test-0079.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0079.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -6,7 +6,7 @@ # ------------------------------- Test 79 ------------------------------------ preptest test.log 79 1 -$RLR test-config.79 -v --force >verbose.log +$RLR test-config.79 --force >verbose.log if [ $? != 0 ]; then echo "Logrotate exited with a non-zero exit code, but it should not have" exit 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0080.sh new/logrotate-3.18.0/test/test-0080.sh --- old/logrotate-3.17.0/test/test-0080.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0080.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0081.sh new/logrotate-3.18.0/test/test-0081.sh --- old/logrotate-3.17.0/test/test-0081.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0081.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0082.sh new/logrotate-3.18.0/test/test-0082.sh --- old/logrotate-3.17.0/test/test-0082.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0082.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -8,7 +8,7 @@ preptest test.log 82 0 for i in $(seq 32); do - $RLR test-config.82 -v --force + $RLR test-config.82 --force done test "$(ls test.log.* | wc -l)" -eq 32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0083.sh new/logrotate-3.18.0/test/test-0083.sh --- old/logrotate-3.17.0/test/test-0083.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0083.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -7,7 +7,7 @@ # ------------------------------- Test 83 ------------------------------------ preptest test.log 83 1 -if $RLR test-config.83 -v --force; then +if $RLR test-config.83 --force; then exit 1 else exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0084.sh new/logrotate-3.18.0/test/test-0084.sh --- old/logrotate-3.17.0/test/test-0084.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0084.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -11,4 +11,4 @@ ln -s XXX log/sym touch log/dir/file -$RLR test-config.84 -v --force +$RLR test-config.84 --force diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0085.sh new/logrotate-3.18.0/test/test-0085.sh --- old/logrotate-3.17.0/test/test-0085.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0085.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0086.sh new/logrotate-3.18.0/test/test-0086.sh --- old/logrotate-3.17.0/test/test-0086.sh 2020-03-30 15:35:48.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0086.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0087.sh new/logrotate-3.18.0/test/test-0087.sh --- old/logrotate-3.17.0/test/test-0087.sh 2020-07-10 10:22:39.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0087.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh @@ -9,11 +9,11 @@ touch state -$RLR test-config.87 -v -f & +$RLR test-config.87 -f & sleep 2 -$RLR test-config.87 -v +$RLR test-config.87 ret=$? if [ $ret -ne 3 ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0088.sh new/logrotate-3.18.0/test/test-0088.sh --- old/logrotate-3.17.0/test/test-0088.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/logrotate-3.18.0/test/test-0088.sh 2021-01-05 14:01:16.000000000 +0100 @@ -0,0 +1,16 @@ +#!/bin/sh + +. ./test-common.sh + +# check that `delaycompress` does not fail with `rotate 0` +cleanup 88 + +preptest test.log 88 0 + +$RLR -fv test-config.88 2> stderr || exit $? + +if grep 'error:.*No such file or directory' stderr; then + exit 7 +else + exit 0 +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0100.sh new/logrotate-3.18.0/test/test-0100.sh --- old/logrotate-3.17.0/test/test-0100.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0100.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-0101.sh new/logrotate-3.18.0/test/test-0101.sh --- old/logrotate-3.17.0/test/test-0101.sh 2019-10-14 14:10:31.000000000 +0200 +++ new/logrotate-3.18.0/test/test-0101.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh . ./test-common.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-common.sh new/logrotate-3.18.0/test/test-common.sh --- old/logrotate-3.17.0/test/test-common.sh 2019-12-04 10:17:23.000000000 +0100 +++ new/logrotate-3.18.0/test/test-common.sh 2021-01-05 14:01:16.000000000 +0100 @@ -1,6 +1,37 @@ # common variables and functions for legacy tests LOGROTATE="$(readlink -f $LOGROTATE)" -RLR="$LOGROTATE -m ./mailer -s state" +RLR="$LOGROTATE -v -m ./mailer -s state" + +if du --apparent-size $LOGROTATE > /dev/null 2>&1; then + DU_APPARENT_SIZE='du --apparent-size' +elif du -A $LOGROTATE > /dev/null 2>&1; then + DU_APPARENT_SIZE='du -A' +else + echo "no du option for apparent size found:" + du --apparent-size $LOGROTATE + du -A $LOGROTATE + exit 1 +fi + +if command -v md5sum > /dev/null 2>&1; then + MD5SUM=md5sum +elif command -v gmd5sum > /dev/null 2>&1; then + MD5SUM=gmd5sum +else + echo "no md5sum command found" + exit 1 +fi + +if stat -c %f $LOGROTATE > /dev/null 2>&1; then + STAT_MODE_FORMAT='stat -c %f' +elif stat -f %Xp $LOGROTATE > /dev/null 2>&1; then + STAT_MODE_FORMAT='stat -f %Xp' +else + echo "no stat format option found:" + stat -c %f $LOGROTATE + stat -f %Xp $LOGROTATE + exit 1 +fi TESTDIR="$(basename "$0" .sh)" mkdir -p "$TESTDIR" @@ -33,9 +64,10 @@ output=test-config.$1 user=$(id -u -n) group=$(id -g -n) - sed "s,&DIR&,$PWD,g" < $input | sed "s,&USER&,$user,g" | sed "s,&GROUP&,$group,g" > $output + rootgroup=$(id -g -n root) + sed "s,&DIR&,$PWD,g" < $input | sed "s,&USER&,$user,g" | sed "s,&GROUP&,$group,g" | sed "s,&ROOTGROUP&,$rootgroup,g" > $output chmod go-w $output - config_crc=$(md5sum $output) + config_crc=$(${MD5SUM} $output) } createlog() { @@ -139,7 +171,7 @@ echo expected: \'$expected\' exit 2 fi - echo "$config_crc" | md5sum -c - >/dev/null + echo "$config_crc" | ${MD5SUM} -c - >/dev/null if [ $? != 0 ]; then echo "config file $output has been altered: MD5 sum mismatch" exit 3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-config.34.in new/logrotate-3.18.0/test/test-config.34.in --- old/logrotate-3.17.0/test/test-config.34.in 2017-12-06 15:39:03.000000000 +0100 +++ new/logrotate-3.18.0/test/test-config.34.in 2021-01-05 14:01:16.000000000 +0100 @@ -1,4 +1,4 @@ -create root root +create root &ROOTGROUP& &DIR&/test.log { daily diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test/test-config.88.in new/logrotate-3.18.0/test/test-config.88.in --- old/logrotate-3.17.0/test/test-config.88.in 1970-01-01 01:00:00.000000000 +0100 +++ new/logrotate-3.18.0/test/test-config.88.in 2020-07-13 14:03:46.000000000 +0200 @@ -0,0 +1,6 @@ +&DIR&/test.log +{ + rotate 0 + compress + delaycompress +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/logrotate-3.17.0/test-driver new/logrotate-3.18.0/test-driver --- old/logrotate-3.17.0/test-driver 2020-07-10 11:05:36.000000000 +0200 +++ new/logrotate-3.18.0/test-driver 2021-01-08 08:34:19.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by
