Attachment 196637 Details for Bug 227865 – Fix compile; Fix mis-spelled word

[patch] Fix compile; Fix mis-spelled word

apachetop (text/plain), 12.92 KB, created by Nathan on 2018-08-28 11:41:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan

Created: 2018-08-28 11:41:22 UTC

Size: 12.92 KB

patch

obsolete

>Index: sysutils/apachetop/Makefile
>===================================================================
>--- sysutils/apachetop/Makefile	(revision 478190)
>+++ sysutils/apachetop/Makefile	(working copy)
>@@ -2,38 +2,34 @@
> # $FreeBSD$
> 
> PORTNAME=	apachetop
>-PORTVERSION=	0.12.6
>-PORTREVISION=	5
>+PORTVERSION=	0.18.4
> CATEGORIES=	sysutils
>-MASTER_SITES=	https://www.freebsd.systems/files/
> 
> MAINTAINER=	lukasz@wasikowski.net
> COMMENT=	Apache realtime log stats
> 
> LICENSE=	BSD3CLAUSE
>+LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-GNU_CONFIGURE=	yes
>-USES=		ncurses readline
>+HAS_CONFIGURE=		yes
>+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
> 
>+USES=		autoreconf ncurses readline
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	tessus
>+
> PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
> 
> OPTIONS_DEFINE=	ADNS FAM PCRE
>+
> ADNS_DESC=	Asynchronous-capable DNS support
>-
> ADNS_LIB_DEPENDS=	libadns.so:dns/adns
>-ADNS_CONFIGURE_ON=	--with-adns=${LOCALBASE}
>+ADNS_CONFIGURE_WITH=	adns=${LOCALBASE}
> 
> FAM_LIB_DEPENDS=	libfam.so:devel/fam
>-FAM_CONFIGURE_ON=	--with-fam=${LOCALBASE}
>+FAM_CONFIGURE_WITH=	fam=${LOCALBASE}
> 
> PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
>-PCRE_COFNIGURE_ON=	--with-pcre=${LOCALBASE}
>+PCRE_CONFIGURE_WITH=	pcre=${LOCALBASE}
> 
>-post-patch:
>-	@${REINPLACE_CMD} -E -e 's,struct (circle_struct),\1,g' \
>-		${WRKSRC}/src/hits_circle.*
>-	@${REINPLACE_CMD} -E -e 's,enum (adns_queryflags),\1,g' \
>-		${WRKSRC}/src/log.*
>-	@cd ${WRKSRC} && ${TOUCH} -r configure.ac aclocal.m4 stamp-h.in
>-
> .include <bsd.port.mk>
>Index: sysutils/apachetop/distinfo
>===================================================================
>--- sysutils/apachetop/distinfo	(revision 478190)
>+++ sysutils/apachetop/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (apachetop-0.12.6.tar.gz) = 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29
>-SIZE (apachetop-0.12.6.tar.gz) = 126930
>+TIMESTAMP = 1535255129
>+SHA256 (tessus-apachetop-0.18.4_GH0.tar.gz) = 1cbbfd1bf12275fb21e0cb6068b9050b2fee8c276887054a015bf103a1ae9cc6
>+SIZE (tessus-apachetop-0.18.4_GH0.tar.gz) = 43047
>Index: sysutils/apachetop/files/patch-apachetop.h
>===================================================================
>--- sysutils/apachetop/files/patch-apachetop.h	(revision 478190)
>+++ sysutils/apachetop/files/patch-apachetop.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/apachetop.h.orig	Tue Dec 30 01:03:05 2003
>-+++ src/apachetop.h	Tue Dec 30 01:03:32 2003
>-@@ -190,7 +190,7 @@
>- #define DEBUG_OUTPUT "/tmp/atop.debug"
>- 
>- #ifndef DEFAULT_LOGFILE
>--# define DEFAULT_LOGFILE "/var/httpd/apache_log"
>-+# define DEFAULT_LOGFILE "/var/log/httpd-access.log"
>- #endif
>- #define DEFAULT_CIRCLE_SIZE 30
>- #define DEFAULT_CIRCLE_MODE TIMED_CIRCLE
>
>Property changes on: sysutils/apachetop/files/patch-apachetop.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-resolver.h
>===================================================================
>--- sysutils/apachetop/files/patch-resolver.h	(revision 478190)
>+++ sysutils/apachetop/files/patch-resolver.h	(nonexistent)
>@@ -1,13 +0,0 @@
>---- src/resolver.h.orig	2005-10-15 18:10:01.000000000 +0200
>-+++ src/resolver.h	2008-11-20 16:14:31.000000000 +0100
>-@@ -10,8 +10,8 @@
>- class Resolver
>- {
>- 	public:
>--	Resolver::Resolver(void);
>--	Resolver::~Resolver(void);
>-+	Resolver(void);
>-+	~Resolver(void);
>- 	int add_request(char *request, enum resolver_action act);
>- 
>- 
>
>Property changes on: sysutils/apachetop/files/patch-resolver.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-src_apachetop.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_apachetop.cc	(revision 478190)
>+++ sysutils/apachetop/files/patch-src_apachetop.cc	(nonexistent)
>@@ -1,20 +0,0 @@
>---- src/apachetop.cc.orig	2005-10-15 16:23:31 UTC
>-+++ src/apachetop.cc
>-@@ -271,7 +271,7 @@ int main(int argc, char *argv[])
>- 	hm->create(cf.circle_size);
>- 	/* }}} */
>- 
>--	memset(&gstats, (char) NULL, sizeof(gstats));
>-+	memset(&gstats, 0, sizeof(gstats));
>- 	gstats.start = time(NULL);
>- 
>- 	signal(SIGINT, &catchsig);
>-@@ -465,7 +465,7 @@ int main(int argc, char *argv[])
>- 					continue;
>- 				}
>- 
>--				*nextline = (char) NULL;
>-+				*nextline = '\0';
>- 				++nextline;
>- 
>- 				/* which parser? */
>
>Property changes on: sysutils/apachetop/files/patch-src_apachetop.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-src_display.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_display.cc	(revision 478190)
>+++ sysutils/apachetop/files/patch-src_display.cc	(nonexistent)
>@@ -1,20 +0,0 @@
>---- src/display.cc.orig	2005-10-15 16:10:01 UTC
>-+++ src/display.cc
>-@@ -1191,7 +1191,7 @@ void display_histogram()
>- 
>- 		/* compose a row of hashes */
>- 		memset(line, ' ', hist_width);
>--		line[hist_width] = (char)NULL;
>-+		line[hist_width] = '\0';
>- 		for(j = 0 ; j < hist_width ; ++j)
>- 		{
>- 			if (bar_height[j] > y_scale)
>-@@ -1203,7 +1203,7 @@ void display_histogram()
>- 	}
>- 
>- 	memset(horiz_line, '-', hist_width);
>--	horiz_line[hist_width] = (char)NULL;
>-+	horiz_line[hist_width] = '\0';
>- 	mvprintw(HISTOGRAM_START + hist_height, 2, "0+%*s",
>- 	    hist_width, horiz_line);
>- 	
>
>Property changes on: sysutils/apachetop/files/patch-src_display.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-src_hits__circle.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_hits__circle.cc	(revision 478190)
>+++ sysutils/apachetop/files/patch-src_hits__circle.cc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/hits_circle.cc.orig	2018-02-04 09:36:17 UTC
>-+++ src/hits_circle.cc
>-@@ -24,7 +24,7 @@ int Hits_Circle::create(unsigned int passed_size)
>- 	}
>- 
>- 	reqcount = bytecount = 0;
>--	memset(rc_summary, (char) NULL, sizeof(rc_summary));
>-+	memset(rc_summary, 0, sizeof(rc_summary));
>- 
>- 	return 0;
>- }
>
>Property changes on: sysutils/apachetop/files/patch-src_hits__circle.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-src_inlines.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_inlines.cc	(nonexistent)
>+++ sysutils/apachetop/files/patch-src_inlines.cc	(working copy)
>@@ -0,0 +1,37 @@
>+--- src/inlines.cc.orig	2018-08-28 11:21:23 UTC
>++++ src/inlines.cc
>+@@ -4,10 +4,10 @@
>+ #define ONE_EIGHTH      4
>+ #define HIGH_BITS       (~((unsigned int)(~0) >> ONE_EIGHTH))
>+ 
>+-inline unsigned int StringHash(register const char *str)
>++inline unsigned int StringHash( const char *str)
>+ {
>+-	register unsigned int val;
>+-	register unsigned int i;
>++	 unsigned int val;
>++	 unsigned int i;
>+ 
>+ 	for (val = 0; *str; str++)
>+ 	{
>+@@ -19,9 +19,9 @@ inline unsigned int StringHash(register const char *st
>+ 	return val;
>+ }
>+ 
>+-inline unsigned int QuickHash(register const char *str)
>++inline unsigned int QuickHash( const char *str)
>+ {
>+-	register unsigned int val, tmp;
>++	 unsigned int val, tmp;
>+ 
>+ 	for(val = 0 ; *str ; str++)
>+ 	{
>+@@ -32,7 +32,7 @@ inline unsigned int QuickHash(register const char *str
>+ 	return val;
>+ }
>+ 
>+-inline unsigned long TTHash(register const char *str)
>++inline unsigned long TTHash( const char *str)
>+ {
>+ 	unsigned long hash = 5381;
>+ 	int c;
>
>Property changes on: sysutils/apachetop/files/patch-src_inlines.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/files/patch-src_log.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_log.cc	(revision 478190)
>+++ sysutils/apachetop/files/patch-src_log.cc	(working copy)
>@@ -1,56 +1,11 @@
>---- src/log.cc.orig	2018-02-04 09:36:17 UTC
>+--- src/log.cc.orig	2018-08-28 11:26:42 UTC
> +++ src/log.cc
>-@@ -37,7 +37,7 @@ int CommonLogParser::parse(char *logline, struct logbi
>- 	if (!bufcp)
>- 		return -1;
>- 	
>--	*bufcp = (char) NULL;
>-+	*bufcp = '\0';
>- 	++bufcp;
>+@@ -72,7 +72,7 @@ int CommonLogParser::parse(char *logline, struct logbi
>+ 			/* fire off a query with adns */
>+ 			b->dns_query = new adns_query;
>+ 			adns_submit(adns, ptr, adns_r_a,
>+-			    (adns_queryflags) NULL, NULL, b->dns_query);
>++			    (adns_queryflags) 0, 0, b->dns_query);
>  
>- 	/* 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
>- 	/* find the end of referrer and null it */
>- 	if (!(bufcp = strchr(bufsp, '"')))
>- 		return -1;
>--	*bufcp = (char) NULL;
>-+	*bufcp = '\0';
>- 
>- 	/* 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) /* {{{ */
>- 		return NULL;
>- 
>- 	/* null the space in front of it */
>--	*endptr = (char) NULL;
>-+	*endptr = '\0';
>- 
>- 	/* TODO maybe we can use the protocol someday.. */
>- 
>-@@ -258,7 +258,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
>- 	char *bufcp, *endptr, *workptr;
>- 
>- 	endptr = *url + *length;
>--	*endptr = (char) NULL;
>-+	*endptr = '\0';
>- 
>- 	/* do we want to keep the query string? */
>- 	if (!cf.keep_querystring)
>-@@ -273,7 +273,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
>- 			if (workptr < endptr)
>- 			{
>- 				/* we're ok */
>--				*workptr = (char) NULL;
>-+				*workptr = '\0';
>- 				bufcp = workptr+1;
>- 			}
>- 		}
>-@@ -308,7 +308,7 @@ int LogParser::mungeURL(char **url, int *length) /* {{
>- 			if (workptr == endptr)
>- 				bufcp = workptr;
>- 		}
>--		*bufcp = (char) NULL;
>-+		*bufcp = '\0';
>- 	}
>- 
>- 
>+ 			b->ip_pos = im->insert(RESOLVING_STRING);
>+ 			b->ip_hash = TTHash(RESOLVING_STRING);
>Index: sysutils/apachetop/files/patch-src_ohtbl.cc
>===================================================================
>--- sysutils/apachetop/files/patch-src_ohtbl.cc	(nonexistent)
>+++ sysutils/apachetop/files/patch-src_ohtbl.cc	(working copy)
>@@ -0,0 +1,38 @@
>+--- src/ohtbl.cc.orig	2018-08-28 11:24:15 UTC
>++++ src/ohtbl.cc
>+@@ -13,7 +13,7 @@ static int primes[] = {101, 241, 499, 1009, 2003, 3001
>+ 
>+ int OAHash::getNextPrime(int size)
>+ {
>+-	register int *prime;
>++	 int *prime;
>+ 	for (prime = &primes[0] ; *prime ; prime++)
>+ 		if (*prime > size)
>+ 			return *prime;
>+@@ -51,7 +51,7 @@ void OAHash::destroy(void)
>+ 
>+ void *OAHash::insert(char *key, void *data)
>+ {
>+-	register unsigned int p, i;
>++	 unsigned int p, i;
>+ 	void *d;
>+  
>+ 	// Do not exceed the number of positions in the table.
>+@@ -81,7 +81,7 @@ void *OAHash::insert(char *key, void *data)
>+ 
>+ int OAHash::remove(char *key)
>+ {
>+-	register unsigned int p, i;
>++	 unsigned int p, i;
>+ 
>+ 	for (i = 0; i < positions; ++i)
>+ 	{
>+@@ -108,7 +108,7 @@ int OAHash::remove(char *key)
>+ 
>+ void *OAHash::lookup(char *key)
>+ {
>+-	register unsigned int p, i;
>++	 unsigned int p, i;
>+ 
>+ 	for (i = 0; i < positions; ++i)
>+ 	{
>
>Property changes on: sysutils/apachetop/files/patch-src_ohtbl.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: sysutils/apachetop/pkg-descr
>===================================================================
>--- sysutils/apachetop/pkg-descr	(revision 478190)
>+++ sysutils/apachetop/pkg-descr	(working copy)
>@@ -1,4 +1,4 @@
> ApacheTop watches a logfile generated by Apache (in standard common or
> combined log format) and generates human-parsable output in realtime.
> 
>-WWW: http://www.webta.org/projects/apachetop/
>+WWW: https://github.com/tessus/apachetop

Actions: View | Diff

Attachments on bug 227865: 196553 | 196595 | 196637