From 4928cb623609d9b617ab75f8370c32518a753dcd Mon Sep 17 00:00:00 2001 From: lukasz Date: Thu, 3 Feb 2000 23:40:32 +0000 Subject: [PATCH] - rebuild patch Changed files: analog-config.patch -> 1.3 --- analog-config.patch | 178 +++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 94 deletions(-) diff --git a/analog-config.patch b/analog-config.patch index fae3b48..c043373 100644 --- a/analog-config.patch +++ b/analog-config.patch @@ -1,12 +1,74 @@ -diff -urN analog3.32.orig/analhead.h analog3.32/analhead.h ---- analog3.32.orig/analhead.h Sat Jun 19 13:19:21 1999 -+++ analog3.32/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 analog4.02.orig/analog.cfg analog4.02/analog.cfg +--- analog4.02.orig/analog.cfg Sat Jan 29 17:00:59 2000 ++++ analog4.02/analog.cfg Fri Feb 4 00:12:37 2000 +@@ -7,7 +7,8 @@ + # There is a much more extensive configuration file in examples/big.cfg + # + # If you need 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]" + # REQINCLUDE pages + LINKINCLUDE pages +diff -urN analog4.02.orig/anlgform.html analog4.02/anlgform.html +--- analog4.02.orig/anlgform.html Mon Nov 8 20:33:04 1999 ++++ analog4.02/anlgform.html Fri Feb 4 00:12:38 2000 +@@ -3,8 +3,7 @@ + + + +-

Analog form interface

+- ++

Analog form interface

+ + + +@@ -24,10 +23,10 @@ + + + +- ++ + + +- ++ + +

1. Report choices

+diff -urN analog4.02.orig/anlghea2.h analog4.02/anlghea2.h +--- analog4.02.orig/anlghea2.h Sat Jan 29 17:00:59 2000 ++++ analog4.02/anlghea2.h Fri Feb 4 00:12:38 2000 +@@ -48,16 +48,16 @@ + #endif + + #ifndef LANGDIR +-#define LANGDIR ANALOGDIR"lang/" ++#define LANGDIR ANALOGDIR "/usr/share/analog/lang/" + /* Directory where the language files live. */ + #endif + + #ifndef NODNS +-#define DNSFILE ANALOGDIR"dnscache" ++#define DNSFILE ANALOGDIR "/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 ANALOGDIR "/var/lock/dnslock" + /* A lock file to stop two processes trying to write the DNSFILE at once */ + + #define DNS (DNS_NONE) +diff -urN analog4.02.orig/anlghead.h analog4.02/anlghead.h +--- analog4.02.orig/anlghead.h Sat Jan 29 17:01:09 2000 ++++ analog4.02/anlghead.h Fri Feb 4 00:12:39 2000 +@@ -19,19 +19,19 @@ + #define ANLGHEAD #ifndef HOSTNAME -#define HOSTNAME "[my organisation]" -+#define HOSTNAME "PLD Linux Server" ++#define HOSTNAME "[PLD Linux Server]" /* the name of your organisation or WWW host. This is used for printing at the top of the output */ #endif @@ -18,112 +80,40 @@ diff -urN analog3.32.orig/analhead.h analog3.32/analhead.h 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/" */ +-#define ANALOGDIR "/usr/local/analog4.02/" ++#define ANALOGDIR "" + #endif + /* The directory where your analog stuff lives (or will live). You need to + get this right otherwise analog won't be able to find any of its auxiliary +@@ -41,18 +41,18 @@ + which means the file analog.cfg within the ANALOGDIR. */ #ifndef LOGFILE --#define LOGFILE HTTPDIR"logs/access_log" +-#define LOGFILE "/usr/local/apache/logs/access_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/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. */ +@@ -71,7 +71,7 @@ #endif #ifndef DEFAULTCONFIGFILE -#define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg" -+#define DEFAULTCONFIGFILE "/etc/analog.cfg" ++#define DEFAULTCONFIGFILE ANALOGDIR "/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. */ - #endif - -@@ -116,11 +116,11 @@ - #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.32.orig/analog.cfg analog3.32/analog.cfg ---- analog3.32.orig/analog.cfg Sat May 15 16:43:58 1999 -+++ analog3.32/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.32.orig/anlgform.c analog3.32/anlgform.c ---- analog3.32.orig/anlgform.c Sat Jun 19 13:18:54 1999 -+++ analog3.32/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.32.orig/anlgform.html analog3.32/anlgform.html ---- analog3.32.orig/anlgform.html Tue Jun 8 22:00:25 1999 -+++ analog3.32/anlgform.html Sat Jul 31 21:29:58 1999 -@@ -3,7 +3,7 @@ - - - --

Analog form interface

- - - -@@ -22,10 +22,10 @@ - - - -- -+ - - -- -+ - - - -- 2.43.0