CVS commit: pkgsrc/sysutils/logrotate

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/logrotate
From: "Nils Ratusznik" <nils%netbsd.org@localhost>
Date: Thu, 26 Jan 2017 20:12:32 +0000

Module Name:    pkgsrc
Committed By:   nils
Date:           Thu Jan 26 20:12:32 UTC 2017

Modified Files:
        pkgsrc/sysutils/logrotate: Makefile PLIST distinfo
        pkgsrc/sysutils/logrotate/patches: patch-examples_logrotate-default
            patch-examples_logrotate.cron
Added Files:
        pkgsrc/sysutils/logrotate/patches: patch-config.c
Removed Files:
        pkgsrc/sysutils/logrotate/patches: patch-logrotate.8

Log Message:
Updated to version 3.11.0.

Upstream Changelog :
- Add taboopat configuration directive to exclude configuration
  files based on globing patterns.
- Allow to change default state path at build time
  (via the --with-state-file-path option of the configure script).
- Automatically determine resulting file suffix based on
  the compression program in use.
- Preserve SELinux context with compress and sharedscripts properly.
- Rename already existing output files to avoid collisions.
- Import systemd service and timer for logrotate from openSUSE.
- Introduce the addextension configuration directive.
- Create CONTRIBUTING.md with instructions for logrotate contributors.
- Maintain ChangeLog.md instead of the legacy CHANGES file.
- Make createolddir configuration directive preserve sticky bit.
- Add minage configuration directive to specify minimum file age to rotate.
- 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.

Pkgsrc changes :
- due to (not so) new compilation system, and recent changes for the
  manpage, patch-logrotate.8 is now unnecessary and removed ;
- fixed compilation issue in config.c about libgen.h ;
- updated existing patches to work with new version.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/logrotate/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/logrotate/PLIST
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/logrotate/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/sysutils/logrotate/patches/patch-config.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/logrotate/patches/patch-logrotate.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/logrotate/Makefile
diff -u pkgsrc/sysutils/logrotate/Makefile:1.14 pkgsrc/sysutils/logrotate/Makefile:1.15
--- pkgsrc/sysutils/logrotate/Makefile:1.14     Wed Aug  3 12:49:36 2016
+++ pkgsrc/sysutils/logrotate/Makefile  Thu Jan 26 20:12:32 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2016/08/03 12:49:36 nils Exp $
+# $NetBSD: Makefile,v 1.15 2017/01/26 20:12:32 nils Exp $
 
 DISTNAME=              ${GHCOMMIT}
-PKGNAME=               logrotate-3.10.0
+PKGNAME=               logrotate-3.11.0
 CATEGORIES=            sysutils
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=logrotate/logrotate/archive/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=             https://github.com/logrotate/
 COMMENT=               Daemon to rotate, compress, remove and mail system log files
 LICENSE=               gnu-gpl-v2
 
-GHCOMMIT=              ca742b9dd72b7815e87cb53331f08d46fe21d86c
+GHCOMMIT=              f16495b3e5f3e5f333956a384fdc9917fc8ec81a
 USE_TOOLS+=            gmake gzip:run gunzip:run mail:run automake autoconf
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
@@ -22,6 +22,7 @@ CONFIGURE_ENV+=               STATEFILE=\"${VARBASE}/
 CONFIGURE_ENV+=                DEFAULT_MAIL_COMMAND=\"${MAIL_CMD:Q}\"
 CONFIGURE_ENV+=                COMPRESS_COMMAND=\"${GZIP_CMD:[1]:Q}\"
 CONFIGURE_ENV+=                UNCOMPRESS_COMMAND=\"${GUNZIP_CMD:[1]:Q}\"
+CONFIGURE_ARGS+=       --with-state-file-path="${VARBASE}/db/logrotate.status"
 
 BUILD_DEFS+=           VARBASE
 EGDIR=                 ${PREFIX}/share/examples/logrotate
@@ -36,7 +37,6 @@ SUBST_STAGE.paths=    pre-build
 SUBST_MESSAGE.paths=   Substituting paths variables.
 SUBST_FILES.paths=     examples/logrotate-default
 SUBST_FILES.paths+=    examples/logrotate.cron
-SUBST_FILES.paths+=    logrotate.8
 SUBST_VARS.paths=      PREFIX
 SUBST_VARS.paths+=     VARBASE
 SUBST_VARS.paths+=     PKG_SYSCONFDIR
@@ -52,7 +52,7 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/examples/logrotate-default ${DESTDIR}${EGDIR}/logrotate.conf
        ${INSTALL_DATA} ${WRKSRC}/examples/logrotate.cron ${DESTDIR}/${EGDIR}
        ${INSTALL_DATA} ${WRKSRC}/README.* ${DESTDIR}${PREFIX}/${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/ChangeLog.md ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/${DOCDIR}
        ${INSTALL_MAN} ${WRKSRC}/logrotate.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
        ${INSTALL_MAN} ${WRKSRC}/logrotate.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8

Index: pkgsrc/sysutils/logrotate/PLIST
diff -u pkgsrc/sysutils/logrotate/PLIST:1.3 pkgsrc/sysutils/logrotate/PLIST:1.4
--- pkgsrc/sysutils/logrotate/PLIST:1.3 Wed Feb 24 20:50:29 2016
+++ pkgsrc/sysutils/logrotate/PLIST     Thu Jan 26 20:12:32 2017
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2016/02/24 20:50:29 nils Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/01/26 20:12:32 nils Exp $
 man/man5/logrotate.conf.5
 man/man8/logrotate.8
 sbin/logrotate
-share/doc/logrotate/CHANGES
 share/doc/logrotate/COPYING
+share/doc/logrotate/ChangeLog.md
 share/doc/logrotate/README.HPUX
 share/doc/logrotate/README.Solaris
 share/doc/logrotate/README.md
 share/examples/logrotate/logrotate.conf
 share/examples/logrotate/logrotate.cron
+@pkgdir etc/logrotate.d

Index: pkgsrc/sysutils/logrotate/distinfo
diff -u pkgsrc/sysutils/logrotate/distinfo:1.12 pkgsrc/sysutils/logrotate/distinfo:1.13
--- pkgsrc/sysutils/logrotate/distinfo:1.12     Wed Aug  3 12:49:36 2016
+++ pkgsrc/sysutils/logrotate/distinfo  Thu Jan 26 20:12:32 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2016/08/03 12:49:36 nils Exp $
+$NetBSD: distinfo,v 1.13 2017/01/26 20:12:32 nils Exp $
 
-SHA1 (ca742b9dd72b7815e87cb53331f08d46fe21d86c.tar.gz) = f28ad00239d725d36b36286dfffeb5b55801951a
-RMD160 (ca742b9dd72b7815e87cb53331f08d46fe21d86c.tar.gz) = 34448a9156d4a30bd978809c595d699a2db091eb
-SHA512 (ca742b9dd72b7815e87cb53331f08d46fe21d86c.tar.gz) = 50cd05a9558d3958155b1a2e6485e58599590a789ab70d0e523a1205beda7e6c04adec1bdd8b34bd263f2d301b26a66d7634faa5232e1a1251482a210aaf0c12
-Size (ca742b9dd72b7815e87cb53331f08d46fe21d86c.tar.gz) = 78769 bytes
-SHA1 (patch-examples_logrotate-default) = 57fc602caa5eeaa830f5d2dc0667e11330bcd1e8
-SHA1 (patch-examples_logrotate.cron) = 02981cb2b49e3f3f500fcb3db9b5dcb5fe62bddc
-SHA1 (patch-logrotate.8) = 0bf7d9cfbc2f5dfff42a82b523926b9c8d0362a0
+SHA1 (f16495b3e5f3e5f333956a384fdc9917fc8ec81a.tar.gz) = 895fb10b66008c54fa49e7159bfbaed4eeb7f52c
+RMD160 (f16495b3e5f3e5f333956a384fdc9917fc8ec81a.tar.gz) = 70308f6d985b95c89d8ead8021c62265e870b21b
+SHA512 (f16495b3e5f3e5f333956a384fdc9917fc8ec81a.tar.gz) = f6a6c23a114e8e56cd0b432a2d41e5e85a568510cfa61482316b9bce63e88ecce5a388c5b485a118bbe14ff26f5b15ef8a9fa10dda34c6688c9c65a57d5cc797
+Size (f16495b3e5f3e5f333956a384fdc9917fc8ec81a.tar.gz) = 84155 bytes
+SHA1 (patch-config.c) = a6c775599857f01fa11bb99113795794f46664f5
+SHA1 (patch-examples_logrotate-default) = 6d3f575cc6563dd8c00dad4b1baa4e9d5eadae3b
+SHA1 (patch-examples_logrotate.cron) = e7e7a3f0ff77b3ee5fbf69ee2acecac136b0be8f

Index: pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default
diff -u pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default:1.3 pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default:1.4
--- pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default:1.3      Wed Mar 11 21:34:16 2015
+++ pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate-default  Thu Jan 26 20:12:32 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-examples_logrotate-default,v 1.3 2015/03/11 21:34:16 nils Exp $
+$NetBSD: patch-examples_logrotate-default,v 1.4 2017/01/26 20:12:32 nils Exp $
 
 Add pkgsrc paths compatibility.
 
---- examples/logrotate-default.orig    2014-10-16 11:12:35.000000000 +0000
+--- examples/logrotate-default.orig    2016-12-02 13:12:33.000000000 +0000
 +++ examples/logrotate-default
 @@ -14,22 +14,7 @@ dateext
  # uncomment this if you want your log files compressed
@@ -26,6 +26,6 @@ Add pkgsrc paths compatibility.
 -    rotate 1
 -}
 +# Packages drop log rotation information into this directory
-+include @PKG_SYSCONFDIR@/logrotate.d
++include /usr/pkg/etc/logrotate.d
  
  # system-specific logs may be also be configured here.

Index: pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron
diff -u pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron:1.1.1.1 pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron:1.2
--- pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron:1.1.1.1     Tue Mar  6 04:53:24 2012
+++ pkgsrc/sysutils/logrotate/patches/patch-examples_logrotate.cron     Thu Jan 26 20:12:32 2017
@@ -1,14 +1,14 @@
-$NetBSD: patch-examples_logrotate.cron,v 1.1.1.1 2012/03/06 04:53:24 sbd Exp $
+$NetBSD: patch-examples_logrotate.cron,v 1.2 2017/01/26 20:12:32 nils Exp $
 
 Add pkgsrc paths compatibility
 
---- examples/logrotate.cron.orig       2011-08-31 12:39:04.000000000 +0000
+--- examples/logrotate.cron.orig       2016-12-02 13:12:33.000000000 +0000
 +++ examples/logrotate.cron
 @@ -1,6 +1,6 @@
  #!/bin/sh
  
 -/usr/sbin/logrotate /etc/logrotate.conf
-+@PREFIX@/sbin/logrotate @PKG_SYSCONFDIR@/logrotate.conf
++/usr/pkg/sbin/logrotate /usr/pkg/etc/logrotate.conf
  EXITVALUE=$?
  if [ $EXITVALUE != 0 ]; then
      /usr/bin/logger -t logrotate "ALERT exited abnormally with [$EXITVALUE]"

Added files:

Index: pkgsrc/sysutils/logrotate/patches/patch-config.c
diff -u /dev/null pkgsrc/sysutils/logrotate/patches/patch-config.c:1.5
--- /dev/null   Thu Jan 26 20:12:32 2017
+++ pkgsrc/sysutils/logrotate/patches/patch-config.c    Thu Jan 26 20:12:32 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-config.c,v 1.5 2017/01/26 20:12:32 nils Exp $
+
+Fix NetBSD compilation.
+
+--- config.c.orig      2016-12-02 13:12:33.000000000 +0000
++++ config.c
+@@ -3,6 +3,9 @@
+ #ifndef __NetBSD__
+ #include <alloca.h>
+ #endif
++#ifndef _LIBGEN_H_
++#  include <libgen.h>
++#endif
+ #include <limits.h>
+ #include <ctype.h>
+ #include <dirent.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index