Re: [ptxdist] [PATCH] logrotate: upgrade to 3.8.7

[Michael Olbrich <m.olbrich@pengutronix.de>]

On Fri, Jan 24, 2014 at 05:13:58PM +0100, Alexander Dahl wrote:
> This is a major upgrade from an almost ten years old release to the
> current release. I reviewed the patch series against current Debian
> (sid) patches and upstream changes. Everything not in the current Debian
> patches went upstream. There's one old patch ptx-timeext.patch which
> does not apply anymore. If anyone needs the features from it, maybe she
> could port it by herself. This patch is still included here, but not in
> the series file.

Just remove the patch and mention it in the commit log.
Also drop the two man-page only patches.

[...]
> diff --git a/patches/logrotate-3.8.7/0001-deb-config-h.patch b/patches/logrotate-3.8.7/0001-deb-config-h.patch
> new file mode 100644
> index 0000000..fcd2190
> --- /dev/null
> +++ b/patches/logrotate-3.8.7/0001-deb-config-h.patch
> @@ -0,0 +1,29 @@
> +From: unknown author <unknown.author@example.com>
> +Date: Fri, 24 Jan 2014 16:45:55 +0100
> +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 d715c5a..9a7df22 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
[...]

This one as well I think. We don't have "mail" anyways (I think?) and
/var/lib/logrotate.status is better, because it doesn't require a separate
directory.

Michael

[...]
> diff --git a/rules/logrotate.make b/rules/logrotate.make
> index 5ad7071..145d29e 100644
> --- a/rules/logrotate.make
> +++ b/rules/logrotate.make
> @@ -17,13 +17,14 @@ PACKAGES-$(PTXCONF_LOGROTATE) += logrotate
>  #
>  # Paths and names
>  #
> -LOGROTATE_VERSION	:= 3.7.1
> -LOGROTATE_MD5		:= 12207ce768031878f6ab70c559043ae2
> +LOGROTATE_VERSION	:= 3.8.7
> +LOGROTATE_MD5		:= 99e08503ef24c3e2e3ff74cc5f3be213
>  LOGROTATE		:= logrotate-$(LOGROTATE_VERSION)
>  LOGROTATE_SUFFIX	:= tar.gz
> -LOGROTATE_URL		:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(LOGROTATE).$(LOGROTATE_SUFFIX)
> +LOGROTATE_URL		:= https://fedorahosted.org/releases/l/o/logrotate/$(LOGROTATE).$(LOGROTATE_SUFFIX)
>  LOGROTATE_SOURCE	:= $(SRCDIR)/$(LOGROTATE).$(LOGROTATE_SUFFIX)
>  LOGROTATE_DIR		:= $(BUILDDIR)/$(LOGROTATE)
> +LOGROTATE_LICENSE	:= GPLv2
>  
>  # ----------------------------------------------------------------------------
>  # Compile
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de