summaryrefslogtreecommitdiff
path: root/sysutils/logrotate
diff options
context:
space:
mode:
authornils <nils>2017-01-26 20:12:32 +0000
committernils <nils>2017-01-26 20:12:32 +0000
commit09a472f1c5a73dfd8ce9decb8cf9c38174901e6c (patch)
tree26b648cf25f5989ff18d1fbcc7870622ba73487f /sysutils/logrotate
parent6ebdea73a61b507b1799282e0c9c6e2fe7457ad7 (diff)
downloadpkgsrc-09a472f1c5a73dfd8ce9decb8cf9c38174901e6c.tar.gz
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.
Diffstat (limited to 'sysutils/logrotate')
-rw-r--r--sysutils/logrotate/Makefile10
-rw-r--r--sysutils/logrotate/PLIST5
-rw-r--r--sysutils/logrotate/distinfo16
-rw-r--r--sysutils/logrotate/patches/patch-config.c16
-rw-r--r--sysutils/logrotate/patches/patch-examples_logrotate-default6
-rw-r--r--sysutils/logrotate/patches/patch-examples_logrotate.cron6
-rw-r--r--sysutils/logrotate/patches/patch-logrotate.828
7 files changed, 38 insertions, 49 deletions
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 5de354f1b2e..bc950414231 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -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/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}/db/logrotate.status\"
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
diff --git a/sysutils/logrotate/PLIST b/sysutils/logrotate/PLIST
index 657a360978d..64c3306160e 100644
--- a/sysutils/logrotate/PLIST
+++ b/sysutils/logrotate/PLIST
@@ -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
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index f688c0f0f0c..534f14cbc03 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -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
diff --git a/sysutils/logrotate/patches/patch-config.c b/sysutils/logrotate/patches/patch-config.c
new file mode 100644
index 00000000000..da4ae74f137
--- /dev/null
+++ b/sysutils/logrotate/patches/patch-config.c
@@ -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>
diff --git a/sysutils/logrotate/patches/patch-examples_logrotate-default b/sysutils/logrotate/patches/patch-examples_logrotate-default
index e94203ce493..e1f3e86319d 100644
--- a/sysutils/logrotate/patches/patch-examples_logrotate-default
+++ b/sysutils/logrotate/patches/patch-examples_logrotate-default
@@ -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.
diff --git a/sysutils/logrotate/patches/patch-examples_logrotate.cron b/sysutils/logrotate/patches/patch-examples_logrotate.cron
index 490c6e0a5d8..854d450749a 100644
--- a/sysutils/logrotate/patches/patch-examples_logrotate.cron
+++ b/sysutils/logrotate/patches/patch-examples_logrotate.cron
@@ -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]"
diff --git a/sysutils/logrotate/patches/patch-logrotate.8 b/sysutils/logrotate/patches/patch-logrotate.8
deleted file mode 100644
index 4c6ca2f74c7..00000000000
--- a/sysutils/logrotate/patches/patch-logrotate.8
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-logrotate.8,v 1.3 2013/07/28 11:21:23 obache Exp $
-
-Add pkgsrc paths compatibility
-
---- logrotate.8.orig 2013-06-10 12:02:36.000000000 +0000
-+++ logrotate.8
-@@ -59,7 +59,7 @@ and mail it to the recipient. The defaul
- \fB\-s\fR, \fB\-\-state <statefile>\fR
- Tells \fBlogrotate\fR to use an alternate state file. This is useful
- if logrotate is being run as a different user for various sets of
--log files. The default state file is \fI/var/lib/logrotate.status\fR.
-+log files. The default state file is \fI@VARBASE@/db/logrotate.status\fR.
-
- .TP
- \fB\-\-usage\fR
-@@ -523,10 +523,10 @@ Log files are rotated if the current yea
- .SH FILES
- .PD 0
- .TP 27
--\fI/var/lib/logrotate.status\fR
-+\fI@VARBASE@/db/logrotate.status\fR
- Default state file.
- .TP 27
--\fI/etc/logrotate.conf\fR
-+\fI@PKG_SYSCONFDIR@/logrotate.conf\fR
- Configuration options.
-
- .SH SEE ALSO