diff options
Diffstat (limited to 'sysutils/logrotate')
| -rw-r--r-- | sysutils/logrotate/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/logrotate/PLIST | 3 | ||||
| -rw-r--r-- | sysutils/logrotate/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/logrotate/patches/patch-Makefile.am | 15 | ||||
| -rw-r--r-- | sysutils/logrotate/patches/patch-config.c | 47 |
5 files changed, 62 insertions, 26 deletions
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile index 7ac656093eb..caccb31e851 100644 --- a/sysutils/logrotate/Makefile +++ b/sysutils/logrotate/Makefile @@ -1,20 +1,23 @@ -# $NetBSD: Makefile,v 1.10 2015/06/29 12:28:55 nils Exp $ +# $NetBSD: Makefile,v 1.11 2016/02/24 20:50:29 nils Exp $ -DISTNAME= logrotate-3.9.1 +DISTNAME= ${GHCOMMIT} +PKGNAME= logorate-3.9.2 CATEGORIES= sysutils -MASTER_SITES= https://fedorahosted.org/releases/l/o/logrotate/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=logrotate/logrotate/archive/} MAINTAINER= nils@NetBSD.org -HOMEPAGE= https://fedorahosted.org/logrotate/ +HOMEPAGE= ${MASTER_SITE_GITHUB:=logrotate/logrotate/} COMMENT= Daemon to rotate, compress, remove and mail system log files LICENSE= gnu-gpl-v2 +GHCOMMIT= f6ca8f386d1444ef46b7eaf8b3f8a19f2b548f60 USE_TOOLS+= gmake gzip:run gunzip:run mail:run automake autoconf USE_LIBTOOL= yes GNU_CONFIGURE= yes HAS_CONFIGURE= yes NO_EXPORT_CPP= yes +WRKSRC= ${WRKDIR}/logrotate-${GHCOMMIT} CONFIGURE_ENV+= STATEFILE=\"${VARBASE}/db/logrotate.status\" CONFIGURE_ENV+= DEFAULT_MAIL_COMMAND=\"${MAIL_CMD:Q}\" CONFIGURE_ENV+= COMPRESS_COMMAND=\"${GZIP_CMD:[1]:Q}\" diff --git a/sysutils/logrotate/PLIST b/sysutils/logrotate/PLIST index 28dabfa0d1d..657a360978d 100644 --- a/sysutils/logrotate/PLIST +++ b/sysutils/logrotate/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/01/10 18:16:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/02/24 20:50:29 nils Exp $ man/man5/logrotate.conf.5 man/man8/logrotate.8 sbin/logrotate @@ -6,5 +6,6 @@ share/doc/logrotate/CHANGES share/doc/logrotate/COPYING 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 diff --git a/sysutils/logrotate/distinfo b/sysutils/logrotate/distinfo index f3dec0f0514..47a56583bf3 100644 --- a/sysutils/logrotate/distinfo +++ b/sysutils/logrotate/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2015/11/04 01:32:20 agc Exp $ +$NetBSD: distinfo,v 1.11 2016/02/24 20:50:29 nils Exp $ -SHA1 (logrotate-3.9.1.tar.gz) = 7ba734cd1ffa7198b66edc4bca17a28ea8999386 -RMD160 (logrotate-3.9.1.tar.gz) = e2fd3ca124735c5d54c85a7e620b9b018b4066ef -SHA512 (logrotate-3.9.1.tar.gz) = e6da7c7f067befaf2441e9c6ce77e53cf5ddb4f56cc3304c3e50873b6f20c68520f4a0e50ec466cbebcbed20bfd77bf6dfc489975a8131e9573fb19856c0fe28 -Size (logrotate-3.9.1.tar.gz) = 79061 bytes -SHA1 (patch-Makefile.am) = 857e290854f3925e42e85469ac28ea06fad70727 +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 (patch-examples_logrotate-default) = 57fc602caa5eeaa830f5d2dc0667e11330bcd1e8 SHA1 (patch-examples_logrotate.cron) = 02981cb2b49e3f3f500fcb3db9b5dcb5fe62bddc SHA1 (patch-logrotate.8) = 0bf7d9cfbc2f5dfff42a82b523926b9c8d0362a0 diff --git a/sysutils/logrotate/patches/patch-Makefile.am b/sysutils/logrotate/patches/patch-Makefile.am deleted file mode 100644 index 01936a2a942..00000000000 --- a/sysutils/logrotate/patches/patch-Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-Makefile.am,v 1.1 2015/06/29 12:28:55 nils Exp $ - -Workaround to successfully compile everything - ---- Makefile.am.orig 2015-04-03 07:39:35.000000000 +0000 -+++ Makefile.am -@@ -1,7 +1,7 @@ - MAN = logrotate.8 - MAN5 = logrotate.conf.5 - --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - sbin_PROGRAMS = logrotate - logrotate_SOURCES = logrotate.c log.c config.c basenames.c - diff --git a/sysutils/logrotate/patches/patch-config.c b/sysutils/logrotate/patches/patch-config.c new file mode 100644 index 00000000000..5e6d3c3a6c0 --- /dev/null +++ b/sysutils/logrotate/patches/patch-config.c @@ -0,0 +1,47 @@ +$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", |