You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by bn...@apache.org on 2004/04/14 18:24:37 UTC

cvs commit: httpd-2.0/modules/loggers NWGNUforensic NWGNUmodlogio NWGNUmakefile

bnicholes    2004/04/14 09:24:37

  Modified:    .        Tag: APACHE_2_0_BRANCH NWGNUmakefile
               build    Tag: APACHE_2_0_BRANCH mkconfNW.awk
               modules/loggers Tag: APACHE_2_0_BRANCH NWGNUmakefile
  Added:       modules/loggers Tag: APACHE_2_0_BRANCH NWGNUforensic
                        NWGNUmodlogio
  Log:
  Add mod_forensic to the NetWare build
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.13.2.12 +1 -0      httpd-2.0/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/NWGNUmakefile,v
  retrieving revision 1.13.2.11
  retrieving revision 1.13.2.12
  diff -u -r1.13.2.11 -r1.13.2.12
  --- NWGNUmakefile	12 Apr 2004 20:50:54 -0000	1.13.2.11
  +++ NWGNUmakefile	14 Apr 2004 16:24:36 -0000	1.13.2.12
  @@ -322,6 +322,7 @@
   	-copy CHANGES                   $(INSTALL)\Apache2\*.*
   	-copy support\dbmmanage.in      $(INSTALL)\Apache2\bin\dbmmanage.pl
   	-copy support\logresolve.pl.in  $(INSTALL)\Apache2\bin\logresolve.pl
  +	-copy support\check_forensic    $(INSTALL)\Apache2\bin\check_forensic
   	-awk  -f build\mkconfnw.awk docs\conf\httpd-std.conf.in >$(INSTALL)\Apache2\conf\httpd.conf
   	-copy docs\conf\magic           $(INSTALL)\Apache2\conf\magic
   	-copy docs\conf\mime.types      $(INSTALL)\Apache2\conf\mime.types
  
  
  
  No                   revision
  No                   revision
  1.10.2.5  +1 -0      httpd-2.0/build/mkconfNW.awk
  
  Index: mkconfNW.awk
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/mkconfNW.awk,v
  retrieving revision 1.10.2.4
  retrieving revision 1.10.2.5
  diff -u -r1.10.2.4 -r1.10.2.5
  --- mkconfNW.awk	9 Feb 2004 20:59:44 -0000	1.10.2.4
  +++ mkconfNW.awk	14 Apr 2004 16:24:36 -0000	1.10.2.5
  @@ -48,6 +48,7 @@
       print "#LoadModule file_cache_module modules/filecach.nlm"
       print "#LoadModule headers_module modules/headers.nlm"
       print "#LoadModule info_module modules/info.nlm"
  +    print "#LoadModule log_forensic_module modules/forensic.nlm"
       print "#LoadModule logio_module modules/modlogio.nlm"
       print "#LoadModule mime_magic_module modules/mimemagi.nlm"
       print "#LoadModule proxy_module modules/proxy.nlm"
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +8 -22     httpd-2.0/modules/loggers/NWGNUmakefile
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/NWGNUmakefile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUmakefile	16 Oct 2002 23:52:27 -0000	1.3
  +++ NWGNUmakefile	14 Apr 2004 16:24:36 -0000	1.3.2.1
  @@ -24,19 +24,12 @@
   # INCDIRS
   #
   XINCDIRS	+= \
  -			$(AP_WORK)/include \
  -			$(NWOS) \
  -			$(AP_WORK)/modules/arch/netware \
  -			$(AP_WORK)/srclib/apr/include \
  -			$(AP_WORK)/srclib/apr-util/include \
  -			$(AP_WORK)/srclib/apr \
   			$(EOLIST)
   
   #
   # These flags will come after CFLAGS
   #
   XCFLAGS		+= \
  -			-prefix pre_nw.h \
   			$(EOLIST)
   
   #
  @@ -102,19 +95,19 @@
   # This is used by the link 'name' directive to name the nlm.  If left blank
   # TARGET_nlm (see below) will be used.
   #
  -NLM_NAME		= logio
  +NLM_NAME		=
   
   #
   # This is used by the link '-desc ' directive. 
   # If left blank, NLM_NAME will be used.
   #
  -NLM_DESCRIPTION	= Apache $(VERSION_STR) IO Logging Module
  +NLM_DESCRIPTION	=
   
   #
   # This is used by the '-threadname' directive.  If left blank,
   # NLM_NAME Thread will be used.
   #
  -NLM_THREAD_NAME	= Logio Module
  +NLM_THREAD_NAME	=
   
   #
   # If this is specified, it will override VERSION value in 
  @@ -125,18 +118,18 @@
   #
   # If this is specified, it will override the default of 64K
   #
  -NLM_STACK_SIZE	= 8192
  +NLM_STACK_SIZE	=
   
   
   #
   # If this is specified it will be used by the link '-entry' directive
   #
  -NLM_ENTRY_SYM	= _LibCPrelude
  +NLM_ENTRY_SYM	=
   
   #
   # If this is specified it will be used by the link '-exit' directive
   #
  -NLM_EXIT_SYM	= _LibCPostlude
  +NLM_EXIT_SYM	=
   
   #
   # If this is specified it will be used by the link '-check' directive
  @@ -146,7 +139,7 @@
   #
   # If these are specified it will be used by the link '-flags' directive
   #
  -NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
  +NLM_FLAGS		=
   
   #
   # If this is specified it will be linked in with the XDCData option in the def 
  @@ -160,6 +153,7 @@
   #
   TARGET_nlm = \
   	$(OBJDIR)/modlogio.nlm \
  +	$(OBJDIR)/forensic.nlm \
   	$(EOLIST)
   
   #
  @@ -173,7 +167,6 @@
   # Paths must all use the '/' character
   #
   FILES_nlm_objs = \
  -	$(OBJDIR)/mod_logio.o \
   	$(EOLIST)
   
   #
  @@ -181,7 +174,6 @@
   # These will be added as a library command in the link.opt file.
   #
   FILES_nlm_libs = \
  -   	libcpre.o \
   	$(EOLIST)
   
   #
  @@ -189,8 +181,6 @@
   # These will be added as a module command in the link.opt file.
   #
   FILES_nlm_modules = \
  -	aprlib \
  -	libc \
   	$(EOLIST)
   
   #
  @@ -212,16 +202,12 @@
   # Any additional imports go here
   #
   FILES_nlm_Ximports = \
  -	@$(APR)/aprlib.imp \
  -	@$(NWOS)/httpd.imp \
  -	@libc.imp \
   	$(EOLIST)
    
   #   
   # Any symbols exported to here
   #
   FILES_nlm_exports = \
  -	logio_module \
   	$(EOLIST)
   	
   #   
  
  
  
  No                   revision
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/NWGNUmakefile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUmakefile	16 Oct 2002 23:52:27 -0000	1.3
  +++ NWGNUmakefile	14 Apr 2004 16:24:36 -0000	1.3.2.1
  @@ -24,19 +24,12 @@
   # INCDIRS
   #
   XINCDIRS	+= \
  -			$(AP_WORK)/include \
  -			$(NWOS) \
  -			$(AP_WORK)/modules/arch/netware \
  -			$(AP_WORK)/srclib/apr/include \
  -			$(AP_WORK)/srclib/apr-util/include \
  -			$(AP_WORK)/srclib/apr \
   			$(EOLIST)
   
   #
   # These flags will come after CFLAGS
   #
   XCFLAGS		+= \
  -			-prefix pre_nw.h \
   			$(EOLIST)
   
   #
  @@ -102,19 +95,19 @@
   # This is used by the link 'name' directive to name the nlm.  If left blank
   # TARGET_nlm (see below) will be used.
   #
  -NLM_NAME		= logio
  +NLM_NAME		=
   
   #
   # This is used by the link '-desc ' directive. 
   # If left blank, NLM_NAME will be used.
   #
  -NLM_DESCRIPTION	= Apache $(VERSION_STR) IO Logging Module
  +NLM_DESCRIPTION	=
   
   #
   # This is used by the '-threadname' directive.  If left blank,
   # NLM_NAME Thread will be used.
   #
  -NLM_THREAD_NAME	= Logio Module
  +NLM_THREAD_NAME	=
   
   #
   # If this is specified, it will override VERSION value in 
  @@ -125,18 +118,18 @@
   #
   # If this is specified, it will override the default of 64K
   #
  -NLM_STACK_SIZE	= 8192
  +NLM_STACK_SIZE	=
   
   
   #
   # If this is specified it will be used by the link '-entry' directive
   #
  -NLM_ENTRY_SYM	= _LibCPrelude
  +NLM_ENTRY_SYM	=
   
   #
   # If this is specified it will be used by the link '-exit' directive
   #
  -NLM_EXIT_SYM	= _LibCPostlude
  +NLM_EXIT_SYM	=
   
   #
   # If this is specified it will be used by the link '-check' directive
  @@ -146,7 +139,7 @@
   #
   # If these are specified it will be used by the link '-flags' directive
   #
  -NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
  +NLM_FLAGS		=
   
   #
   # If this is specified it will be linked in with the XDCData option in the def 
  @@ -160,6 +153,7 @@
   #
   TARGET_nlm = \
   	$(OBJDIR)/modlogio.nlm \
  +	$(OBJDIR)/forensic.nlm \
   	$(EOLIST)
   
   #
  @@ -173,7 +167,6 @@
   # Paths must all use the '/' character
   #
   FILES_nlm_objs = \
  -	$(OBJDIR)/mod_logio.o \
   	$(EOLIST)
   
   #
  @@ -181,7 +174,6 @@
   # These will be added as a library command in the link.opt file.
   #
   FILES_nlm_libs = \
  -   	libcpre.o \
   	$(EOLIST)
   
   #
  @@ -189,8 +181,6 @@
   # These will be added as a module command in the link.opt file.
   #
   FILES_nlm_modules = \
  -	aprlib \
  -	libc \
   	$(EOLIST)
   
   #
  @@ -212,16 +202,12 @@
   # Any additional imports go here
   #
   FILES_nlm_Ximports = \
  -	@$(APR)/aprlib.imp \
  -	@$(NWOS)/httpd.imp \
  -	@libc.imp \
   	$(EOLIST)
    
   #   
   # Any symbols exported to here
   #
   FILES_nlm_exports = \
  -	logio_module \
   	$(EOLIST)
   	
   #   
  
  
  
  No                   revision
  
  Index: NWGNUmakefile
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/NWGNUmakefile,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- NWGNUmakefile	16 Oct 2002 23:52:27 -0000	1.3
  +++ NWGNUmakefile	14 Apr 2004 16:24:36 -0000	1.3.2.1
  @@ -24,19 +24,12 @@
   # INCDIRS
   #
   XINCDIRS	+= \
  -			$(AP_WORK)/include \
  -			$(NWOS) \
  -			$(AP_WORK)/modules/arch/netware \
  -			$(AP_WORK)/srclib/apr/include \
  -			$(AP_WORK)/srclib/apr-util/include \
  -			$(AP_WORK)/srclib/apr \
   			$(EOLIST)
   
   #
   # These flags will come after CFLAGS
   #
   XCFLAGS		+= \
  -			-prefix pre_nw.h \
   			$(EOLIST)
   
   #
  @@ -102,19 +95,19 @@
   # This is used by the link 'name' directive to name the nlm.  If left blank
   # TARGET_nlm (see below) will be used.
   #
  -NLM_NAME		= logio
  +NLM_NAME		=
   
   #
   # This is used by the link '-desc ' directive. 
   # If left blank, NLM_NAME will be used.
   #
  -NLM_DESCRIPTION	= Apache $(VERSION_STR) IO Logging Module
  +NLM_DESCRIPTION	=
   
   #
   # This is used by the '-threadname' directive.  If left blank,
   # NLM_NAME Thread will be used.
   #
  -NLM_THREAD_NAME	= Logio Module
  +NLM_THREAD_NAME	=
   
   #
   # If this is specified, it will override VERSION value in 
  @@ -125,18 +118,18 @@
   #
   # If this is specified, it will override the default of 64K
   #
  -NLM_STACK_SIZE	= 8192
  +NLM_STACK_SIZE	=
   
   
   #
   # If this is specified it will be used by the link '-entry' directive
   #
  -NLM_ENTRY_SYM	= _LibCPrelude
  +NLM_ENTRY_SYM	=
   
   #
   # If this is specified it will be used by the link '-exit' directive
   #
  -NLM_EXIT_SYM	= _LibCPostlude
  +NLM_EXIT_SYM	=
   
   #
   # If this is specified it will be used by the link '-check' directive
  @@ -146,7 +139,7 @@
   #
   # If these are specified it will be used by the link '-flags' directive
   #
  -NLM_FLAGS		=  AUTOUNLOAD, PSEUDOPREEMPTION
  +NLM_FLAGS		=
   
   #
   # If this is specified it will be linked in with the XDCData option in the def 
  @@ -160,6 +153,7 @@
   #
   TARGET_nlm = \
   	$(OBJDIR)/modlogio.nlm \
  +	$(OBJDIR)/forensic.nlm \
   	$(EOLIST)
   
   #
  @@ -173,7 +167,6 @@
   # Paths must all use the '/' character
   #
   FILES_nlm_objs = \
  -	$(OBJDIR)/mod_logio.o \
   	$(EOLIST)
   
   #
  @@ -181,7 +174,6 @@
   # These will be added as a library command in the link.opt file.
   #
   FILES_nlm_libs = \
  -   	libcpre.o \
   	$(EOLIST)
   
   #
  @@ -189,8 +181,6 @@
   # These will be added as a module command in the link.opt file.
   #
   FILES_nlm_modules = \
  -	aprlib \
  -	libc \
   	$(EOLIST)
   
   #
  @@ -212,16 +202,12 @@
   # Any additional imports go here
   #
   FILES_nlm_Ximports = \
  -	@$(APR)/aprlib.imp \
  -	@$(NWOS)/httpd.imp \
  -	@libc.imp \
   	$(EOLIST)
    
   #   
   # Any symbols exported to here
   #
   FILES_nlm_exports = \
  -	logio_module \
   	$(EOLIST)
   	
   #   
  
  
  
  1.1.2.1   +0 -0      httpd-2.0/modules/loggers/NWGNUforensic
  
  Index: NWGNUforensic
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/NWGNUforensic,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  
  
  
  1.1.2.1   +0 -0      httpd-2.0/modules/loggers/NWGNUmodlogio
  
  Index: NWGNUmodlogio
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/loggers/NWGNUmodlogio,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1