CVS commit: pkgsrc/www/goaccess

["Sebastian Wiedenroth" <wiedi%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiedi
Date:           Sun Oct 30 21:58:30 UTC 2022

Modified Files:
        pkgsrc/www/goaccess: Makefile distinfo
Added Files:
        pkgsrc/www/goaccess/patches: patch-src_parser.c patch-src_util.c

Log Message:
goaccess: add patches to fix netbsd and illumos


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/goaccess/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/goaccess/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/www/goaccess/patches/patch-src_parser.c
cvs rdiff -u -r0 -r1.1 pkgsrc/www/goaccess/patches/patch-src_util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/goaccess/Makefile
diff -u pkgsrc/www/goaccess/Makefile:1.33 pkgsrc/www/goaccess/Makefile:1.34
--- pkgsrc/www/goaccess/Makefile:1.33   Sat Oct  1 17:01:58 2022
+++ pkgsrc/www/goaccess/Makefile        Sun Oct 30 21:58:29 2022
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2022/10/01 17:01:58 wiedi Exp $
+# $NetBSD: Makefile,v 1.34 2022/10/30 21:58:29 wiedi Exp $
 
 DISTNAME=      goaccess-1.6.4
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  http://tar.goaccess.io/
 

Index: pkgsrc/www/goaccess/distinfo
diff -u pkgsrc/www/goaccess/distinfo:1.24 pkgsrc/www/goaccess/distinfo:1.25
--- pkgsrc/www/goaccess/distinfo:1.24   Sat Oct  1 17:01:58 2022
+++ pkgsrc/www/goaccess/distinfo        Sun Oct 30 21:58:29 2022
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.24 2022/10/01 17:01:58 wiedi Exp $
+$NetBSD: distinfo,v 1.25 2022/10/30 21:58:29 wiedi Exp $
 
 BLAKE2s (goaccess-1.6.4.tar.gz) = 11219c5530ccde6375f049262b2600e5162d37e544669ed1b0f52fb14ddd0750
 SHA512 (goaccess-1.6.4.tar.gz) = ea3856e9d75062009ee7e571b7060838a360d67d7ee9f8edc1334f2c32398f5bf137555e291711dc712885c139766e6e840b8a49fe0f9c8271dcaf0059c43161
 Size (goaccess-1.6.4.tar.gz) = 673877 bytes
 SHA1 (patch-Makefile.am) = e72d4ac63fd2f9f236ce1feae9b021db2128b725
 SHA1 (patch-configure.ac) = 5fff879e582676839cbff2ff63907b792bcd941f
+SHA1 (patch-src_parser.c) = cb68cb145dd17007697241cac1f495ce7e66ad3c
+SHA1 (patch-src_util.c) = 23a46cde8088df4aaf2b77ea7519c25cda904e26

Added files:

Index: pkgsrc/www/goaccess/patches/patch-src_parser.c
diff -u /dev/null pkgsrc/www/goaccess/patches/patch-src_parser.c:1.3
--- /dev/null   Sun Oct 30 21:58:30 2022
+++ pkgsrc/www/goaccess/patches/patch-src_parser.c      Sun Oct 30 21:58:30 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_parser.c,v 1.3 2022/10/30 21:58:30 wiedi Exp $
+
+Fixes build on netbsd
+
+--- src/parser.c.orig  2022-09-29 20:27:15.000000000 +0000
++++ src/parser.c
+@@ -1360,7 +1360,7 @@ find_xff_host (GLogItem * logitem, char 
+   /* if the log format current char is not within the braces special chars, then
+    * we assume the range of IPs are within hard delimiters */
+   if (!strchr (skips, **p) && strchr (*str, **p)) {
+-    strcpy (pch, (char[2]) { (char) **p, '\0' });
++    strcpy (pch, ((char[2]) { (char) **p, '\0' }));
+     if (!(extract = parse_string (&(*str), pch, 1)))
+       goto clean;
+ 

Index: pkgsrc/www/goaccess/patches/patch-src_util.c
diff -u /dev/null pkgsrc/www/goaccess/patches/patch-src_util.c:1.1
--- /dev/null   Sun Oct 30 21:58:30 2022
+++ pkgsrc/www/goaccess/patches/patch-src_util.c        Sun Oct 30 21:58:30 2022
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_util.c,v 1.1 2022/10/30 21:58:30 wiedi Exp $
+
+No tm_gmtoff on SunOS
+
+--- src/util.c.orig    2022-09-29 15:15:53.000000000 +0000
++++ src/util.c
+@@ -568,7 +568,11 @@ tm2time (const struct tm *src) {
+   struct tm tmp;
+ 
+   tmp = *src;
++#if defined(__sun)
++  return timegm (&tmp);
++#else
+   return timegm (&tmp) - src->tm_gmtoff;
++#endif
+ }
+ 
+ void