Author: eandry Date: Sat Dec 2 16:21:34 2006 New Revision: 90065 Added: packages/cooker/analog/current/SOURCES/analog-5.21-htmlform.patch packages/cooker/analog/current/SOURCES/analog-5.22-defaults.patch packages/cooker/analog/current/SOURCES/analog-5.22-png.patch packages/cooker/analog/current/SOURCES/analog-5.23-perlform.patch packages/cooker/analog/current/SOURCES/analog-5.31-config.patch Removed: packages/cooker/analog/current/SOURCES/analog-5.21-htmlform.patch.bz2 packages/cooker/analog/current/SOURCES/analog-5.22-defaults.patch.bz2 packages/cooker/analog/current/SOURCES/analog-5.22-png.patch.bz2 packages/cooker/analog/current/SOURCES/analog-5.23-perlform.patch.bz2 packages/cooker/analog/current/SOURCES/analog-5.31-config.patch.bz2 Modified: packages/cooker/analog/current/SPECS/analog.spec
Log: bump release bunzipped patches Added: packages/cooker/analog/current/SOURCES/analog-5.21-htmlform.patch ============================================================================== --- (empty file) +++ packages/cooker/analog/current/SOURCES/analog-5.21-htmlform.patch Sat Dec 2 16:21:34 2006 @@ -0,0 +1,42 @@ +diff -Naur analog-5.22/anlgform.html analog-5.22.oden/anlgform.html +--- analog-5.22/anlgform.html Wed Mar 20 10:38:41 2002 ++++ analog-5.22.oden/anlgform.html Thu Apr 4 00:06:11 2002 +@@ -3,7 +3,7 @@ + </head> + + <body> +-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1> ++<h1><img src="/images/analogo.png" alt=""> Analog form interface</h1> + + <!-- Make the edits below. You also need to edit anlgform.pl. --> + +@@ -11,23 +11,23 @@ + + <!-- Next, uncomment the following line, edited to reflect the correct --> + <!-- location of anlgform.pl in you server's filespace. --> +-<!-- form action="/cgi-bin/anlgform.pl" method="POST" --> ++<form action="/cgi-bin/anlgform.pl" method="POST"> + + <!-- Many systems will want the IMAGEDIR to be different on the form --> + <!-- than from the command line, because it should not be within /cgi-bin/ --> +-<!-- input type=hidden name="IMAGEDIR" value="/images/" --> ++<input type=hidden name="IMAGEDIR" value="/images/"> + + <!-- Some users will want to set their logfile like this. --> +-<!-- input type=hidden name="LOGFILE" value="/usr/local/etc/httpd/logs/access_log" --> ++<!-- input type=hidden name="LOGFILE" value="/var/log/httpd/access_log" --> + + <!-- After you've made these edits, you can remove the "strong" lines below --> + + <hr> + <h2>1. Report choices</h2> + +-<strong><font color=red>N.B. This form will not work - e.g. the buttons may +-not even appear - until you've configured it according to the instructions. +-When you've configured it, you should remove this paragraph.<br> ++<strong><font color=red>N.B. This form is incomplete until you've configured ++it according to the instructions. When you've configured it, you should remove ++this paragraph.<br> + </font></strong> + + <i>See <a href="http://www.analog.cx/";>the analog Added: packages/cooker/analog/current/SOURCES/analog-5.22-defaults.patch ============================================================================== --- (empty file) +++ packages/cooker/analog/current/SOURCES/analog-5.22-defaults.patch Sat Dec 2 16:21:34 2006 @@ -0,0 +1,28 @@ +diff -Naur analog-5.22/src/anlghead.h analog-5.22.oden/src/anlghead.h +--- analog-5.22/src/anlghead.h Wed Mar 20 10:38:52 2002 ++++ analog-5.22.oden/src/anlghead.h Wed Apr 3 21:12:25 2002 +@@ -61,7 +61,7 @@ + #endif + + #ifndef DEFAULTCONFIGFILE +-#define DEFAULTCONFIGFILE "analog.cfg" ++#define DEFAULTCONFIGFILE "/etc/analog.cfg" + /* The name of the default configuration file. */ + #endif + +@@ -82,13 +82,13 @@ + directory. This may or may not work, so it's better to specify a location + explicitly here if you know where the files will be kept. */ + #ifndef LANGDIR +-#define LANGDIR NULL ++#define LANGDIR "/var/lib/analog/lang/" + #endif + /* Directory where the language files live. Actually, if this one is defined + to be NULL, they will be looked for inside the "lang" subdirectory of the + directory containing the analog binary. */ + #ifndef CONFIGDIR +-#define CONFIGDIR NULL ++#define CONFIGDIR "/var/lib/analog/" + #endif + /* Directory containing configuration files. */ + #ifndef LOGSDIR Added: packages/cooker/analog/current/SOURCES/analog-5.22-png.patch ============================================================================== --- (empty file) +++ packages/cooker/analog/current/SOURCES/analog-5.22-png.patch Sat Dec 2 16:21:34 2006 @@ -0,0 +1,12 @@ +diff -Naur analog-5.22/src/anlghea2.h analog-5.22.oden/src/anlghea2.h +--- analog-5.22/src/anlghea2.h Wed Mar 20 10:38:51 2002 ++++ analog-5.22.oden/src/anlghea2.h Wed Apr 3 22:39:14 2002 +@@ -422,7 +422,7 @@ + #define BARSTYLE 'b' + /* The default bar style for the displays -- 'a' to 'h' */ + +-#define PNGIMAGES (FALSE) ++#define PNGIMAGES (TRUE) + /* Whether the graphics should be png's (TRUE) or gif's (FALSE). */ + + #define HTMLPAGEWIDTH (65) Added: packages/cooker/analog/current/SOURCES/analog-5.23-perlform.patch ============================================================================== --- (empty file) +++ packages/cooker/analog/current/SOURCES/analog-5.23-perlform.patch Sat Dec 2 16:21:34 2006 @@ -0,0 +1,17 @@ +--- analog-5.23/anlgform.pl 2002-05-14 16:20:00.000000000 -0400 ++++ analog-5.23.oden/anlgform.pl 2002-05-19 23:46:42.000000000 -0400 +@@ -19,11 +19,13 @@ + # of Perl (don't remove the #! though). + # 3) You also need to edit anlgform.html if you want to use the form. + # 4) Add to the forbidden commands below if you want. ++$analog = '/usr/bin/analog'; + + @forbidden = qw(LOGFORMAT APACHELOGFORMAT DEFAULTLOGFORMAT + APACHEDEFAULTLOGFORMAT HEADERFILE FOOTERFILE UNCOMPRESS + OUTFILE CACHEOUTFILE LOCALCHARTDIR ERRFILE DNS CGI +- SETTINGS PROGRESSFREQ LANGFILE DESCFILE); ++ SETTINGS PROGRESSFREQ LANGFILE DESCFILE LOGFILE DOMAINFILE); ++ + # Forbidden commands: sysadmin can add more (must be in upper case!) + # Other commands you might consider adding, because they allow users to + # specify which files to use for the analysis, are LOGFILE and DOMAINSFILE. Added: packages/cooker/analog/current/SOURCES/analog-5.31-config.patch ============================================================================== --- (empty file) +++ packages/cooker/analog/current/SOURCES/analog-5.31-config.patch Sat Dec 2 16:21:34 2006 @@ -0,0 +1,82 @@ +--- analog-5.31/analog.cfg.orig 2003-01-11 12:48:28.000000000 +0100 ++++ analog-5.31/analog.cfg 2003-01-26 06:32:30.000000000 +0100 +@@ -10,10 +10,28 @@ + # + # If you need a LOGFORMAT command (most people don't -- try it without first!), + # it must go here, above the LOGFILE commands. +-LOGFILE logfile.log +-# LOGFILE /old/logs/access_log.* +-# OUTFILE Report.html +-# HOSTNAME "[my organisation]" ++LOGFILE /var/log/httpd/access_log* ++# Your organisation's name and URL for the top line of the report ++HOSTNAME "[my organisation]" ++HOSTURL http://localhost ++# ++# Where to write the report ++OUTFILE /var/www/html/analog/report.html ++# ++# URL for the images directory ++IMAGEDIR /images/ ++# ++# URL and local directory for the pie charts ++CHARTDIR /analog/images/ ++LOCALCHARTDIR /var/www/html/analog/images/ ++# ++# Style sheet for the output page ++STYLESHEET none ++# ++# Web server fetches /dir/index.html when asked for /dir/ ++DIRSUFFIX index.html ++# How to uncompress compressed logfiles ++UNCOMPRESS *.gz,*.Z "/usr/bin/gzip -cd" + # + # You probably don't need to change anything below this until you are + # experienced. +@@ -28,12 +46,12 @@ + SUBTYPE *.gz,*.Z + # OSCHARTEXPAND Windows + # Add whichever of these types of pages you have on your server, or others. +-# PAGEINCLUDE *.shtml ++PAGEINCLUDE *.shtml + # PAGEINCLUDE *.asp + # PAGEINCLUDE *.jsp +-# PAGEINCLUDE *.cfm ++PAGEINCLUDE *.cfm + # PAGEINCLUDE *.pl +-# PAGEINCLUDE *.php ++PAGEINCLUDE *.php + # More SEARCHENGINE commands can be found at + # http://www.analog.cx/helpers/#conffiles + SEARCHENGINE http://*google.*/* q,as_q,as_epq,as_oq +@@ -103,3 +121,30 @@ + TYPEALIAS .cfm ".cfm [Cold Fusion]" + TYPEALIAS .php ".php [PHP]" + TYPEALIAS .js ".js [JavaScript code]" ++REQCHART ON ++REDIRCHART ON ++FAILCHART ON ++TYPECHART ON ++SIZECHART ON ++PROCTIMECHART ON ++DIRCHART ON ++HOSTCHART ON ++REDIRHOSTCHART ON ++FAILHOSTCHART ON ++DOMCHART ON ++ORGCHART ON ++REFCHART ON ++REFSITECHART ON ++REDIRREFCHART ON ++FAILREFCHART ON ++BROWREPCHART ON ++BROWSUMCHART ON ++OSCHART ON ++USERCHART ON ++REDIRUSERCHART ON ++FAILUSERCHART ON ++SEARCHQUERYCHART ON ++SEARCHWORDCHART ON ++INTSEARCHQUERYCHART ON ++INTSEARCHWORDCHART ON ++STATUSCHART ON Modified: packages/cooker/analog/current/SPECS/analog.spec ============================================================================== --- packages/cooker/analog/current/SPECS/analog.spec (original) +++ packages/cooker/analog/current/SPECS/analog.spec Sat Dec 2 16:21:34 2006 @@ -1,17 +1,17 @@ %define name analog %define version 6.0 -%define release %mkrel 1 +%define release %mkrel 2 Summary: WWW server logfile analysis program Name: %{name} Version: %{version} Release: %{release} Source: http://www.analog.cx/%{name}-%{version}.tar.bz2 -Patch0: %{name}-5.21-htmlform.patch.bz2 -Patch1: %{name}-5.23-perlform.patch.bz2 -Patch2: %{name}-5.31-config.patch.bz2 -Patch3: %{name}-5.22-defaults.patch.bz2 -Patch4: %{name}-5.22-png.patch.bz2 +Patch0: %{name}-5.21-htmlform.patch +Patch1: %{name}-5.23-perlform.patch +Patch2: %{name}-5.31-config.patch +Patch3: %{name}-5.22-defaults.patch +Patch4: %{name}-5.22-png.patch License: Distributable Group: Monitoring URL: http://www.analog.cx/
