[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-7-18-g0dae02c
Sergey B Kirpichev
skirpichev at gmail.com
Sun Feb 24 22:21:57 UTC 2013
The following commit has been merged in the master branch:
commit 954d35e5398144b52afa2ede5c68955a1b00c35c
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date: Sun Dec 16 14:04:06 2012 +0400
Update patches for new release
diff --git a/debian/patches/1004_perl_version.patch b/debian/patches/1004_perl_version.patch
index 1a5bffa..a49e70e 100644
--- a/debian/patches/1004_perl_version.patch
+++ b/debian/patches/1004_perl_version.patch
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/519319
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1852,7 +1852,7 @@
+@@ -1848,7 +1848,7 @@
$includeFile = "$1$includeFile";
}
}
diff --git a/debian/patches/1008_extrasections_with_top.patch b/debian/patches/1008_extrasections_with_top.patch
index 6cf63f4..a9fe682 100644
--- a/debian/patches/1008_extrasections_with_top.patch
+++ b/debian/patches/1008_extrasections_with_top.patch
@@ -8,7 +8,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -11423,7 +11423,7 @@
+@@ -11621,7 +11621,7 @@
if ($Debug) { debug( "ExtraName$extranum", 2 ); }
print "$Center<a name=\"extra$extranum\"> </a><br />";
my $title = $ExtraName[$extranum];
@@ -17,7 +17,7 @@ Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1844793&group_id=1
print "<tr bgcolor=\"#$color_TableBGRowTitle\">";
print "<th>" . $ExtraFirstColumnTitle[$extranum] . "</th>";
-@@ -16291,7 +16291,7 @@
+@@ -16657,7 +16657,7 @@
if ($Debug) { debug( "ExtraName$extranum", 2 ); }
print "$Center<a name=\"extra$extranum\"> </a><br />";
my $title = $ExtraName[$extranum];
diff --git a/debian/patches/1009_hurd_url.patch b/debian/patches/1009_hurd_url.patch
deleted file mode 100644
index 747ac86..0000000
--- a/debian/patches/1009_hurd_url.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Correct link to the GNU Hurd homepage.
-Author: Sylvain Rochet <gradator at gradator.net>
-Bug-Debian: http://bugs.debian.org/408086
-
----
- wwwroot/cgi-bin/lib/operating_systems.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/wwwroot/cgi-bin/lib/operating_systems.pm
-+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
-@@ -253,7 +253,7 @@
- 'linux','<a href="http://www.distrowatch.com/" title="Linux DistroWatch home page. Useful if you find the associated user agent string in your logs. [new window]" target="_blank">Linux (Unknown/unspecified)</a>',
- 'linux','GNU Linux (Unknown or unspecified distribution)',
- # Hurd
--'gnu','<a href="www.gnu.org/software/hurd/hurd.html" title="GNU Hurd home page [new window]" target="_blank">GNU Hurd</a>',
-+'gnu','<a href="http://www.gnu.org/software/hurd/hurd.html" title="GNU Hurd home page [new window]" target="_blank">GNU Hurd</a>',
- # BSDs
- 'bsdi','<a href="http://en.wikipedia.org/wiki/BSDi" title="BSDi home page [new window]" target="_blank">BSDi</a>',
- 'bsdkfreebsd','<a href="http://www.debian.org/ports/kfreebsd-gnu/" title="Debian GNU/kFreeBSD" target="_blank">GNU/kFreeBSD</a>',
diff --git a/debian/patches/1010_dirdata_permissions.patch b/debian/patches/1010_dirdata_permissions.patch
index c93ce49..64da0da 100644
--- a/debian/patches/1010_dirdata_permissions.patch
+++ b/debian/patches/1010_dirdata_permissions.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/299148
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -2972,7 +2972,7 @@
+@@ -2974,7 +2974,7 @@
if ( !$MigrateStats && !-d $DirData ) {
if ($CreateDirDataIfNotExists) {
if ($Debug) { debug( " Make directory $DirData", 2 ); }
diff --git a/debian/patches/1014_websec_robot.patch b/debian/patches/1014_websec_robot.patch
index 5e4e072..199b0d3 100644
--- a/debian/patches/1014_websec_robot.patch
+++ b/debian/patches/1014_websec_robot.patch
@@ -8,7 +8,7 @@ Bug-Debian: http://bugs.debian.org/284149
--- a/wwwroot/cgi-bin/lib/browsers.pm
+++ b/wwwroot/cgi-bin/lib/browsers.pm
-@@ -253,7 +253,8 @@
+@@ -255,7 +255,8 @@
'POE\-Component\-Client\-HTTP',
'mozilla', # Must be at end because a lot of browsers contains mozilla in string
'libwww', # Must be at end because some browser have both 'browser id' and 'libwww'
@@ -18,7 +18,7 @@ Bug-Debian: http://bugs.debian.org/284149
);
# BrowsersHashIDLib
-@@ -479,7 +480,8 @@
+@@ -483,7 +484,8 @@
'POE\-Component\-Client\-HTTP','HTTP user-agent for POE (portable networking framework for Perl)',
'mozilla','Mozilla',
'libwww','LibWWW',
diff --git a/debian/patches/1015_awstats-tt-bg.txt.patch b/debian/patches/1015_awstats-tt-bg.txt.patch
deleted file mode 100644
index 22ec620..0000000
--- a/debian/patches/1015_awstats-tt-bg.txt.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-Description: Fix wrong encoding (to utf8) of tooltips
- file for Bulgarian language
-Author: Kamen Naydenov <pau4o at kamennn.eu>
-Bug-Debian: http://bugs.debian.org/610632
-Forwarded: https://sourceforge.net/tracker/?func=detail&atid=113764&aid=3199733&group_id=13764
-
----
- wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt | 81 ++++++++++------------
- 1 file changed, 40 insertions(+), 41 deletions(-)
-
---- a/wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
-+++ b/wwwroot/cgi-bin/lang/tooltips_w/awstats-tt-bg.txt
-@@ -1,70 +1,69 @@
- <!-- Bulgarian tooltips message file translated by Aryan(aryan at bgns.net) -->
- <!-- $Revision: 1.2 $ - $Date: 2008/10/05 11:13:13 $ -->
--<meta http-equiv="Content-Type" content="text/html; charset=windows-1251">
- <div class="CTooltip" id="tt1">
--Íîâî ïîñåùåíèå ñå îò÷èòà ïðè âñåêè íîâ <b>âõîäÿù ïîñåòèòåë</b> (ðàçãëåæäàù ñòðàíèöà), êîéòî íå å ïîñåùàâàë ïðåç ïîñëåäíèòå <b>#VisitTimeOut# min</b>.
-+Ðово поÑеÑение Ñе оÑÑиÑа пÑи вÑеки нов <b>вÑ
одÑÑ Ð¿Ð¾ÑеÑиÑел</b> (ÑÐ°Ð·Ð³Ð»ÐµÐ¶Ð´Ð°Ñ ÑÑÑаниÑа), койÑо не е поÑеÑавал пÑез поÑледниÑе <b>#VisitTimeOut# min</b>.
- </div>
- <div class="CTooltip" id="tt2">
--Áðîÿò íà êëèåíòñêèòå õîñòîâå (<b>IP àäðåñè</b>), êîèòî ñà ïîñåòèëè ñàéòà (è ñà ðàçãëåäàëè ïîíå åäíà <b>ñòðàíèöà</b>).<br />
--Òåçè äàííè ïîêàçâàò áðîÿ íà <b>ðàçëè÷íèòå ôèçè÷åñêè ëèöà</b>, ïîñåòèëè ñàéòà âúâ âñåêè åäèí äåí.
-+ÐÑоÑÑ Ð½Ð° клиенÑÑкиÑе Ñ
оÑÑове (<b>IP адÑеÑи</b>), коиÑо Ñа поÑеÑили ÑайÑа (и Ñа Ñазгледали поне една <b>ÑÑÑаниÑа</b>).<br />
-+Тези данни Ð¿Ð¾ÐºÐ°Ð·Ð²Ð°Ñ Ð±ÑÐ¾Ñ Ð½Ð° <b>ÑазлиÑниÑе ÑизиÑеÑки лиÑа</b>, поÑеÑили ÑайÑа вÑв вÑеки един ден.
- </div>
- <div class="CTooltip" id="tt3">
--Êîëêî ïúòè <b>òàçè ñòðàíèöà</b> îò ñàéòà å <b>ðàçãëåäàíà</b> (Îáùî çà âñè÷êè ïîñåòèòåëè çà âñè÷êè ïîñåùåíèÿ).<br />
--Òåçè äàííè ñå ðàçëè÷àâàò îò "õèòîâå" ïî òîâà, ÷å îòáðîÿâàò ñàìî HTML ñòðàíèöè (áåç êàðòèíêèòå è äðóãèòå âèäîâå ôàéëîâå).
-+Ðолко пÑÑи <b>Ñази ÑÑÑаниÑа</b> Ð¾Ñ ÑайÑа е <b>Ñазгледана</b> (ÐбÑо за вÑиÑки поÑеÑиÑели за вÑиÑки поÑеÑениÑ).<br />
-+Тези данни Ñе ÑазлиÑÐ°Ð²Ð°Ñ Ð¾Ñ "Ñ
иÑове" по Ñова, Ñе оÑбÑоÑÐ²Ð°Ñ Ñамо HTML ÑÑÑаниÑи (без каÑÑинкиÑе и дÑÑгиÑе видове Ñайлове).
- </div>
- <div class="CTooltip" id="tt4">
--Êîëêî ïúòè <b>ñòðàíèöà, êàðòèíêà èëè äðóã ôàéë</b> îò ñàéòà å <b>ðàçãëåäàí</b> èëè <b>ñâàëåí</b> îò ïîñåòèòåë.<br />
--Òåçè äàííè ñà ñàìî ñïðàâî÷íè, òúé êàòî áðîÿ íà ðàçãëåäàíèòå "ñòðàíèöè" ÷åñòî ñà îáåêò íà ìàðêåòèíãîâà ïîëèòèêà.
-+Ðолко пÑÑи <b>ÑÑÑаниÑа, каÑÑинка или дÑÑг Ñайл</b> Ð¾Ñ ÑайÑа е <b>Ñазгледан</b> или <b>Ñвален</b> Ð¾Ñ Ð¿Ð¾ÑеÑиÑел.<br />
-+Тези данни Ñа Ñамо ÑпÑавоÑни, ÑÑй каÑо бÑÐ¾Ñ Ð½Ð° ÑазгледаниÑе "ÑÑÑаниÑи" ÑеÑÑо Ñа Ð¾Ð±ÐµÐºÑ Ð½Ð° маÑкеÑингова полиÑика.
- </div>
- <div class="CTooltip" id="tt5">
--Òàçè èíôîðìàöèÿ ñå îòíàñÿ äî êîëè÷åñòâîòî äàííè ñâàëåíè ñ âñè÷êè <b>ñòðàíèöè</b>, <b>êàðòèíêè</b> è <b>ôàéëîâå</b> âúâ âàøèÿò ñàéò.<br />
--Ìåðíèòå åäèíèöè ñà â KB, MB èëè GB (Êèëîáàéòè, Ìåãàáàéòè èëè Ãèãàáàéòè)
-+Тази инÑоÑмаÑÐ¸Ñ Ñе оÑнаÑÑ Ð´Ð¾ колиÑеÑÑвоÑо данни Ñвалени Ñ Ð²ÑиÑки <b>ÑÑÑаниÑи</b>, <b>каÑÑинки</b> и <b>Ñайлове</b> вÑв ваÑиÑÑ ÑайÑ.<br />
-+ÐеÑниÑе единиÑи Ñа в KB, MB или GB (ÐилобайÑи, ÐегабайÑи или ÐигабайÑи)
- </div>
- <div class="CTooltip" id="tt13">
--#PROG# ðàçïîçíàâà âñåêè äîñòúï äî âàøèÿ ñàéò ñëåä <b>ïðåòúðñâàíå</b> îò <b>#SearchEnginesArray# ïîïóëÿðíèòå òúðñà÷êè</b> (êàòî Yahoo, Altavista, Lycos, Google, Voila, è ò.í....).
-+#PROG# Ñазпознава вÑеки доÑÑÑп до ваÑÐ¸Ñ ÑÐ°Ð¹Ñ Ñлед <b>пÑеÑÑÑÑване</b> Ð¾Ñ <b>#SearchEnginesArray# попÑлÑÑниÑе ÑÑÑÑаÑки</b> (каÑо Yahoo, Altavista, Lycos, Google, Voila, и Ñ.н....).
- </div>
- <div class="CTooltip" id="tt14">
--Ñïèñúê íà âñè÷êè <b>âúíøíè ñòðàíèöè</b> èçïîëçâàíè çà âðúçêà (è âõîä) êúì âàøèÿò ñàéò (Ñàìî <b>#MaxNbOfRefererShown#</b>-òå íàé-÷åñòî èçïîëçâàíè âúíøíè ñòðàíèöè ñà ïîêàçàíè).
--Âðúçêèòå, èçïîëçâàíè êàòî ðåçóëòàò îò òúðñà÷êèòå ñà èçêëþ÷åíè, ò.ê. âå÷å ñà ïîêàçàíè â ïðåäèøíèÿ ðåä îò òàçè òàáëèöà.
-+СпиÑÑк на вÑиÑки <b>вÑнÑни ÑÑÑаниÑи</b> използвани за вÑÑзка (и вÑ
од) кÑм ваÑиÑÑ ÑÐ°Ð¹Ñ (Само <b>#MaxNbOfRefererShown#</b>-Ñе най-ÑеÑÑо използвани вÑнÑни ÑÑÑаниÑи Ñа показани).
-+ÐÑÑзкиÑе, използвани каÑо ÑезÑлÑÐ°Ñ Ð¾Ñ ÑÑÑÑаÑкиÑе Ñа изклÑÑени, Ñ.к. веÑе Ñа показани в пÑедиÑÐ½Ð¸Ñ Ñед Ð¾Ñ Ñази ÑаблиÑа.
- </div>
- <div class="CTooltip" id="tt15">
--Òàáëèöàòà ïîêàçâà ñïèñúê ñ íàé-÷åñòî èçïîëçâàíèòå <b>êëþ÷îâè ôðàçè èëè äóìè</b> èçïîëçâàíè çà íàìèðàíå íà âàøèÿò ñàéò ñ ïîìîùòà íà èíòåðíåò òúðñà÷êè.
--(Êëþ÷îâèòå äóìè îò <b>#SearchEnginesArray#</b> íàé-ïîïóëÿðíèòå òúðñà÷êè ñà ðàçïîçíàòè îò #PROG#, êàòî Yahoo, Altavista, Lycos, Google, Voila, è ò.í...).<br />
--Çàá.: îáùèÿò áðîé íà òúðñåíèÿòà ïî êëþ÷îâè äóìè ìîæå äà ïðåâèøàâà áðîÿ íà òúðñåíèÿòà ïî êëþ÷îâè ôðàçè (èñòèíñêèÿò áðîé íà òúðñåíèÿòà), çàùîòî àêî ñå èçïîëçâàò 2 êë. äóìè ïðè åäíî è ñúùî òúðñåíå ñå îòáðîÿâàò 2 òúðñåíèÿ ïî äóìè (ïî âåäíúæ çà âñÿêà äóìà).
-+ТаблиÑаÑа показва ÑпиÑÑк Ñ Ð½Ð°Ð¹-ÑеÑÑо използваниÑе <b>клÑÑови ÑÑази или дÑми</b> използвани за намиÑане на ваÑиÑÑ ÑÐ°Ð¹Ñ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑа на инÑеÑÐ½ÐµÑ ÑÑÑÑаÑки.
-+(ÐлÑÑовиÑе дÑми Ð¾Ñ <b>#SearchEnginesArray#</b> най-попÑлÑÑниÑе ÑÑÑÑаÑки Ñа ÑазпознаÑи Ð¾Ñ #PROG#, каÑо Yahoo, Altavista, Lycos, Google, Voila, и Ñ.н...).<br />
-+Ðаб.: обÑиÑÑ Ð±Ñой на ÑÑÑÑениÑÑа по клÑÑови дÑми може да пÑевиÑава бÑÐ¾Ñ Ð½Ð° ÑÑÑÑениÑÑа по клÑÑови ÑÑази (иÑÑинÑкиÑÑ Ð±Ñой на ÑÑÑÑениÑÑа), заÑоÑо ако Ñе Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ñ 2 кл. дÑми пÑи едно и ÑÑÑо ÑÑÑÑене Ñе оÑбÑоÑÐ²Ð°Ñ 2 ÑÑÑÑÐµÐ½Ð¸Ñ Ð¿Ð¾ дÑми (по веднÑж за вÑÑка дÑма).
- </div>
- <div class="CTooltip" id="tt16">
--Ðîáîòèòå (èçâåñòíè è êàòî Ïàÿöè) ñà <b>àâòîìàòèçèðàíè êîìïþòúðíè ïîñåòèòåëè</b> èçïîëçâàíè îò òúðñà÷êèòå äà ñêàíèðàò ñàéòà âè çà èíäåêñèðàíå è êëàñèôèöèðàíå: òå ñúáèðàò èíôîðìàöèÿ çà Óåá ñàéòîâåòå è/èëè ïðîâåðÿâàò äàëè ñàéòúò âè å îíëàéí.<br />
--#PROG# ìîæå äà ðàçïîçíàå äî <b>#RobotArray#</b> ðîáîòà.
-+РобоÑиÑе (извеÑÑни и каÑо ÐаÑÑи) Ñа <b>авÑомаÑизиÑани компÑÑÑÑни поÑеÑиÑели</b> използвани Ð¾Ñ ÑÑÑÑаÑкиÑе да ÑканиÑÐ°Ñ ÑайÑа ви за индекÑиÑане и клаÑиÑиÑиÑане: Ñе ÑÑбиÑÐ°Ñ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð·Ð° Уеб ÑайÑовеÑе и/или пÑовеÑÑÐ²Ð°Ñ Ð´Ð°Ð»Ð¸ ÑайÑÑÑ Ð²Ð¸ е онлайн.<br />
-+#PROG# може да Ñазпознае до <b>#RobotArray#</b> ÑобоÑа.
- </div>
- <div class="CTooltip" id="tt17">
--Âñè÷êè âðåìåâè ñòàòèñòèêè ñà áàçèðàíè íà ÷àñîâîòî âðåìå íà ñúðâúðà.
-+ÐÑиÑки вÑемеви ÑÑаÑиÑÑики Ñа базиÑани на ÑаÑовоÑо вÑеме на ÑÑÑвÑÑа.
- </div>
- <div class="CTooltip" id="tt18">
--Äîêëàäâàíèòå äàííè ñà: <b>ïðèáëèçèòåëíè ñòîéíîñòè</b> (èç÷èñëåíè îò âñè÷êè äàííè ìåæäó íà÷àëíîòî è ïîñëåäíîòî ïîñåùåíèå)
-+ÐокладваниÑе данни Ñа: <b>пÑиблизиÑелни ÑÑойноÑÑи</b> (изÑиÑлени Ð¾Ñ Ð²ÑиÑки данни Ð¼ÐµÐ¶Ð´Ñ Ð½Ð°ÑалноÑо и поÑледноÑо поÑеÑение)
- </div>
- <div class="CTooltip" id="tt19">
--Äîêëàäâàíèòå äàííè ñà: <b>íàðàñòâàùè ñóìè</b> (èç÷èñëåíè îò âñè÷êè äàííè ìåæäó íà÷àëíîòî è ïîñëåäíîòî ïîñåùåíèå)
-+ÐокладваниÑе данни Ñа: <b>наÑаÑÑваÑи ÑÑми</b> (изÑиÑлени Ð¾Ñ Ð²ÑиÑки данни Ð¼ÐµÐ¶Ð´Ñ Ð½Ð°ÑалноÑо и поÑледноÑо поÑеÑение)
- </div>
- <div class="CTooltip" id="tt20">
--Íÿêîè ñòîéíîñòè íà <b>Ïðîäúëæèòåëíîñò íà ïîñåùåíèÿòà</b> ñà 'íåèçâåñòíè' çàùîòî íåâèíàãè ìîãàò äà áúäàò èç÷èñëåíè. Îñíîâíàòà ïðè÷èíà çà òîâà å:<br />
--- Ïîñåùåíèåòî îùå íå å ïðèêëþ÷èëî, êîãàòî å ïðåäèçâèêàíî 'îáíîâÿâàíå'.<br />
--- Ïîñåùåíèåòî å çàïî÷íàëî â ïîñëåäíèÿò ÷àñ (ñëåä 23:00) îò ïîñëåäíèÿò äåí íà ìåñåöà (ïî òåõíè÷åñêè ïðè÷èíè #PROG# å âúçïðåïÿòñòâàí äà èç÷èñëè ïðîäúëæèòåëíîñòòà íà òàêèâà ñåñèè).
-+ÐÑкои ÑÑойноÑÑи на <b>ÐÑодÑлжиÑелноÑÑ Ð½Ð° поÑеÑениÑÑа</b> Ñа 'неизвеÑÑни' заÑоÑо невинаги Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° бÑÐ´Ð°Ñ Ð¸Ð·ÑиÑлени. ÐÑновнаÑа пÑиÑина за Ñова е:<br />
-+- ÐоÑеÑениеÑо оÑе не е пÑиклÑÑило, когаÑо е пÑедизвикано 'обновÑване'.<br />
-+- ÐоÑеÑениеÑо е запоÑнало в поÑледниÑÑ ÑÐ°Ñ (Ñлед 23:00) Ð¾Ñ Ð¿Ð¾ÑледниÑÑ Ð´ÐµÐ½ на меÑеÑа (по ÑеÑ
ниÑеÑки пÑиÑини #PROG# е вÑзпÑепÑÑÑÑван да изÑиÑли пÑодÑлжиÑелноÑÑÑа на Ñакива ÑеÑии).
- </div>
-
--<div class="CTooltip" id="tt201"> Íÿìà îïèñàíèå íà òàçè ãðåøêà. </div>
--<div class="CTooltip" id="tt202"> Çàÿâêàòà ùå áúäå îáðàáîòåíà ïî-êúñíî îò ñúðâúðà. </div>
--<div class="CTooltip" id="tt204"> Ñúðâúðúò îáðàáîòè çàÿâêàòà, íî òÿ íå ñúäúðæà íèùî. </div>
--<div class="CTooltip" id="tt206"> ×àñòè÷íî ñúäúðæàíèå </div>
--<div class="CTooltip" id="tt301"> Â îòãîâîðà íà çàÿâêàòà ìîæåòå äà âèäèòå íîâèÿò àäðåñ íà ïîèñêàíèÿò äîêóìåíò. </div>
--<div class="CTooltip" id="tt302"> Íÿìà îïèñàíèå íà òàçè ãðåøêà. </div>
--<div class="CTooltip" id="tt400"> Ñèíòàêòè÷íà ãðåøêà, ñúðâúðúò íå ðàçáèðà âàøàòà çàÿâêà. </div>
--<div class="CTooltip" id="tt401"> Îïèòâàòå ñå äà äîñòèãíåòå <b>URL çàùèòåí ñ èìå/ïàðîëà</b>.<br />Ìíîãîêðàòíè òàêèâà ñúîáùåíèÿ ìîãàò äà îçíà÷àâàò îïèò çà íåîòîðèçèðàí è/èëè <b>çëîíàìåðåí äîñòúï</b> äî âàøèÿò ñàéò. </div>
--<div class="CTooltip" id="tt403"> Îïèòâàòå ñå äà äîñòèãíåòå <b>URL íåäîñòúïåí è çà îòîðèçèðàíè ïîòðåáèòåëè</b> (íàïðèìåð, URL àäðåñ â äèðåêòîðèÿ, êîÿòî íå å äåôèíèðàíà çà "ïðåãëåä".). </div>
--<div class="CTooltip" id="tt404"> Îïèòâàòå ñå äà äîñòèãíåòå <b>íåñúùåñòâóâàù URL</b>. Òîâà ïîêàçâà ñúùåñòâóâàíåòî íà íåâàëèäíà âðúçêà â ñàéòà èëè ïîãðåøíî íàïèñàí îò ïîñåòèòåëÿ URL àäðåñ. </div>
--<div class="CTooltip" id="tt408"> Ñúðâúðúò å îòäåëèë <b>òâúðäå ìíîãî âðåìå</b> çà äà îòãîâîðè íà çàÿâêàòà. Òàçè ãðåøêà îáèêíîâåíî îçíà÷àâà èëè áàâåí CGI ñêðèïò, êîéòî ñúðâúðúò ñå å ïðèíóäèë äà ïðåêðàòè èëè èçâúíðåäíî ïðåòîâàðåí ñúñ çàÿâêè ñúðâúð. </div>
--<div class="CTooltip" id="tt500"> Âúòðåøíà ãðåøêà. Òàçè ãðåøêà îáèêíîâåíî å ïðè÷èíåíà îò CGI ïðîãðàìà êîÿòî å ïðåêðàòèëà äåéñòâèåòî ñè àáíîðìàëíî(coredump íàïðèìåð). </div>
--<div class="CTooltip" id="tt501"> Èñêàíîòî äåéñòâèå å íåïîçíàòî. </div>
--<div class="CTooltip" id="tt502"> Êîä çà ãðåøêà, âúðíàò îò HTTP ñúðâúð, ðàáîòåù êàòî ïðîêñè èëè gateway, êîãàòî ñúðâúðúò-öåë íå å îòãîâîðèë óñïåøíà íà êëèåíòñêàòà çàÿâêà. </div>
--<div class="CTooltip" id="tt503"> Âúòðåøíà ãðåøêà íà ñúðâúðà. </div>
--<div class="CTooltip" id="tt504"> Ïîðòàëíî(Gateway) ïðåêúñâàíå. </div>
--<div class="CTooltip" id="tt505"> HTTP âåðñèÿòà íå ñå ïîääúðæà. </div>
-+<div class="CTooltip" id="tt201"> ÐÑма опиÑание на Ñази гÑеÑка. </div>
-+<div class="CTooltip" id="tt202"> ÐаÑвкаÑа Ñе бÑде обÑабоÑена по-кÑÑно Ð¾Ñ ÑÑÑвÑÑа. </div>
-+<div class="CTooltip" id="tt204"> СÑÑвÑÑÑÑ Ð¾Ð±ÑабоÑи заÑвкаÑа, но ÑÑ Ð½Ðµ ÑÑдÑÑжа ниÑо. </div>
-+<div class="CTooltip" id="tt206"> ЧаÑÑиÑно ÑÑдÑÑжание </div>
-+<div class="CTooltip" id="tt301"> РоÑговоÑа на заÑвкаÑа можеÑе да видиÑе новиÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° поиÑканиÑÑ Ð´Ð¾ÐºÑменÑ. </div>
-+<div class="CTooltip" id="tt302"> ÐÑма опиÑание на Ñази гÑеÑка. </div>
-+<div class="CTooltip" id="tt400"> СинÑакÑиÑна гÑеÑка, ÑÑÑвÑÑÑÑ Ð½Ðµ ÑазбиÑа ваÑаÑа заÑвка. </div>
-+<div class="CTooltip" id="tt401"> ÐпиÑваÑе Ñе да доÑÑигнеÑе <b>URL заÑиÑен Ñ Ð¸Ð¼Ðµ/паÑола</b>.<br />ÐногокÑаÑни Ñакива ÑÑобÑÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³Ð°Ñ Ð´Ð° ознаÑÐ°Ð²Ð°Ñ Ð¾Ð¿Ð¸Ñ Ð·Ð° неоÑоÑизиÑан и/или <b>злонамеÑен доÑÑÑп</b> до ваÑиÑÑ ÑайÑ. </div>
-+<div class="CTooltip" id="tt403"> ÐпиÑваÑе Ñе да доÑÑигнеÑе <b>URL недоÑÑÑпен и за оÑоÑизиÑани поÑÑебиÑели</b> (напÑимеÑ, URL адÑÐµÑ Ð² диÑекÑоÑиÑ, коÑÑо не е деÑиниÑана за "пÑеглед".). </div>
-+<div class="CTooltip" id="tt404"> ÐпиÑваÑе Ñе да доÑÑигнеÑе <b>неÑÑÑеÑÑвÑÐ²Ð°Ñ URL</b>. Това показва ÑÑÑеÑÑвÑванеÑо на невалидна вÑÑзка в ÑайÑа или погÑеÑно напиÑан Ð¾Ñ Ð¿Ð¾ÑеÑиÑÐµÐ»Ñ URL адÑеÑ. </div>
-+<div class="CTooltip" id="tt408"> СÑÑвÑÑÑÑ Ðµ оÑделил <b>ÑвÑÑде много вÑеме</b> за да оÑговоÑи на заÑвкаÑа. Тази гÑеÑка обикновено ознаÑава или бавен CGI ÑкÑипÑ, койÑо ÑÑÑвÑÑÑÑ Ñе е пÑинÑдил да пÑекÑаÑи или извÑнÑедно пÑеÑоваÑен ÑÑÑ Ð·Ð°Ñвки ÑÑÑвÑÑ. </div>
-+<div class="CTooltip" id="tt500"> ÐÑÑÑеÑна гÑеÑка. Тази гÑеÑка обикновено е пÑиÑинена Ð¾Ñ CGI пÑогÑама коÑÑо е пÑекÑаÑила дейÑÑвиеÑо Ñи абноÑмално(coredump напÑимеÑ). </div>
-+<div class="CTooltip" id="tt501"> ÐÑканоÑо дейÑÑвие е непознаÑо. </div>
-+<div class="CTooltip" id="tt502"> Ðод за гÑеÑка, вÑÑÐ½Ð°Ñ Ð¾Ñ HTTP ÑÑÑвÑÑ, ÑабоÑÐµÑ ÐºÐ°Ñо пÑокÑи или gateway, когаÑо ÑÑÑвÑÑÑÑ-Ñел не е оÑговоÑил ÑÑпеÑна на клиенÑÑкаÑа заÑвка. </div>
-+<div class="CTooltip" id="tt503"> ÐÑÑÑеÑна гÑеÑка на ÑÑÑвÑÑа. </div>
-+<div class="CTooltip" id="tt504"> ÐоÑÑално(Gateway) пÑекÑÑване. </div>
-+<div class="CTooltip" id="tt505"> HTTP веÑÑиÑÑа не Ñе поддÑÑжа. </div>
diff --git a/debian/patches/1016_downloads_list_page.patch b/debian/patches/1016_downloads_list_page.patch
deleted file mode 100644
index c86dcf0..0000000
--- a/debian/patches/1016_downloads_list_page.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Generate "Downloads Full list" page
-Author: c <c at gryning.com>
-Bug-Debian: http://bugs.debian.org/638857
-Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3174944&group_id=13764&atid=113764
-
----
- tools/awstats_buildstaticpages.pl | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/tools/awstats_buildstaticpages.pl
-+++ b/tools/awstats_buildstaticpages.pl
-@@ -50,7 +50,7 @@
- $ShowEMailSenders $ShowEMailReceivers $ShowWormsStats $ShowClusterStats
- $ShowMenu $ShowMonthStats $ShowDaysOfMonthStats $ShowDaysOfWeekStats
- $ShowHoursStats $ShowDomainsStats $ShowHostsStats
--$ShowRobotsStats $ShowSessionsStats $ShowPagesStats $ShowFileTypesStats
-+$ShowRobotsStats $ShowSessionsStats $ShowDownloadsStats $ShowPagesStats $ShowFileTypesStats
- $ShowOSStats $ShowBrowsersStats $ShowOriginStats
- $ShowKeyphrasesStats $ShowKeywordsStats $ShowMiscStats $ShowHTTPErrorsStats
- $BuildReportFormat
-@@ -350,6 +350,7 @@
- if ($ShowEMailSenders) { push @OutputList,'allemails'; push @OutputList,'lastemails'; }
- if ($ShowEMailReceivers) { push @OutputList,'allemailr'; push @OutputList,'lastemailr'; }
- if ($ShowSessionsStats) { push @OutputList,'session'; }
-+if ($ShowDownloadsStats) { push @OutputList,'downloads'; }
- if ($ShowPagesStats) { push @OutputList,'urldetail'; push @OutputList,'urlentry'; push @OutputList,'urlexit'; }
- #if ($ShowFileTypesStats) { push @OutputList,'filetypes'; } # There is dedicated page for filetypes
- if ($ShowOSStats) { push @OutputList,'osdetail'; push @OutputList,'unknownos'; }
diff --git a/debian/patches/1017_fix_html_output_markup.patch b/debian/patches/1017_fix_html_output_markup.patch
deleted file mode 100644
index 53d57c4..0000000
--- a/debian/patches/1017_fix_html_output_markup.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-Description: HTML output nits
-Author: Chaskiel Grundman <cg2v at andrew.cmu.edu>
-Debian-Bug: http://bugs.debian.org/630943
-Forwarded: https://sourceforge.net/tracker/index.php?func=detail&aid=3429995&group_id=13764&atid=363764
-
----
- wwwroot/cgi-bin/awstats.pl | 48 +++++++++++++++------------------------------
- 1 file changed, 16 insertions(+), 32 deletions(-)
-
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -795,7 +795,7 @@
- else { print "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?>\n"; }
- if ( $FrameName ne 'index' ) {
- print
--"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-+"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
- }
- else {
- print
-@@ -807,11 +807,11 @@
- else {
- if ( $FrameName ne 'index' ) {
- print
--"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">\n";
-+"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n";
- }
- else {
- print
--"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\">\n";
-+"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" \"http://www.w3.org/TR/html4/frameset.dtd\">\n";
- }
- print '<html lang="' . $Lang . '"'
- . ( $PageDir ? ' dir="rtl"' : '' ) . ">\n";
-@@ -885,14 +885,6 @@
-
- # A STYLE section must be in head section. Do not use " for number in a style section
- print "<style type=\"text/css\">\n";
-- if ( $BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml' )
-- {
-- print( $ENV{'HTTP_USER_AGENT'} =~ /Firebird/i
-- ? "<!--\n"
-- : "<![CDATA[\n"
-- );
-- }
-- else { print "<!--\n"; }
-
- if ( !$StyleSheet ) {
- print
-@@ -943,14 +935,6 @@
- &$function();
- }
-
-- if ( $BuildReportFormat eq 'xhtml' || $BuildReportFormat eq 'xml' )
-- {
-- print( $ENV{'HTTP_USER_AGENT'} =~ /Firebird/i
-- ? "//-->\n"
-- : "]]>\n"
-- );
-- }
-- else { print "//-->\n"; }
- print "</style>\n";
- }
-
-@@ -9874,7 +9858,7 @@
- print "<option"
- . (
- "$MonthRequired" eq "$monthix"
-- ? " selected=\"true\""
-+ ? " selected=\"selected\""
- : ""
- )
- . " value=\"$monthix\">$MonthNumLib{$monthix}</option>\n";
-@@ -13010,13 +12994,13 @@
- !$StaticLinks
- && $monthix == $nowmonth
- && $YearRequired == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print "$MonthNumLib{$monthix}<br />$YearRequired";
- print( !$StaticLinks
- && $monthix == $nowmonth
-- && $YearRequired == $nowyear ? '</font>' : '' );
-+ && $YearRequired == $nowyear ? '</span>' : '' );
- print "</td>";
-
- # }
-@@ -13073,13 +13057,13 @@
- !$StaticLinks
- && $monthix == $nowmonth
- && $YearRequired == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print "$MonthNumLib{$monthix} $YearRequired";
- print( !$StaticLinks
- && $monthix == $nowmonth
-- && $YearRequired == $nowyear ? '</font>' : '' );
-+ && $YearRequired == $nowyear ? '</span>' : '' );
- print "</td>";
- if ( $ShowMonthStats =~ /U/i ) {
- print "<td>",
-@@ -13426,7 +13410,7 @@
- && $day == $nowday
- && $month == $nowmonth
- && $year == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print "$day<br /><span style=\"font-size: "
-@@ -13438,7 +13422,7 @@
- print( !$StaticLinks
- && $day == $nowday
- && $month == $nowmonth
-- && $year == $nowyear ? '</font>' : '' );
-+ && $year == $nowyear ? '</span>' : '' );
- print "</td>\n";
- }
- print "<td> </td>";
-@@ -13500,14 +13484,14 @@
- && $day == $nowday
- && $month == $nowmonth
- && $year == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print Format_Date( "$year$month$day" . "000000", 2 );
- print( !$StaticLinks
- && $day == $nowday
- && $month == $nowmonth
-- && $year == $nowyear ? '</font>' : '' );
-+ && $year == $nowyear ? '</span>' : '' );
- print "</td>";
- if ( $ShowDaysOfMonthStats =~ /V/i ) {
- print "<td>",
-@@ -13803,14 +13787,14 @@
- && $_ == ( $nowwday - 1 )
- && $MonthRequired == $nowmonth
- && $YearRequired == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print $Message[ $_ + 84 ];
- print( !$StaticLinks
- && $_ == ( $nowwday - 1 )
- && $MonthRequired == $nowmonth
-- && $YearRequired == $nowyear ? '</font>' : '' );
-+ && $YearRequired == $nowyear ? '</span>' : '' );
- print "</td>";
- }
- print "</tr>\n</table>\n";
-@@ -13847,14 +13831,14 @@
- && $_ == ( $nowwday - 1 )
- && $MonthRequired == $nowmonth
- && $YearRequired == $nowyear
-- ? '<font class="currentday">'
-+ ? '<span class="currentday">'
- : ''
- );
- print $Message[ $_ + 84 ];
- print( !$StaticLinks
- && $_ == ( $nowwday - 1 )
- && $MonthRequired == $nowmonth
-- && $YearRequired == $nowyear ? '</font>' : '' );
-+ && $YearRequired == $nowyear ? '</span>' : '' );
- print "</td>";
- if ( $ShowDaysOfWeekStats =~ /P/i ) {
- print "<td>", Format_Number(int($avg_dayofweek_p[$_])), "</td>";
diff --git a/debian/patches/1018_perl5-14.patch b/debian/patches/1018_perl5-14.patch
deleted file mode 100644
index 75cce91..0000000
--- a/debian/patches/1018_perl5-14.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Compatibility patch for perl5.14
-Origin: http://sourceforge.net/tracker/index.php?func=detail&aid=3311848&group_id=13764&atid=113764
-Debian-Bug: http://bugs.debian.org/650492
-
----
- wwwroot/cgi-bin/awstats.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/wwwroot/cgi-bin/awstats.pl
-+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -1338,7 +1338,7 @@
- sub OptimizeArray {
- my $array = shift;
- my @arrayunreg = map {
-- if (/\(\?[-\w]*:(.*)\)/) { $1 }
-+ if (/\(\?[-^\w]*:(.*)\)/) { $1 }
- } @$array;
- my $notcasesensitive = shift;
- my $searchlist = 0;
-@@ -7793,7 +7793,7 @@
- # Return: standardregex
- #------------------------------------------------------------------------------
- sub UnCompileRegex {
-- shift =~ /\(\?[-\w]*:(.*)\)/;
-+ shift =~ /\(\?[-^\w]*:(.*)\)/;
- return $1;
- }
-
diff --git a/debian/patches/1019_allow_frame_resize.patch b/debian/patches/1019_allow_frame_resize.patch
index 9c15e19..72f2741 100644
--- a/debian/patches/1019_allow_frame_resize.patch
+++ b/debian/patches/1019_allow_frame_resize.patch
@@ -8,7 +8,7 @@ Debian-Bug: http://bugs.debian.org/293218
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -17153,10 +17153,10 @@
+@@ -17545,10 +17545,10 @@
print "<frameset cols=\"$FRAMEWIDTH,*\">\n";
print "<frame name=\"mainleft\" src=\""
. XMLEncode("$AWScript${NewLinkParams}framename=mainleft")
diff --git a/debian/patches/1020_LogFile_usage_docs.patch b/debian/patches/1020_LogFile_usage_docs.patch
index 3a6df9f..5e3f2c1 100644
--- a/debian/patches/1020_LogFile_usage_docs.patch
+++ b/debian/patches/1020_LogFile_usage_docs.patch
@@ -3,9 +3,9 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
Bug-Debian: http://bugs.debian.org/435028
---
- docs/awstats_config.html | 4 ++--
+ docs/awstats_config.html | 2 +-
wwwroot/cgi-bin/awstats.model.conf | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
--- a/docs/awstats_config.html
+++ b/docs/awstats_config.html
@@ -18,13 +18,6 @@ Bug-Debian: http://bugs.debian.org/435028
<br># If there is several log files from load balancing servers :
<br># Example: "/pathtotools/logresolvemerge.pl *.log |"
<br>#
-@@ -1826,4 +1826,4 @@
- document.writeln("Last revision: "+date);
- </script>
-
--</body></html>
-\ No newline at end of file
-+</body></html>
--- a/wwwroot/cgi-bin/awstats.model.conf
+++ b/wwwroot/cgi-bin/awstats.model.conf
@@ -44,7 +44,7 @@
diff --git a/debian/patches/2001_awstatsprog_path.patch b/debian/patches/2001_awstatsprog_path.patch
index 38443de..c67824e 100644
--- a/debian/patches/2001_awstatsprog_path.patch
+++ b/debian/patches/2001_awstatsprog_path.patch
@@ -7,7 +7,7 @@ Author: Sergey B Kirpichev <skirpichev at gmail.com>
--- a/tools/awstats_buildstaticpages.pl
+++ b/tools/awstats_buildstaticpages.pl
-@@ -307,8 +307,8 @@
+@@ -308,8 +308,8 @@
# Check if AWSTATS prog is found
my $AwstatsFound=0;
if (-s "$Awstats") { $AwstatsFound=1; }
diff --git a/debian/patches/2002_nboflastupdatelookuptosave.patch b/debian/patches/2002_nboflastupdatelookuptosave.patch
index a11866e..9276f0d 100644
--- a/debian/patches/2002_nboflastupdatelookuptosave.patch
+++ b/debian/patches/2002_nboflastupdatelookuptosave.patch
@@ -9,7 +9,7 @@ Bug-Debian: http://bugs.debian.org/600225
--- a/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
-@@ -16504,6 +16504,7 @@
+@@ -16896,6 +16896,7 @@
'showsteps', 'showdropped',
'showcorrupted', 'showunknownorigin',
'showdirectorigin', 'limitflush',
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/600225
'confdir', 'updatefor',
'hostfilter', 'hostfilterex',
'urlfilter', 'urlfilterex',
-@@ -16719,6 +16720,7 @@
+@@ -17111,6 +17112,7 @@
foreach ( split( /,/, $2 ) ) { $NoLoadPlugin{ &Sanitize( "$_", 1 ) } = 1; }
}
if ( $QueryString =~ /(^|&|&)limitflush=(\d+)/i ) { $LIMITFLUSH = $2; }
diff --git a/debian/patches/series b/debian/patches/series
index 04a58a7..48631f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,15 +2,10 @@
1003_redirect_to_STDERR.patch
1004_perl_version.patch
1008_extrasections_with_top.patch
-1009_hurd_url.patch
1010_dirdata_permissions.patch
1012_ipv6_strip_trailing_dot.patch
1013_yahoo_search.patch
1014_websec_robot.patch
-1015_awstats-tt-bg.txt.patch
-1016_downloads_list_page.patch
-1017_fix_html_output_markup.patch
-1018_perl5-14.patch
1019_allow_frame_resize.patch
1020_LogFile_usage_docs.patch
2001_awstatsprog_path.patch
--
awstats Debian packaging
More information about the Pkg-awstats-commits
mailing list