-diff -urN analog3.31.orig/analhead.h analog3.31/analhead.h
---- analog3.31.orig/analhead.h Sat Jun 19 13:19:21 1999
-+++ analog3.31/analhead.h Sat Jul 31 21:30:45 1999
-@@ -16,19 +16,19 @@
- them except MANDATORYCONFIGFILE can be changed at run time as well. ***/
+diff -urN analog-5.22/anlgform.html analog-5.22.new/anlgform.html
+--- analog-5.22/anlgform.html Wed Mar 20 10:38:41 2002
++++ analog-5.22.new/anlgform.html Fri Apr 5 12:38:44 2002
+@@ -3,7 +3,7 @@
+ </head>
+
+ <body>
+-<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
++<h1><img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
+
+ <!-- Make the edits below. You also need to edit anlgform.pl. -->
+
+@@ -15,10 +15,12 @@
+
+ <!-- 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="/icons/" -->
+
+ <!-- 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="/usr/var/httpd/log/access_log" -->
++
+
+ <!-- After you've made these edits, you can remove the "strong" lines below -->
+
+diff -urN analog-5.22/anlgform.pl analog-5.22.new/anlgform.pl
+--- analog-5.22/anlgform.pl Wed Mar 20 10:38:41 2002
++++ analog-5.22.new/anlgform.pl Fri Apr 5 12:39:39 2002
+@@ -19,6 +19,7 @@
+ # 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
+Binary files analog-5.22/src/alias.o and analog-5.22.new/src/alias.o differ
+Binary files analog-5.22/src/analog.o and analog-5.22.new/src/analog.o differ
+diff -urN analog-5.22/src/anlghea2.h analog-5.22.new/src/anlghea2.h
+--- analog-5.22/src/anlghea2.h Wed Mar 20 10:38:51 2002
++++ analog-5.22.new/src/anlghea2.h Fri Apr 5 12:40:33 2002
+@@ -50,11 +50,12 @@
+ #endif
+
+ #ifndef NODNS
+-#define DNSFILE "dnscache"
++#define DNSFILE "/var/lib/analog/dnscache"
+ /* where to store resolved addresses so we don't have to look them up next
+ time */
+
+-#define DNSLOCKFILE "dnslock"
++#define DNSLOCKFILE "/var/lock/dnslock"
++
+ /* A lock file to stop two processes trying to write the DNSFILE at once */
+
+ #define DNS (DNS_NONE)
+diff -urN analog-5.22/src/anlghead.h analog-5.22.new/src/anlghead.h
+--- analog-5.22/src/anlghead.h Wed Mar 20 10:38:52 2002
++++ analog-5.22.new/src/anlghead.h Fri Apr 5 12:42:55 2002
+@@ -19,30 +19,31 @@
+ #define ANLGHEAD_H
#ifndef HOSTNAME
-#define HOSTNAME "[my organisation]"
-+#define HOSTNAME "PLD Linux Server"
- /* the name of your organisation or WWW host. This is used for printing
- at the top of the output */
++#define HOSTNAME "[PLD Linux Server]"
+ /* The name of your organisation or web server. This is used for printing
+ at the top of the output. */
#endif
#ifndef HOSTURL
-#define HOSTURL "none"
+#define HOSTURL "/"
- /* the URL of your host's home page, for linking to at the top of the
+ /* The URL of your host's home page, for linking to at the top of the
output; use "none" for no linking. */
#endif
- #ifndef HTTPDIR
--#define HTTPDIR "/usr/local/etc/httpd/"
-+#define HTTPDIR "/etc/httpd/"
- #endif
- #ifndef ANALOGDIR
- #define ANALOGDIR HTTPDIR"analog/"
-@@ -42,25 +42,25 @@
- "/usr/local/etc/httpd/analog/" */
-
#ifndef LOGFILE
--#define LOGFILE HTTPDIR"logs/access_log"
+-#define LOGFILE "logfile.log"
+#define LOGFILE "/var/log/httpd/access_log"
/* The name of the default logfile. Can be a list, separated by commas
(but no spaces), and can include wild cards. */
#endif
+ #ifndef OUTFILE
+-#define OUTFILE "stdout"
++#define OUTFILE "/home/services/httpd/html/usage/analog.html"
++
+ /* The default file for output. Use "stdout" for stdout. */
+ #endif
+
#ifndef IMAGEDIR
-#define IMAGEDIR "images/"
+#define IMAGEDIR "/icons/"
/* URL of the directory where the images for the graphical reports live.
The URL can be absolute, or relative to the output page: e.g., just the
empty string "" for the same directory as the output page. */
- #endif
-
- #ifndef LANGDIR
--#define LANGDIR ANALOGDIR"lang/"
-+#define LANGDIR "/usr/share/analog/lang/"
- /* Directory where the language files live. */
+@@ -61,7 +62,7 @@
#endif
#ifndef DEFAULTCONFIGFILE
--#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg"
+-#define DEFAULTCONFIGFILE "analog.cfg"
+#define DEFAULTCONFIGFILE "/etc/analog.cfg"
- /* the name of the default configuration file; see README.html for a
- description of this file. Use "none" (NOT ANALOGDIR"none"!) for no
- configuration file. */
-@@ -101,7 +101,7 @@
- /*** The rest of the options can be overridden when the program is run. ***/
-
- #ifndef OUTFILE
--#define OUTFILE "stdout"
-+#define OUTFILE "/home/httpd/html/usage/analog.html"
- /* The default file for output. Use "stdout" for stdout. */
+ /* The name of the default configuration file. */
#endif
-@@ -116,11 +116,11 @@
+@@ -82,7 +83,7 @@
+ 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 "/usr/share/analog/lang/"
#endif
-
- #ifndef NODNS
--#define DNSFILE ANALOGDIR"dnscache"
-+#define DNSFILE "/var/state/analog/dnscache"
- /* where to store resolved addresses so we don't have to look them up next
- time */
-
--#define DNSLOCKFILE ANALOGDIR"dnslock"
-+#define DNSLOCKFILE "/var/lock/dnslock"
- /* A lock file to stop two processes trying to write the DNSFILE at once */
-
- #define DNS (DNS_NONE)
-diff -urN analog3.31.orig/analog.cfg analog3.31/analog.cfg
---- analog3.31.orig/analog.cfg Sat May 15 16:43:58 1999
-+++ analog3.31/analog.cfg Sat Jul 31 21:44:01 1999
-@@ -8,7 +8,8 @@
- # REQINCLUDE pages
- #
- # If you have a LOGFORMAT command it must go here, above the LOGFILE command.
--LOGFILE logfile.log
-+LOGFILE /var/log/httpd/access_log
-+#LANGUAGE POLISH
- HOSTNAME "[my organisation]"
- LINKINCLUDE pages
- REFLINKINCLUDE pages
-diff -urN analog3.31.orig/anlgform.c analog3.31/anlgform.c
---- analog3.31.orig/anlgform.c Sat Jun 19 13:18:54 1999
-+++ analog3.31/anlgform.c Sat Jul 31 21:29:58 1999
-@@ -7,7 +7,7 @@
- /*** anlgform.c; the cgi front end for analog ***/
-
- /* You must uncomment the next line, and put where the analog executable is */
--/* #define ANALOG "/usr/local/etc/httpd/analog/analog" */
-+#define ANALOG "/usr/bin/analog"
-
- #ifdef WIN32
- #define ANALOG "\\analog\\analog.exe"
-diff -urN analog3.31.orig/anlgform.html analog3.31/anlgform.html
---- analog3.31.orig/anlgform.html Tue Jun 8 22:00:25 1999
-+++ analog3.31/anlgform.html Sat Jul 31 21:29:58 1999
-@@ -3,7 +3,7 @@
- </head>
-
- <body>
--<h1><!-- img src="/images/analogo.gif" alt="" --> Analog form interface</h1>
-+<h1><img src="/icons/analogo.gif" alt="Analog" --> Analog form interface</h1>
-
- <!-- All platforms should uncomment the img tag above, edited if necessary -->
-
-@@ -22,10 +22,10 @@
-
- <!-- Many systems will want the IMAGEDIR to be different on the form... -->
- <!-- than from the commandline, because it should not be within /cgi-bin/ -->
--<!-- input type=hidden name="ie" value="/images/" -->
-+<!-- input type=hidden name="ie" value="/icons/" -->
-
- <!-- Some users will want to set their logfile like this -->
--<!-- input type=hidden name="lo" value="/usr/local/etc/httpd/logs/access_log" -->
-+<!-- input type=hidden name="lo" value="/var/log/httpd/access_log" -->
-
- <!-- A few broken systems need a TZ line to specify their timezone -->
- <!-- input type=hidden name="TZ" value="GMT0BST" -->
+ /* 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
projects / packages / analog.git / blobdiff