Skip to content

Commit d2ea346

Browse files
author
hauke
committed
Update www/awstats to v7.9
From upstream's changelog: AWStats 7.9 Latest Add Windows 11 and Android 13 operating systems Update Hungarian translation and migrate it to UTF-8. fix cross site scripting Replace hard coded text with $Message ( Monthly, Daily, Hourly ) Android 11 + 12, MacOS 11 ( Big Sur ) + 12 ( Monterey ) Catch up german translations Change the substitution that replaces newlines with BR elements so that the syntax works for both HTML and XHTML. Added a few robots and 1 phone browser. Also corrected some errors in devlop robots.pm Only look for configuration in dedicated awstats directories Unwrap SRS e-mail addresses Fixes #195/CVE-2020-35176 As geoip2_country doesn't have AddHTMLGraph_geoip2_country, it should only generate subpage for geoip2_city. added support for HaikuOS and Safari based WebPositive browser Adding missing td-tag opening Tajik Language Support AWStats 7.8 NEW Add SelectBox for DatabaseBreak Mode: month,day and hour. Update http status codes Add more file types Update README.md Fix geoip2 formatting problem corner case 99 Fix some incoherent entries in search_engines.pm Fix geoip2 plugin on windows by renaming it Update robots.pm with PR118 data. Add: - PiplBot bot - um-IC & um-LN bot - arcemedia - bit.ly - bidswitchbot - bnf.fr_bot - contxbot - flamingo - getintent (variant) - laserlikebot - mappy - mojeek (variant) - serendeputy - trendiction - yak (linkinfluence) - zoominfobot Fixes #104 Change markdown to better readability Update Copyright year Change to https links Fix links for perl download NEW add %time6 tag in log format to support some IIS log format geoip2: Fix table formatting error. Missing "" item tag. Changes to robots.pm Add support for macOS DMG and PKG files Fix browser detection with HTTP 206 status code Support for macOS 10.13/10.14 + improved image compression of icons Fix use the 5 top hits as base 100 for graph to show the top 5 hits. Clean up geoip2 and geoip2 city modules * Correctly convert dns names to ip4 and ip6 address using getaddrinfo (fixes #120, #121, obsoletes #115) * Only lookup if the IP is of type public (fixes #122) and catch further lookup errors (obsoletes #123) * Store and display the GeoIP City output HTML escaped (fixes #127) * Code to perform and cache the actual lookup is consolidated * General code improvement and readability Losslessly reduced size of PNG images by about 33% using zopfli, pngout and oxipng. Also added os icons for macOS 10.13 and 10.14. Add Robot: The Knowledge AI Fix Error: Not same number of records of RobotsSearchIDOrder_listx Robots, Search Engine and Web Page Tracking Modifications Optimize OptimizeArray Added UptimeRobot https://uptimerobot.com/ Fix a few grammar errors in the model config Ignore search phrases longer than 80 characters. Fix 404 detail page not updating Decode RFC 3986 "unreserved chars" in URLs. Fix #80 Disable nested includes warnings for Perl > 5.6. Update domains.pm Fix two invalid entries in search_engines.pm Format Tera Bytes Fix "Illegal division by zero" error. Fix #79 Improving error handling in awstats_buildstaticpages.pl FIX #90 Exclude private IP addresses since GeoIP2::Reader doesn't support them Ignore search phrases longer than 80 characters. Only purge data for the saved section. Make city plugin more functional Fix issue with ShowHost section when address is resolved. Initial implementation of GeoIP2 City lookup. Fix a few issues with Country lookup. Initial implementation. Looksup only Country code for IPv4 and IPv6 Update hebrew file Quite a few additions and modifications. Especially yahoo detection. Added device pixel ratio ( dpr ) to awstats_misc_tracker.js. added 37 new robots to robots.pm file using v 7.7 robots.pm file as base file. Move oBot entry lower as to not incorrectly get picked for other *obot robots. Decode RFC 3986 "unreserved chars" in URLs. This makes awstats treat "/foo" and "/%66%6f%6f" as equivalent. Missing Sint Maarten flag Wrong label cf. https://dev.maxmind.com/geoip/legacy/codes/iso3166/ Fix Issue #76 - country name not correct Fix utf bom files Fix another vulnerability reported by cPanel Security Team (can execute arbitraty code) Add more tests PKG_SYSCONFDIR fixes pkglint cleanup Remove trivial MESSAGE
1 parent 9bd0b5b commit d2ea346

File tree

6 files changed

+46
-49
lines changed

6 files changed

+46
-49
lines changed

‎www/awstats/MESSAGE

-15
This file was deleted.

‎www/awstats/Makefile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# $NetBSD: Makefile,v 1.68 2022/06/28 11:37:02 wiz Exp $
1+
# $NetBSD: Makefile,v 1.69 2024/06/05 20:27:46 hauke Exp $
22

3-
DISTNAME= awstats-7.7
4-
PKGREVISION= 4
3+
DISTNAME= awstats-7.9
54
CATEGORIES= www
65
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}
76

@@ -23,9 +22,6 @@ REPLACE_PERL+= wwwroot/classes/src/*.pl
2322

2423
.include "../../mk/bsd.prefs.mk"
2524

26-
APACHE_USER?= www
27-
APACHE_GROUP?= www
28-
2925
PKG_GROUPS_VARS+= APACHE_GROUP
3026
PKG_USERS_VARS= APACHE_USER
3127
BUILD_DEFS+= VARBASE
@@ -44,6 +40,7 @@ SUBST_FILES.conf= tools/awstats_configure.pl \
4440
SUBST_VARS.conf= PREFIX
4541
SUBST_VARS.conf+= VARBASE
4642
SUBST_VARS.conf+= PKG_SYSCONFDIR
43+
SUBST_VARS.conf+= PKG_SYSCONFBASE
4744
SUBST_SED.conf+= -e "s|\"/etc/awstats|\"${PKG_SYSCONFDIR}|g"
4845
SUBST_SED.conf+= -e "s|\"/usr/local/awstats/wwwroot|\"${PREFIX}/awstats|g"
4946
SUBST_SED.conf+= -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g"

‎www/awstats/PLIST

+32-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.24 2017/02/12 10:27:41 adam Exp $
1+
@comment $NetBSD: PLIST,v 1.25 2024/06/05 20:27:46 hauke Exp $
22
awstats/bin/awstats_buildstaticpages.pl
33
awstats/bin/awstats_configure.pl
44
awstats/bin/awstats_exportlib.pl
@@ -53,6 +53,7 @@ awstats/cgi-bin/lang/awstats-se.txt
5353
awstats/cgi-bin/lang/awstats-si.txt
5454
awstats/cgi-bin/lang/awstats-sk.txt
5555
awstats/cgi-bin/lang/awstats-sr.txt
56+
awstats/cgi-bin/lang/awstats-tg.txt
5657
awstats/cgi-bin/lang/awstats-th.txt
5758
awstats/cgi-bin/lang/awstats-tr.txt
5859
awstats/cgi-bin/lang/awstats-tw.txt
@@ -122,6 +123,8 @@ awstats/cgi-bin/plugins/clusterinfo.pm
122123
awstats/cgi-bin/plugins/decodeutfkeys.pm
123124
awstats/cgi-bin/plugins/export_to_csv.pm
124125
awstats/cgi-bin/plugins/geoip.pm
126+
awstats/cgi-bin/plugins/geoip2_city.pm
127+
awstats/cgi-bin/plugins/geoip2_country.pm
125128
awstats/cgi-bin/plugins/geoip6.pm
126129
awstats/cgi-bin/plugins/geoip_asn_maxmind.pm
127130
awstats/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -432,6 +435,7 @@ awstats/icon/flags/ma.png
432435
awstats/icon/flags/mc.png
433436
awstats/icon/flags/md.png
434437
awstats/icon/flags/me.png
438+
awstats/icon/flags/mf.png
435439
awstats/icon/flags/mg.png
436440
awstats/icon/flags/mil.png
437441
awstats/icon/flags/mk.png
@@ -503,6 +507,7 @@ awstats/icon/flags/sr.png
503507
awstats/icon/flags/st.png
504508
awstats/icon/flags/su.png
505509
awstats/icon/flags/sv.png
510+
awstats/icon/flags/sx.png
506511
awstats/icon/flags/sy.png
507512
awstats/icon/flags/sz.png
508513
awstats/icon/flags/tc.png
@@ -593,6 +598,25 @@ awstats/icon/mime/xls.png
593598
awstats/icon/mime/xsl.png
594599
awstats/icon/os/aix.png
595600
awstats/icon/os/amigaos.png
601+
awstats/icon/os/android.png
602+
awstats/icon/os/android10.png
603+
awstats/icon/os/android11.png
604+
awstats/icon/os/android12.png
605+
awstats/icon/os/android13.png
606+
awstats/icon/os/androidcupcake.png
607+
awstats/icon/os/androiddonut.png
608+
awstats/icon/os/androideclair.png
609+
awstats/icon/os/androidfroyo.png
610+
awstats/icon/os/androidgingerbread.png
611+
awstats/icon/os/androidhoneycomb.png
612+
awstats/icon/os/androidics.png
613+
awstats/icon/os/androidjellybean.png
614+
awstats/icon/os/androidkitkat.png
615+
awstats/icon/os/androidlollipop.png
616+
awstats/icon/os/androidmarshmallow.png
617+
awstats/icon/os/androidnougat.png
618+
awstats/icon/os/androidoreo.png
619+
awstats/icon/os/androidpie.png
596620
awstats/icon/os/apple.png
597621
awstats/icon/os/atari.png
598622
awstats/icon/os/beos.png
@@ -612,6 +636,7 @@ awstats/icon/os/dos.png
612636
awstats/icon/os/dreamcast.png
613637
awstats/icon/os/freebsd.png
614638
awstats/icon/os/gnu.png
639+
awstats/icon/os/haiku.png
615640
awstats/icon/os/hpux.png
616641
awstats/icon/os/ibm.png
617642
awstats/icon/os/imode.png
@@ -640,10 +665,15 @@ awstats/icon/os/linuxvine.png
640665
awstats/icon/os/linuxzenwalk.png
641666
awstats/icon/os/mac.png
642667
awstats/icon/os/macintosh.png
668+
awstats/icon/os/macos11.png
669+
awstats/icon/os/macos12.png
643670
awstats/icon/os/macosx.png
644671
awstats/icon/os/macosx10.png
645672
awstats/icon/os/macosx11.png
646673
awstats/icon/os/macosx12.png
674+
awstats/icon/os/macosx13.png
675+
awstats/icon/os/macosx14.png
676+
awstats/icon/os/macosx15.png
647677
awstats/icon/os/macosx4.png
648678
awstats/icon/os/macosx5.png
649679
awstats/icon/os/macosx6.png
@@ -671,6 +701,7 @@ awstats/icon/os/webtv.png
671701
awstats/icon/os/wii.png
672702
awstats/icon/os/win.png
673703
awstats/icon/os/win10.png
704+
awstats/icon/os/win11.png
674705
awstats/icon/os/win16.png
675706
awstats/icon/os/win2000.png
676707
awstats/icon/os/win2003.png

‎www/awstats/distinfo

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
$NetBSD: distinfo,v 1.40 2021/10/26 11:29:21 nia Exp $
1+
$NetBSD: distinfo,v 1.41 2024/06/05 20:27:46 hauke Exp $
22

3-
BLAKE2s (awstats-7.7.tar.gz) = 672eb29431d76ea6321ab43922ca6a19d53aabc11267f4c36a02ad9f583cf522
4-
SHA512 (awstats-7.7.tar.gz) = 8bf32b0650ef0cc900a16eead866da3847d81c2696e7a90fb49833679c958768833d781e5b4becd9b4f6748c7266e2887ff7ff33d98293ce3a0296a810fbe899
5-
Size (awstats-7.7.tar.gz) = 2956851 bytes
6-
SHA1 (patch-tools_awstats__configure.pl) = bb098d890e1ee6a0a354dd9036e57f6eb42d3945
3+
BLAKE2s (awstats-7.9.tar.gz) = 7b53759425440b42747ba57dc7747bdd93aa9e800aa0f167eda15b8386e8bdf8
4+
SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9
5+
Size (awstats-7.9.tar.gz) = 2948602 bytes
6+
SHA1 (patch-tools_awstats__configure.pl) = 71771b2b9450bd667d4f887abb5bba1c1635a879
77
SHA1 (patch-wwwroot_cgi-bin_awstats.pl) = edb1fa423ae1a0608e2226b55a8cded7c0c6292f
8-
SHA1 (patch-wwwroot_cgi-bin_lib_search__engines.pm) = 7f9a3c1d38b8ee47d41fcb72e3aa0c172cd9ac69

‎www/awstats/patches/patch-tools_awstats__configure.pl

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$NetBSD: patch-tools_awstats__configure.pl,v 1.1 2020/01/07 18:21:02 adam Exp $
1+
$NetBSD: patch-tools_awstats__configure.pl,v 1.2 2024/06/05 20:27:46 hauke Exp $
22

33
Fix paths.
44

5-
--- tools/awstats_configure.pl.orig 2016-08-27 18:59:01.000000000 +0000
5+
--- tools/awstats_configure.pl.orig 2019-06-27 09:30:40.000000000 +0000
66
+++ tools/awstats_configure.pl
77
@@ -28,12 +28,12 @@ $AWSTATS_MODEL_CONFIG
88
$AWSTATS_DIRDATA_PATH
@@ -27,7 +27,7 @@
2727
'/etc/httpd/httpd.conf',
2828
'/usr/local/apache/conf/httpd.conf',
2929
'/usr/local/apache2/conf/httpd.conf',
30-
+'@PREFIX@/etc/httpd/httpd.conf',
30+
+'@PKG_SYSCONFBASE@/httpd/httpd.conf',
3131
);
3232

3333
use vars qw/
@@ -67,9 +67,9 @@
6767
$AWSTATS_PATH=~s/tools[\\\/]?$//;
6868
$AWSTATS_PATH=~s/[\\\/]$//;
6969
- if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
70-
- print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
70+
- print "Warning: AWStats standard directory on macOS is '/Library/WebServer/awstats'.\n";
7171
+ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
72-
+ print "Warning: AWStats standard directory on Mac OS X is '@PREFIX@/awstats'.\n";
72+
+ print "Warning: AWStats standard directory on macOS is '@PREFIX@/awstats'.\n";
7373
print "If you want to use standard directory, you should first move all content\n";
7474
print "of AWStats distribution from current directory:\n";
7575
print "$AWSTATS_PATH\n";
@@ -98,7 +98,7 @@
9898
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
9999
print "Example: /etc/httpd/httpd.conf\n";
100100
print "Example: /usr/local/apache2/conf/httpd.conf\n";
101-
+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
101+
+ print "Example: @PKG_SYSCONFBASE@/httpd/httpd.conf\n";
102102
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
103103
$bidon='';
104104
while ($bidon ne 'none' && ! -f "$bidon") {

‎www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm

-15
This file was deleted.

0 commit comments

Comments
 (0)