[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/7.0_dfsg-2-6-g98eed3a
Sergey B Kirpichev
skirpichev at gmail.com
Sat Oct 29 11:45:48 UTC 2011
The following commit has been merged in the master branch:
commit 98eed3ad6905fb0ce0b730758f62807c42a6eb72
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date: Sat Oct 29 15:40:26 2011 +0400
Include patches/1017_fix_html_output_markup.patch to fix some output issues
diff --git a/debian/patches/1017_fix_html_output_markup.patch b/debian/patches/1017_fix_html_output_markup.patch
new file mode 100644
index 0000000..53d57c4
--- /dev/null
+++ b/debian/patches/1017_fix_html_output_markup.patch
@@ -0,0 +1,174 @@
+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/2002_nboflastupdatelookuptosave.patch b/debian/patches/2002_nboflastupdatelookuptosave.patch
index 6923aa1..a11866e 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
-@@ -16520,6 +16520,7 @@
+@@ -16504,6 +16504,7 @@
'showsteps', 'showdropped',
'showcorrupted', 'showunknownorigin',
'showdirectorigin', 'limitflush',
@@ -17,7 +17,7 @@ Bug-Debian: http://bugs.debian.org/600225
'confdir', 'updatefor',
'hostfilter', 'hostfilterex',
'urlfilter', 'urlfilterex',
-@@ -16735,6 +16736,7 @@
+@@ -16719,6 +16720,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 a4814b5..b41a0c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,5 +9,6 @@
1014_websec_robot.patch
1015_awstats-tt-bg.txt.patch
1016_downloads_list_page.patch
+1017_fix_html_output_markup.patch
2001_awstatsprog_path.patch
2002_nboflastupdatelookuptosave.patch
--
awstats Debian packaging
More information about the Pkg-awstats-commits
mailing list