X-Git-Url: http://git.pld-linux.org/?p=packages%2Fanalog.git;a=blobdiff_plain;f=analog-config.patch;h=75319e23e7570a78d4d52c8aebb585858322e2b9;hp=38a40f5089ef93aae3d54521715a2934d858d217;hb=HEAD;hpb=0b76998b5d172d938b6facf14597365e9f097a9d;ds=sidebyside diff --git a/analog-config.patch b/analog-config.patch index 38a40f5..75319e2 100644 --- a/analog-config.patch +++ b/analog-config.patch @@ -1,129 +1,115 @@ -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 @@ + + + +-

Analog form interface

+ + + +@@ -15,10 +15,12 @@ + + + +- ++ + + + ++ ++ + + + +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 @@ - - - --

Analog form interface

- - - -@@ -22,10 +22,10 @@ - - - -- -+ - - -- -+ - - - + /* 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