Re: [ptxdist] [APPLIED] logrotate: version bump 3.9.1 -> 3.17.0

[Michael Olbrich <mol@pengutronix.de>]

Thanks, applied as 316fd31fc0fd264705b80bd7d1f8d92c072df2a4.

Michael

[sent from post-receive hook]

On Fri, 30 Oct 2020 13:02:41 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> Build of the old version fails with recent OSELAS toolchain 2020.08.x,
> error log in the end.  Runtime tested on at91 based target.
> 
> Noteworthy changes from upstream ChangeLog affecting this package
> (collected from multiple versions):
> 
>   - Upstream moved to GitHub: <https://github.com/logrotate/logrotate>.
>   - Legacy Makefile renamed to Makefile.legacy, will be removed eventually.
>   - Allow to change default state path at build time (via the
>     --with-state-file-path option of the configure script).
>   - Import systemd service and timer for logrotate from openSUSE.
>   - Avoid using local implementation of strndup() and asprintf() if these
>     functions are available at build time.
>   - Fix parsing of 'su' directive to accept usernames starting with numeric
>     symbols.
>   - Make sure that 64-bit file offsets are used on 32-bit systems.
>   - Errors in config files are no longer treated as fatal errors. (#81)
>   - `configure --with-default-mail-command` specifies default mail command. (#100)
>   - build fixes related to `-Werror` (#119) and `-Werror=format=` (#108)
>   - `confgure --enable-werror` now controls use of the -Werror flag (#123)
>   - fix compilation with gcc-10, which defaults to `-fno-common` (#288)
>   - lock state file to prevent parallel execution of logrotate (#295, #297)
> 
> And of course lots of other bugfixes and improvements.
> 
> The download URL was changed to the official upstream source on GitHub,
> while at it, switched to .xz compressed tarballs.
> 
> The license hash changed, because upstream replaced the document with a
> recent version from GNU for 3.12.0.
> 
> The license identifier was clearified by upstream to GPLv2+ in
> logrotate.spec.in for 3.11.0.
> 
> The whole patch series can be dropped for the following reasons:
> 
> - '0001-deb-config-h.patch': Debian patch introduced with 878707bd943a
>   ("logrotate: version bump to 3.9.1"), those options are set through
>   ./configure in prepare stage now for backwards compatibility
> - '0002-datehack.patch': upstream included this as bdbfea38a154
>   ("Support system dates back to the year 1970") for 3.9.2
> - '0003-cpp-crossbuild.patch': related to legacy makefile based build
> - '0004-chown-484762.patch': Debian patch, they dropped it in recent
>   versions
> - '0005-configure-add-check-for-large-file-support.patch': similar patch
>   ceb2653c08b5 ("configure.ac: make sure that 64-bit file offsets are
>   used") added by upstream for 3.11.0
> 
> Build error log with gcc-10:
> 
>   -------------------------
>   target: logrotate.compile
>   -------------------------
> 
>   make: Entering directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1'
>   Making all in test
>   make[1]: Entering directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1/test'
>   make[1]: Nothing to be done for 'all'.
>   make[1]: Leaving directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1/test'
>   make[1]: Entering directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1'
>     CC       logrotate.o
>     CC       config.o
>     CC       log.o
>     CC       basenames.o
>   config.c: In function 'strndup':
>   config.c:87:10: warning: 'nonnull' argument 's' compared to NULL [-Wnonnull-compare]
>   logrotate.c: In function 'postrotateSingleLog':
>   logrotate.c:1786:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
>   logrotate.c:1789:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
>   logrotate.c: In function 'prerotateSingleLog':
>   logrotate.c:1225:2: warning: 'strncat' specified bound depends on the length of the source argument [-Wstringop-overflow=]
>   logrotate.c:1226:3: note: length computed here
>     CCLD     logrotate
>   /opt/OSELAS.Toolchain-2020.08.0/arm-v5te-linux-gnueabi/gcc-10.2.1-glibc-2.32-binutils-2.35-kernel-5.8-sanitized/lib/gcc/arm-v5te-linux-gnueabi/10.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: config.o:platform-ncl/build-target/logrotate-3.9.1/logrotate.h:77: multiple definition of `logs'; logrotate.o:platform-ncl/build-target/logrotate-3.9.1/logrotate.h:77: first defined here
>   collect2: error: ld returned 1 exit status
>   make[1]: *** [Makefile:402: logrotate] Error 1
>   make[1]: Leaving directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1'
>   make: *** [Makefile:442: all-recursive] Error 1
>   make: Leaving directory '/home/adahl/Work/bsp/tt/ncl/platform-ncl/build-target/logrotate-3.9.1'
>   make: *** [/usr/local/lib/ptxdist-2020.10.0/rules/post/ptxd_make_world_compile.make:20: /home/adahl/Work/bsp/tt/ncl/platform-ncl/state/logrotate.compile] Error 2
> 
> Cc: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20201022084340.20510-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/logrotate-3.9.1/0001-deb-config-h.patch b/patches/logrotate-3.9.1/0001-deb-config-h.patch
> deleted file mode 100644
> index 6d348cc6849e..000000000000
> --- a/patches/logrotate-3.9.1/0001-deb-config-h.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From: unknown author <unknown.author@example.com>
> -Date: Thu, 11 Jun 2015 15:35:31 +0200
> -Subject: [PATCH] deb-config-h
> -
> -Fix locations of STATEFILE and DEFAULT_MAIL_COMMAND for Debian.
> ----
> - config.h | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/config.h b/config.h
> -index d715c5a83e49..9a7df229d6cd 100644
> ---- a/config.h
> -+++ b/config.h
> -@@ -27,7 +27,7 @@
> -  * Default settings for Linux - leave these last.
> -  */
> - #ifndef DEFAULT_MAIL_COMMAND
> --#define DEFAULT_MAIL_COMMAND "/bin/mail"
> -+#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
> - #endif
> - 
> - #ifndef COMPRESS_COMMAND
> -@@ -43,5 +43,5 @@
> - #endif
> - 
> - #ifndef STATEFILE
> --#define STATEFILE "/var/lib/logrotate.status"
> -+#define STATEFILE "/var/lib/logrotate/status"
> - #endif
> diff --git a/patches/logrotate-3.9.1/0002-datehack.patch b/patches/logrotate-3.9.1/0002-datehack.patch
> deleted file mode 100644
> index 3bb65341c775..000000000000
> --- a/patches/logrotate-3.9.1/0002-datehack.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: unknown author <unknown.author@example.com>
> -Date: Thu, 11 Jun 2015 15:35:31 +0200
> -Subject: [PATCH] datehack
> -
> -No longer consider state file dates before 1996 as fatal errors.
> -(Closes: #65534)
> ----
> - logrotate.c | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/logrotate.c b/logrotate.c
> -index d3deb6add62a..8ffcff6f6ac0 100644
> ---- a/logrotate.c
> -+++ b/logrotate.c
> -@@ -2334,7 +2334,7 @@ static int readState(char *stateFilename)
> - 	}
> - 
> - 	/* Hack to hide earlier bug */
> --	if ((year != 1900) && (year < 1996 || year > 2100)) {
> -+	if ((year != 1900) && (year < 1970 || year > 2100)) {
> - 	    message(MESS_ERROR,
> - 		    "bad year %d for file %s in state file %s\n", year,
> - 		    argv[0], stateFilename);
> diff --git a/patches/logrotate-3.9.1/0003-cpp-crossbuild.patch b/patches/logrotate-3.9.1/0003-cpp-crossbuild.patch
> deleted file mode 100644
> index bf279af71cae..000000000000
> --- a/patches/logrotate-3.9.1/0003-cpp-crossbuild.patch
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -From: unknown author <unknown.author@example.com>
> -Date: Thu, 11 Jun 2015 15:35:31 +0200
> -Subject: [PATCH] cpp-crossbuild
> -
> -Patch from: NIIBE Yutaka <gniibe@fsij.org>
> -
> -Cross-building logrotate with dpkg-cross, I encountered a problem.
> -dpkg-cross sets CPP variable, and compilation failures, because
> -the executable 'cpp' does not accept multiple input files.
> ----
> - Makefile | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/Makefile b/Makefile
> -index 5a42fb6b6a31..76f483a68fa0 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -130,7 +130,7 @@ clean:
> - 	rm -f ./test/test.ACL ./test/test.SELINUX ./test/error.log
> - 
> - depend:
> --	$(CPP) $(CFLAGS) -M $(SOURCES) > .depend
> -+	$(CC) -E $(CFLAGS) -M $(SOURCES) > .depend
> - 
> - # pretest create the file ./test/test.ACL with
> - # 0 or 1 according to the WITH_ACL=yes presence.
> diff --git a/patches/logrotate-3.9.1/0004-chown-484762.patch b/patches/logrotate-3.9.1/0004-chown-484762.patch
> deleted file mode 100644
> index 925218270fe9..000000000000
> --- a/patches/logrotate-3.9.1/0004-chown-484762.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: unknown author <unknown.author@example.com>
> -Date: Thu, 11 Jun 2015 15:35:31 +0200
> -Subject: [PATCH] chown-484762
> -
> -===================================================================
> ----
> - logrotate.c | 8 ++++++--
> - 1 file changed, 6 insertions(+), 2 deletions(-)
> -
> -diff --git a/logrotate.c b/logrotate.c
> -index 8ffcff6f6ac0..d609d7acf012 100644
> ---- a/logrotate.c
> -+++ b/logrotate.c
> -@@ -381,8 +381,12 @@ int createOutputFile(char *fileName, int flags, struct stat *sb, acl_type acl, i
> -     if (fchmod(fd, (S_IRUSR | S_IWUSR) & sb->st_mode)) {
> - 	message(MESS_ERROR, "error setting mode of %s: %s\n",
> - 		fileName, strerror(errno));
> --	close(fd);
> --	return -1;
> -+	if (geteuid() == 0) {
> -+		/* If run as non-root, we may not be able to duplicate
> -+		   the ownership of the file. Warn but don't fail. */
> -+		close(fd);
> -+		return -1;
> -+	}
> -     }
> - 
> - 	if (fstat(fd, &sb_create)) {
> diff --git a/patches/logrotate-3.9.1/0005-configure-add-check-for-large-file-support.patch b/patches/logrotate-3.9.1/0005-configure-add-check-for-large-file-support.patch
> deleted file mode 100644
> index 21161dd67fa0..000000000000
> --- a/patches/logrotate-3.9.1/0005-configure-add-check-for-large-file-support.patch
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -From: Marc Kleine-Budde <mkl@pengutronix.de>
> -Date: Thu, 11 Jun 2015 14:27:20 +0200
> -Subject: [PATCH] configure: add check for large file support
> -
> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ----
> - configure.ac | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index e655b85b135b..e39f1d21af72 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -9,6 +9,7 @@ AC_PROG_CC
> - AC_PROG_CC_STDC
> - AC_STRUCT_ST_BLKSIZE
> - AC_STRUCT_ST_BLOCKS
> -+AC_SYS_LARGEFILE
> - 
> - AC_CHECK_LIB([popt],[poptParseArgvString],,
> -   AC_MSG_ERROR([libpopt required but not found]))
> diff --git a/patches/logrotate-3.9.1/autogen.sh b/patches/logrotate-3.9.1/autogen.sh
> deleted file mode 100755
> index 4e86a73425d7..000000000000
> --- a/patches/logrotate-3.9.1/autogen.sh
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -#!/bin/bash
> -
> -set -e
> -
> -touch NEWS README AUTHORS ChangeLog
> -
> -aclocal $ACLOCAL_FLAGS
> -
> -libtoolize \
> -	--force \
> -	--copy
> -
> -autoreconf \
> -	--force \
> -	--install \
> -	--warnings=cross \
> -	--warnings=syntax \
> -	--warnings=obsolete \
> -	--warnings=unsupported
> diff --git a/patches/logrotate-3.9.1/series b/patches/logrotate-3.9.1/series
> deleted file mode 100644
> index 707da2195135..000000000000
> --- a/patches/logrotate-3.9.1/series
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-deb-config-h.patch
> -0002-datehack.patch
> -0003-cpp-crossbuild.patch
> -0004-chown-484762.patch
> -0005-configure-add-check-for-large-file-support.patch
> -# 123be2e87a20230858cf1921048a6046  - git-ptx-patches magic
> diff --git a/rules/logrotate.make b/rules/logrotate.make
> index e7acc66686eb..021418541b1f 100644
> --- a/rules/logrotate.make
> +++ b/rules/logrotate.make
> @@ -15,15 +15,15 @@ PACKAGES-$(PTXCONF_LOGROTATE) += logrotate
>  #
>  # Paths and names
>  #
> -LOGROTATE_VERSION	:= 3.9.1
> -LOGROTATE_MD5		:= 4492b145b6d542e4a2f41e77fa199ab0
> +LOGROTATE_VERSION	:= 3.17.0
> +LOGROTATE_MD5		:= ac2a7151fc8a187201872358a20a2813
>  LOGROTATE		:= logrotate-$(LOGROTATE_VERSION)
> -LOGROTATE_SUFFIX	:= tar.gz
> -LOGROTATE_URL		:= http://downloads.yoctoproject.org/mirror/sources/$(LOGROTATE).$(LOGROTATE_SUFFIX)
> +LOGROTATE_SUFFIX	:= tar.xz
> +LOGROTATE_URL		:= https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION)/$(LOGROTATE).$(LOGROTATE_SUFFIX)
>  LOGROTATE_SOURCE	:= $(SRCDIR)/$(LOGROTATE).$(LOGROTATE_SUFFIX)
>  LOGROTATE_DIR		:= $(BUILDDIR)/$(LOGROTATE)
> -LOGROTATE_LICENSE	:= GPL-2.0-only
> -LOGROTATE_LICENSE_FILES	:= file://COPYING;md5=18810669f13b87348459e611d31ab760
> +LOGROTATE_LICENSE	:= GPL-2.0-or-later
> +LOGROTATE_LICENSE_FILES	:= file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
>  
>  # ----------------------------------------------------------------------------
>  # Compile
> @@ -33,8 +33,11 @@ LOGROTATE_CONF_TOOL := autoconf
>  LOGROTATE_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
>  	$(GLOBAL_LARGE_FILE_OPTION) \
> +	--disable-werror \
> +	--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \
>  	--$(call ptx/wwo, PTXCONF_LOGROTATE_ACL)-acl \
> -	--$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux
> +	--with-state-file-path=/var/lib/logrotate/status \
> +	--with-default-mail-command=/usr/bin/mail
>  
>  LOGROTATE_MAKE_OPT := AM_CFLAGS="-Wall"
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de