diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile index 525e3952a775..67d70c91f683 100644 --- a/www/lightsquid/Makefile +++ b/www/lightsquid/Makefile @@ -1,83 +1,83 @@ PORTNAME= lightsquid PORTVERSION= 1.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Light and fast web based squid proxy traffic analyser WWW= https://lightsquid.sourceforge.net/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/doc/gnugpl.txt RUN_DEPENDS= p5-CGI>0:www/p5-CGI USES= perl5 shebangfix tar:tgz SHEBANG_FILES= *.cgi *.pl tools/SiteAggregator/*.pl lang/*.pl tools/*.pl \ lightsquid.cfg USE_PERL5= run NO_BUILD= yes NO_ARCH= yes PLIST_SUB+= WWWOWN="${WWWOWN}" \ WWWGRP="${WWWGRP}" \ CHOWN="${CHOWN}" CONFIGS= lightsquid.cfg realname.cfg skipuser.cfg group.cfg REINPLACE_ARGS= -i "" PORTDOCS= gnugpl.txt install.txt readme.txt thanks.txt graph.txt logformat.txt \ templates.txt version.txt SUB_FILES= pkg-message OPTIONS_DEFINE= GD DOCS OPTIONS_DEFAULT= GD GD_RUN_DEPENDS= p5-GD>=0:graphics/p5-GD DOCS_SUB_LIST= NOTEWORK="Read ${DOCSDIR}/readme.txt." DOCS_SUB_LIST_OFF=NOTEWORK= post-patch: @${REINPLACE_CMD} -e 's|/var/www/html/${PORTNAME}/lang|${DATADIR}/lang| ; \ s|/var/www/html/${PORTNAME}\"|${ETCDIR}\"| ; \ s|/var/www/html/${PORTNAME}/ip2name|${PREFIX}/libexec/${PORTNAME}| ; \ s|/var/log/squid|${LOCALBASE}/squid/logs| ; \ s|/var/www/html/${PORTNAME}|${WWWDIR}|' \ ${WRKSRC}/lightsquid.cfg @${FIND} -E ${WRKSRC} -maxdepth 1 -regex '.*\.(cgi|pl)' | \ ${XARGS} ${REINPLACE_CMD} \ -e 's|${PORTNAME}.cfg|${ETCDIR}/${PORTNAME}.cfg|g' @${MV} ${WRKSRC}/group.cfg.src ${WRKSRC}/group.cfg do-install: ${MKDIR} ${STAGEDIR}/${DATADIR}/lang cd ${WRKSRC}/lang && \ ${FIND} . -type f -regex '.*\.lng' -exec \ ${INSTALL_DATA} {} "${STAGEDIR}/${DATADIR}/lang/{}" \; ${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME} cd ${WRKSRC}/ip2name && \ ${FIND} . -type f -exec \ ${INSTALL_DATA} {} "${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/{}" \; ${MKDIR} ${STAGEDIR}/${ETCDIR} .for i in ${CONFIGS} ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${ETCDIR}/${i}.sample .endfor ${MKDIR} ${STAGEDIR}/${WWWDIR}/report ${MKDIR} ${STAGEDIR}/${WWWDIR}/tpl cd ${WRKSRC}/tpl && \ ${FIND} . -type d ! -empty -exec \ ${MKDIR} "${STAGEDIR}/${WWWDIR}/tpl/{}" \; && \ ${FIND} . -type f -exec \ ${INSTALL_DATA} {} "${STAGEDIR}/${WWWDIR}/tpl/{}" \; cd ${WRKSRC} && \ ${FIND} -E . -maxdepth 1 -regex '.*\.(cgi|pl)' -exec \ ${INSTALL_SCRIPT} {} "${STAGEDIR}/${WWWDIR}/{}" \; && \ ${INSTALL_DATA} .htaccess ${STAGEDIR}/${WWWDIR}/ do-install-DOCS-on: @${MKDIR} ${STAGEDIR}/${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}/${DOCSDIR} .endfor .include diff --git a/www/lightsquid/files/patch-lightparser.pl b/www/lightsquid/files/patch-lightparser.pl index b0a25af57013..3c6b744b79a8 100644 --- a/www/lightsquid/files/patch-lightparser.pl +++ b/www/lightsquid/files/patch-lightparser.pl @@ -1,20 +1,34 @@ ---- lightparser.pl.orig 2009-07-02 22:15:32 UTC +--- lightparser.pl.orig 2026-04-25 10:24:38 UTC +++ lightparser.pl -@@ -36,7 +36,7 @@ require "lightsquid.cfg"; +@@ -32,11 +32,11 @@ push (@INC,(fileparse($0))[1]); + + push (@INC,(fileparse($0))[1]); + +-require "lightsquid.cfg"; ++require "/usr/local/etc/lightsquid/lightsquid.cfg"; require "common.pl"; #include ip2name function -require "ip2name/ip2name.$ip2name"; +require "$ip2namepath/ip2name.$ip2name"; $SIG{INT} = \&LOCKREMOVER; # traps keyboard interrupt my $lockfilepath ="$lockpath/lockfile"; +@@ -66,7 +66,7 @@ my $filterdatestart=0; + $month=sprintf("%02d",$mon+1);; + + my $filterdatestart=0; +-my $filterdatestop =timelocal(59,59,23,31,12-1,2020-1900)+1000; ++my $filterdatestop =timelocal(59,59,23,31,12-1,2100-1900)+1000; + + $fToday=1 if ($ARGV[0] eq "today"); + $fToday=1 if ($ARGV[0] eq "yesterday"); @@ -202,7 +202,7 @@ while () { next; }; - if ($Ltype =~ m/HIT/) { + if ($Ltype =~ m/(HIT|UNMODIFIED)/) { $CacheHIT+=$Lsize; } else { $CacheMISS+=$Lsize;