Skip to content

Commit

Permalink
Update www/awstats to v7.9
Browse files Browse the repository at this point in the history
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
  • Loading branch information
hauke committed Jun 5, 2024
1 parent 9bd0b5b commit d2ea346
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 49 deletions.
15 changes: 0 additions & 15 deletions www/awstats/MESSAGE

This file was deleted.

9 changes: 3 additions & 6 deletions www/awstats/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.68 2022/06/28 11:37:02 wiz Exp $
# $NetBSD: Makefile,v 1.69 2024/06/05 20:27:46 hauke Exp $

DISTNAME= awstats-7.7
PKGREVISION= 4
DISTNAME= awstats-7.9
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}

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

.include "../../mk/bsd.prefs.mk"

APACHE_USER?= www
APACHE_GROUP?= www

PKG_GROUPS_VARS+= APACHE_GROUP
PKG_USERS_VARS= APACHE_USER
BUILD_DEFS+= VARBASE
Expand All @@ -44,6 +40,7 @@ SUBST_FILES.conf= tools/awstats_configure.pl \
SUBST_VARS.conf= PREFIX
SUBST_VARS.conf+= VARBASE
SUBST_VARS.conf+= PKG_SYSCONFDIR
SUBST_VARS.conf+= PKG_SYSCONFBASE
SUBST_SED.conf+= -e "s|\"/etc/awstats|\"${PKG_SYSCONFDIR}|g"
SUBST_SED.conf+= -e "s|\"/usr/local/awstats/wwwroot|\"${PREFIX}/awstats|g"
SUBST_SED.conf+= -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g"
Expand Down
33 changes: 32 additions & 1 deletion www/awstats/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.24 2017/02/12 10:27:41 adam Exp $
@comment $NetBSD: PLIST,v 1.25 2024/06/05 20:27:46 hauke Exp $
awstats/bin/awstats_buildstaticpages.pl
awstats/bin/awstats_configure.pl
awstats/bin/awstats_exportlib.pl
Expand Down Expand Up @@ -53,6 +53,7 @@ awstats/cgi-bin/lang/awstats-se.txt
awstats/cgi-bin/lang/awstats-si.txt
awstats/cgi-bin/lang/awstats-sk.txt
awstats/cgi-bin/lang/awstats-sr.txt
awstats/cgi-bin/lang/awstats-tg.txt
awstats/cgi-bin/lang/awstats-th.txt
awstats/cgi-bin/lang/awstats-tr.txt
awstats/cgi-bin/lang/awstats-tw.txt
Expand Down Expand Up @@ -122,6 +123,8 @@ awstats/cgi-bin/plugins/clusterinfo.pm
awstats/cgi-bin/plugins/decodeutfkeys.pm
awstats/cgi-bin/plugins/export_to_csv.pm
awstats/cgi-bin/plugins/geoip.pm
awstats/cgi-bin/plugins/geoip2_city.pm
awstats/cgi-bin/plugins/geoip2_country.pm
awstats/cgi-bin/plugins/geoip6.pm
awstats/cgi-bin/plugins/geoip_asn_maxmind.pm
awstats/cgi-bin/plugins/geoip_city_maxmind.pm
Expand Down Expand Up @@ -432,6 +435,7 @@ awstats/icon/flags/ma.png
awstats/icon/flags/mc.png
awstats/icon/flags/md.png
awstats/icon/flags/me.png
awstats/icon/flags/mf.png
awstats/icon/flags/mg.png
awstats/icon/flags/mil.png
awstats/icon/flags/mk.png
Expand Down Expand Up @@ -503,6 +507,7 @@ awstats/icon/flags/sr.png
awstats/icon/flags/st.png
awstats/icon/flags/su.png
awstats/icon/flags/sv.png
awstats/icon/flags/sx.png
awstats/icon/flags/sy.png
awstats/icon/flags/sz.png
awstats/icon/flags/tc.png
Expand Down Expand Up @@ -593,6 +598,25 @@ awstats/icon/mime/xls.png
awstats/icon/mime/xsl.png
awstats/icon/os/aix.png
awstats/icon/os/amigaos.png
awstats/icon/os/android.png
awstats/icon/os/android10.png
awstats/icon/os/android11.png
awstats/icon/os/android12.png
awstats/icon/os/android13.png
awstats/icon/os/androidcupcake.png
awstats/icon/os/androiddonut.png
awstats/icon/os/androideclair.png
awstats/icon/os/androidfroyo.png
awstats/icon/os/androidgingerbread.png
awstats/icon/os/androidhoneycomb.png
awstats/icon/os/androidics.png
awstats/icon/os/androidjellybean.png
awstats/icon/os/androidkitkat.png
awstats/icon/os/androidlollipop.png
awstats/icon/os/androidmarshmallow.png
awstats/icon/os/androidnougat.png
awstats/icon/os/androidoreo.png
awstats/icon/os/androidpie.png
awstats/icon/os/apple.png
awstats/icon/os/atari.png
awstats/icon/os/beos.png
Expand All @@ -612,6 +636,7 @@ awstats/icon/os/dos.png
awstats/icon/os/dreamcast.png
awstats/icon/os/freebsd.png
awstats/icon/os/gnu.png
awstats/icon/os/haiku.png
awstats/icon/os/hpux.png
awstats/icon/os/ibm.png
awstats/icon/os/imode.png
Expand Down Expand Up @@ -640,10 +665,15 @@ awstats/icon/os/linuxvine.png
awstats/icon/os/linuxzenwalk.png
awstats/icon/os/mac.png
awstats/icon/os/macintosh.png
awstats/icon/os/macos11.png
awstats/icon/os/macos12.png
awstats/icon/os/macosx.png
awstats/icon/os/macosx10.png
awstats/icon/os/macosx11.png
awstats/icon/os/macosx12.png
awstats/icon/os/macosx13.png
awstats/icon/os/macosx14.png
awstats/icon/os/macosx15.png
awstats/icon/os/macosx4.png
awstats/icon/os/macosx5.png
awstats/icon/os/macosx6.png
Expand Down Expand Up @@ -671,6 +701,7 @@ awstats/icon/os/webtv.png
awstats/icon/os/wii.png
awstats/icon/os/win.png
awstats/icon/os/win10.png
awstats/icon/os/win11.png
awstats/icon/os/win16.png
awstats/icon/os/win2000.png
awstats/icon/os/win2003.png
Expand Down
11 changes: 5 additions & 6 deletions www/awstats/distinfo
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
$NetBSD: distinfo,v 1.40 2021/10/26 11:29:21 nia Exp $
$NetBSD: distinfo,v 1.41 2024/06/05 20:27:46 hauke Exp $

BLAKE2s (awstats-7.7.tar.gz) = 672eb29431d76ea6321ab43922ca6a19d53aabc11267f4c36a02ad9f583cf522
SHA512 (awstats-7.7.tar.gz) = 8bf32b0650ef0cc900a16eead866da3847d81c2696e7a90fb49833679c958768833d781e5b4becd9b4f6748c7266e2887ff7ff33d98293ce3a0296a810fbe899
Size (awstats-7.7.tar.gz) = 2956851 bytes
SHA1 (patch-tools_awstats__configure.pl) = bb098d890e1ee6a0a354dd9036e57f6eb42d3945
BLAKE2s (awstats-7.9.tar.gz) = 7b53759425440b42747ba57dc7747bdd93aa9e800aa0f167eda15b8386e8bdf8
SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9
Size (awstats-7.9.tar.gz) = 2948602 bytes
SHA1 (patch-tools_awstats__configure.pl) = 71771b2b9450bd667d4f887abb5bba1c1635a879
SHA1 (patch-wwwroot_cgi-bin_awstats.pl) = edb1fa423ae1a0608e2226b55a8cded7c0c6292f
SHA1 (patch-wwwroot_cgi-bin_lib_search__engines.pm) = 7f9a3c1d38b8ee47d41fcb72e3aa0c172cd9ac69
12 changes: 6 additions & 6 deletions www/awstats/patches/patch-tools_awstats__configure.pl
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$NetBSD: patch-tools_awstats__configure.pl,v 1.1 2020/01/07 18:21:02 adam Exp $
$NetBSD: patch-tools_awstats__configure.pl,v 1.2 2024/06/05 20:27:46 hauke Exp $

Fix paths.

--- tools/awstats_configure.pl.orig 2016-08-27 18:59:01.000000000 +0000
--- tools/awstats_configure.pl.orig 2019-06-27 09:30:40.000000000 +0000
+++ tools/awstats_configure.pl
@@ -28,12 +28,12 @@ $AWSTATS_MODEL_CONFIG
$AWSTATS_DIRDATA_PATH
Expand All @@ -27,7 +27,7 @@
'/etc/httpd/httpd.conf',
'/usr/local/apache/conf/httpd.conf',
'/usr/local/apache2/conf/httpd.conf',
+'@PREFIX@/etc/httpd/httpd.conf',
+'@PKG_SYSCONFBASE@/httpd/httpd.conf',
);

use vars qw/
Expand Down Expand Up @@ -67,9 +67,9 @@
$AWSTATS_PATH=~s/tools[\\\/]?$//;
$AWSTATS_PATH=~s/[\\\/]$//;
- if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
- print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
- print "Warning: AWStats standard directory on macOS is '/Library/WebServer/awstats'.\n";
+ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
+ print "Warning: AWStats standard directory on Mac OS X is '@PREFIX@/awstats'.\n";
+ print "Warning: AWStats standard directory on macOS is '@PREFIX@/awstats'.\n";
print "If you want to use standard directory, you should first move all content\n";
print "of AWStats distribution from current directory:\n";
print "$AWSTATS_PATH\n";
Expand Down Expand Up @@ -98,7 +98,7 @@
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
print "Example: /etc/httpd/httpd.conf\n";
print "Example: /usr/local/apache2/conf/httpd.conf\n";
+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
+ print "Example: @PKG_SYSCONFBASE@/httpd/httpd.conf\n";
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
$bidon='';
while ($bidon ne 'none' && ! -f "$bidon") {
Expand Down
15 changes: 0 additions & 15 deletions www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm

This file was deleted.

0 comments on commit d2ea346

Please sign in to comment.