cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for Apachetop to 0.17.4:

Browse Source 
Swtich to github and fix clang6.

https://github.com/tessus/apachetop/releases

OK sthen@
This commit is contained in:
gonzalo 2018-04-10 13:25:34 +00:00
parent 96e84dec23
commit bb2ee1e480
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sysutils/apachetop/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2018/04/08 10:30:32 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2018/04/10 13:25:34 gonzalo Exp $
COMMENT = top-like monitor for Apache
DISTNAME = apachetop-0.12.6
REVISION = 3
V = 0.17.4
DISTNAME = apachetop-$V
CATEGORIES = sysutils
MAINTAINER = Gonzalo L. R. <gonzalo@openbsd.org>
@ -13,14 +13,12 @@ HOMEPAGE = https://github.com/tessus/apachetop
# BSD
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES = http://www.webta.org/apachetop/
MASTER_SITES = https://github.com/tessus/apachetop/releases/download/$V/
CONFIGURE_STYLE = autoconf
AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-fam \
--with-logfile=/var/www/logs/access_log
CONFIGURE_ARGS = --with-logfile=/var/www/logs/access_log
WANTLIB += c m ncurses readline ${COMPILER_LIBCXX}
WANTLIB += c m curses readline ${COMPILER_LIBCXX}
.include <bsd.port.mk>

4
sysutils/apachetop/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (apachetop-0.12.6.tar.gz) = hQBiQUUXBV6rJEC3iLUD1F6+mykNSy4Cel+IetcPPyk=
SIZE (apachetop-0.12.6.tar.gz) = 126930
SHA256 (apachetop-0.17.4.tar.gz) = D/4sRtZP3y2WaWmw7+quVUb4kvj5pDX+n5KY2s2cO2k=
SIZE (apachetop-0.17.4.tar.gz) = 128153

14
sysutils/apachetop/patches/patch-src_log_cc
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_log_cc,v 1.1 2018/04/08 10:30:32 sthen Exp $
$OpenBSD: patch-src_log_cc,v 1.2 2018/04/10 13:25:34 gonzalo Exp $
Index: src/log.cc
--- src/log.cc.orig
@ -6,13 +6,13 @@ Index: src/log.cc
@@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
if (!bufcp)
return -1;
- *bufcp = (char) NULL;
+ *bufcp = '\0';
++bufcp;
/* quickly figure out if this is an IP or a host. We do this by
@@ -172,7 +172,7 @@ int CommonLogParser::parse(char *logline, struct logbi
@@ -176,7 +176,7 @@ int CommonLogParser::parse(char *logline, struct logbi
/* find the end of referrer and null it */
if (!(bufcp = strchr(bufsp, '"')))
return -1;
@ -21,7 +21,7 @@ Index: src/log.cc
/* unless they want to keep it, skip over the protocol, ie http:// */
if ((cf.preserve_ref_protocol == 0) && (bufcp = strstr(bufsp, "://")))
@@ -230,7 +230,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
@@ -234,7 +234,7 @@ char *LogParser::processURL(char **buf) /* {{{ */
return NULL;
/* null the space in front of it */
@ -30,7 +30,7 @@ Index: src/log.cc
/* TODO maybe we can use the protocol someday.. */
@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
@@ -262,7 +262,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
char *bufcp, *endptr, *workptr;
endptr = *url + *length;
@ -39,7 +39,7 @@ Index: src/log.cc
/* do we want to keep the query string? */
if (!cf.keep_querystring)
@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
@@ -277,7 +277,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
if (workptr < endptr)
{
/* we're ok */
@ -48,7 +48,7 @@ Index: src/log.cc
bufcp = workptr+1;
}
}
@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
@@ -312,7 +312,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
if (workptr == endptr)
bufcp = workptr;
}