head 1.7; access; symbols pkgsrc-2026Q1:1.7.0.136 pkgsrc-2026Q1-base:1.7 pkgsrc-2025Q4:1.7.0.134 pkgsrc-2025Q4-base:1.7 pkgsrc-2025Q3:1.7.0.132 pkgsrc-2025Q3-base:1.7 pkgsrc-2025Q2:1.7.0.130 pkgsrc-2025Q2-base:1.7 pkgsrc-2025Q1:1.7.0.128 pkgsrc-2025Q1-base:1.7 pkgsrc-2024Q4:1.7.0.126 pkgsrc-2024Q4-base:1.7 pkgsrc-2024Q3:1.7.0.124 pkgsrc-2024Q3-base:1.7 pkgsrc-2024Q2:1.7.0.122 pkgsrc-2024Q2-base:1.7 pkgsrc-2024Q1:1.7.0.120 pkgsrc-2024Q1-base:1.7 pkgsrc-2023Q4:1.7.0.118 pkgsrc-2023Q4-base:1.7 pkgsrc-2023Q3:1.7.0.116 pkgsrc-2023Q3-base:1.7 pkgsrc-2023Q2:1.7.0.114 pkgsrc-2023Q2-base:1.7 pkgsrc-2023Q1:1.7.0.112 pkgsrc-2023Q1-base:1.7 pkgsrc-2022Q4:1.7.0.110 pkgsrc-2022Q4-base:1.7 pkgsrc-2022Q3:1.7.0.108 pkgsrc-2022Q3-base:1.7 pkgsrc-2022Q2:1.7.0.106 pkgsrc-2022Q2-base:1.7 pkgsrc-2022Q1:1.7.0.104 pkgsrc-2022Q1-base:1.7 pkgsrc-2021Q4:1.7.0.102 pkgsrc-2021Q4-base:1.7 pkgsrc-2021Q3:1.7.0.100 pkgsrc-2021Q3-base:1.7 pkgsrc-2021Q2:1.7.0.98 pkgsrc-2021Q2-base:1.7 pkgsrc-2021Q1:1.7.0.96 pkgsrc-2021Q1-base:1.7 pkgsrc-2020Q4:1.7.0.94 pkgsrc-2020Q4-base:1.7 pkgsrc-2020Q3:1.7.0.92 pkgsrc-2020Q3-base:1.7 pkgsrc-2020Q2:1.7.0.88 pkgsrc-2020Q2-base:1.7 pkgsrc-2020Q1:1.7.0.68 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.90 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.86 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.84 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.82 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.80 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.78 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.76 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.74 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.72 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.70 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.66 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.64 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.62 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.60 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.58 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.56 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.54 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.52 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.50 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.48 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.46 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.44 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.7.0.42 pkgsrc-2014Q2-base:1.7 pkgsrc-2014Q1:1.7.0.40 pkgsrc-2014Q1-base:1.7 pkgsrc-2013Q4:1.7.0.38 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.36 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.34 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.32 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.30 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.28 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.26 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.7.0.24 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.22 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.20 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.18 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.16 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.14 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.12 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.10 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.8 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.6 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.4 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.2 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.6.0.16 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.6.0.14 pkgsrc-2008Q4-base:1.6 pkgsrc-2008Q3:1.6.0.12 pkgsrc-2008Q3-base:1.6 cube-native-xorg:1.6.0.10 cube-native-xorg-base:1.6 pkgsrc-2008Q2:1.6.0.8 pkgsrc-2008Q2-base:1.6 cwrapper:1.6.0.6 pkgsrc-2008Q1:1.6.0.4 pkgsrc-2008Q1-base:1.6 pkgsrc-2007Q4:1.6.0.2 pkgsrc-2007Q4-base:1.6 pkgsrc-2007Q3:1.5.0.4 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.5.0.2 pkgsrc-2007Q2-base:1.5 pkgsrc-2007Q1:1.4.0.28 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.26 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.24 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.22 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.20 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.18 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.16 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.14 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.12 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.10 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.4.0.8 pkgsrc-2004Q3-base:1.4 pkgsrc-2004Q2:1.4.0.6 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.4.0.4 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.4.0.2 pkgsrc-2003Q4-base:1.4 buildlink2-base:1.4 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.2 FreeBSD-current-1999-05-09:1.1.1.1 FREEBSD:1.1.1; locks; strict; comment @# @; 1.7 date 2009.06.14.08.33.21; author wiz; state Exp; branches; next 1.6; 1.6 date 2007.10.19.03.51.51; author taca; state Exp; branches; next 1.5; 1.5 date 2007.05.29.09.03.13; author tron; state Exp; branches; next 1.4; 1.4 date 99.11.16.21.27.42; author tron; state dead; branches; next 1.3; 1.3 date 99.11.12.16.27.39; author rh; state Exp; branches; next 1.2; 1.2 date 99.05.09.16.41.15; author tron; state Exp; branches; next 1.1; 1.1 date 99.05.09.11.55.24; author tron; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 99.05.09.11.55.24; author tron; state Exp; branches; next ; desc @@ 1.7 log @Fix problem reported in PR 40465 by Petar Bogdanovic. Bump PKGREVISION. @ text @$NetBSD: patch-ac,v 1.6 2007/10/19 03:51:51 taca Exp $ --- alias.c.orig Sun Dec 19 22:51:30 2004 +++ alias.c @@@@ -13,6 +13,10 @@@@ #include "anlghea3.h" +#if defined(NI_MAXHOST) && defined(AI_NUMERICHOST) && defined(NI_NAMEREQD) +#define IPV6 1 +#endif + /* Throughout this file, to avoid a buffer overflow, we must be careful when we do any operation which can increase the length of the name. Such operations are thankfully rare, except for user aliases in wildalias(). @@@@ -213,7 +217,12 @@@@ logical do_aliasS(char *name) { /* DNS lookup */ #ifndef NODNS +#ifdef IPV6 + if (dnslevel != DNS_NONE && + (ISDIGIT(name[len]) || strchr(name, ':') != NULL)) { +#else if (dnslevel != DNS_NONE && ISDIGIT(name[len])) { +#endif do_dns(name, NULL, dnslevel); len = (int)strlen(name) - 1; } @@@@ -586,6 +595,10 @@@@ logical dnsresolve(char *name, choice le volatile logical done = FALSE; #ifndef MAC IN_ADDR_T addr; +#ifdef IPV6 + struct addrinfo hints, *res; + char host[NI_MAXHOST]; +#endif #ifdef VMS char *addrp; #else @@@@ -605,6 +618,34 @@@@ logical dnsresolve(char *name, choice le done = IpAddr2Name(name); /* Doesn't currently include code to use SIGALRM */ #else +#ifdef IPV6 + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_NUMERICHOST; + res = NULL; +#ifndef NOALARM + if (SETJMP(jumpbuf)) + signal(SIGALRM, SIG_DFL); + /* reset to default handling in case SIGALRM is raised exogenously */ + else { + signal(SIGALRM, sighandler); + alarm(dnstimeout); +#endif + if (getaddrinfo(name, NULL, &hints, &res) == 0 && res != NULL) { + if (res->ai_addr != NULL && res->ai_addrlen > 0 && + getnameinfo(res->ai_addr, res->ai_addrlen, host, sizeof(host), + NULL, 0, NI_NAMEREQD) == 0 && host[0] != '\0') { + strncpy(name, host, BLOCKSIZE - 1); + name[BLOCKSIZE - 1] = '\0'; + done = TRUE; + } + freeaddrinfo(res); + } +#ifndef NOALARM + alarm(0); + signal(SIGALRM, SIG_DFL); + } +#endif +#else addr = inet_addr(name); if (addr != INET_ADDR_ERR) { addrp = (char *) &addr; @@@@ -631,6 +672,7 @@@@ logical dnsresolve(char *name, choice le } #endif } +#endif /* not IPV6 */ #endif /* not MAC */ if (done) debug('D', " resolved to %s", name); @ 1.6 log @Avoid c99'ism. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2007/05/29 09:03:13 tron Exp $ d59 1 a59 1 + NULL, 0, NI_NAMEREQD) == 0) { @ 1.5 log @Teach "analog" about IPv6 addresses in webserver logfiles. Bump package revision because of this new feature. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- alias.c.orig 2004-12-19 13:51:30.000000000 +0000 +++ alias.c 2007-05-29 08:58:48.000000000 +0100 d16 1 a16 1 @@@@ -213,7 +217,12 @@@@ d29 12 a40 1 @@@@ -605,6 +614,37 @@@@ a44 3 + struct addrinfo hints, *res; + char host[NI_MAXHOST]; + d75 1 a75 1 @@@@ -631,6 +671,7 @@@@ @ 1.4 log @Update "analog" package to version 4.0. Changes since version 3.32: - Five new reports: Organisation Report, Operating System Report, Search Word Report, Search Query Report, Processing Time Report. - Browser Summary improved (will change results). - Form interface completely rewritten, and considerably simplified. - Multiple *'s now allowed on left-hand side of ALIASes. - Regular expressions allowed in INCLUDEs & EXCLUDEs, and ALIASes. - The output INCLUDEs and EXCLUDEs now apply to the lower levels of a hierarchical report as well as the top level. - New commands: CGI, STYLESHEET and ERRLINELENGTH. - New column N in most reports. - DEBUG C now reports which part of a corrupt logfile line is corrupt. - Non-exact bytes are now displayed as, e.g., 47.68 Mbytes instead of 48,832 kbytes. This should be less confusing. - Timestamps added to PROGRESSFREQ reports. - The DNS file has a new time encoding. - Header files split up to make anlghead.h simpler. - Form interfaces in German and U.S. English included. - New documentation about search arguments. - New examples directory. - New licence. (Nearly the same, just clarified, and slightly loosened). @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 1999/11/12 16:27:39 rh Exp $ d3 72 a74 12 --- analog.cfg.orig Fri Nov 12 17:24:29 1999 +++ analog.cfg Fri Nov 12 17:24:29 1999 @@@@ -8,7 +8,8 @@@@ # REQINCLUDE pages # # If you have a LOGFORMAT command it must go here, above the LOGFILE command. -LOGFILE logfile.log +LOGFORMAT COMBINED +LOGFILE /var/log/httpd-access.log HOSTNAME "[my organisation]" LINKINCLUDE pages REFLINKINCLUDE pages @ 1.3 log @defuzz @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Adapt this package to NetBSD and update to version 3.2. @ text @d3 2 a4 2 --- analog.cfg.orig Wed Nov 25 22:49:33 1998 +++ analog.cfg Tue Jan 19 21:24:09 1999 d14 1 a14 1 UNCOMPRESS *.gz,*.Z "gzip -cd" @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @Import FreeBSD's "analog" port: An extremely fast program for analysing WWW logfiles. @ text @@