Updated to version 3.10.0. Changelog :

3.9.2 -> 3.10.0 :
- Legacy Makefile renamed to Makefile.legacy, will be removed eventually.
- Fix 'make dist' and 'make distcheck' to produce a usable release tarball.
- Fix 'olddir' usage with wildcard in the middle of path in the pattern
  definition when the pattern did not match any log file.
- Remove half-rotated files when rotation of particular log file is skipped
  because of an error during copy or compression.

It's not in the official changelog, but compilation errors also have been
fixed for NetBSD, so patches/patch-config.c is not necessary anymore.

3 files changed, 8 insertions, 56 deletions

diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index 96f13b7ed16..5de354f1b2e 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2016/06/09 06:23:40 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/03 12:49:36 nils Exp $
 
 DISTNAME=		${GHCOMMIT}
-PKGNAME=		logrotate-3.9.2
+PKGNAME=		logrotate-3.10.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=		f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60
+GHCOMMIT=		ca742b9dd72b7815e87cb53331f08d46fe21d86c
 USE_TOOLS+=		gmake gzip:run gunzip:run mail:run automake autoconf
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo
index 47a56583bf3..f688c0f0f0c 100644
--- a/sysutils/logrotate/distinfo
+++ b/sysutils/logrotate/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.11 2016/02/24 20:50:29 nils Exp $
+$NetBSD: distinfo,v 1.12 2016/08/03 12:49:36 nils Exp $
 
-SHA1 (f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60.tar.gz) = 888dbb96dc004e029fe8d08356b32ad83a76a61e
-RMD160 (f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60.tar.gz) = 5933b6bce9475b55fecb55814a7b0943ba219b12
-SHA512 (f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60.tar.gz) = f2a372dc556504a38b93228ff425f8b812cd951627c0509f42799319b8e1798f24864bd17661d3919afc641c7c640edb32382f7b507c35e8d8d772fd131e5559
-Size (f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60.tar.gz) = 80878 bytes
-SHA1 (patch-config.c) = aa3e8db2d2aec28c1947187fe19e70a292464cd7
+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
diff --git a/sysutils/logrotate/patches/patch-config.c b/sysutils/logrotate/patches/patch-config.c
deleted file mode 100644
index 5e6d3c3a6c0..00000000000
--- a/sysutils/logrotate/patches/patch-config.c
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-config.c,v 1.3 2016/02/24 20:50:29 nils Exp $
-
-Solves NetBSD compilation errors. Patch submitted upstream (PR #17).
-
---- config.c.orig	2016-01-20 09:47:36.000000000 +0000
-+++ config.c
-@@ -146,11 +146,11 @@ static char *isolateValue(const char *fi
- {
-     char *chptr = *startPtr;
- 
--    while (chptr - *buf < length && isblank(*chptr))
-+    while (chptr - *buf < length && isblank((unsigned char)*chptr))
- 	chptr++;
-     if (chptr - *buf < length && *chptr == '=') {
- 	chptr++;
--	while ( chptr - *buf < length && isblank(*chptr))
-+	while ( chptr - *buf < length && isblank((unsigned char)*chptr))
- 	    chptr++;
-     }
- 
-@@ -167,7 +167,7 @@ static char *isolateValue(const char *fi
- static char *isolateWord(char **strt, char **buf, size_t length) {
- 	char *endtag, *start;
- 	start = *strt;
--	while (start - *buf < length && isblank(*start))
-+	while (start - *buf < length && isblank((unsigned char)*start))
- 		start++;
- 	endtag = start;
- 	while (endtag - *buf < length && isalpha((unsigned char)*endtag)) {
-@@ -868,7 +868,7 @@ static int readConfigFile(const char *co
- 	}
- 	switch (state) {
- 		case STATE_DEFAULT:
--			if (isblank(*start))
-+			if (isblank((unsigned char)*start))
- 				continue;
- 			/* Skip comment */
- 			if (*start == '#') {
-@@ -1533,7 +1533,7 @@ static int readConfigFile(const char *co
- 			break;
- 		case STATE_DEFINITION_END:
- 		case STATE_DEFINITION_END | STATE_SKIP_CONFIG:
--			if (isblank(*start))
-+			if (isblank((unsigned char)*start))
- 				continue;
- 			if (*start != '\n') {
- 				message(MESS_ERROR, "%s:%d, unexpected text after }\n",