Преглед изворни кода

finally kick-out this brain-dead mod_zmod stuff which always made headaches

Ralf S. Engelschall пре 23 година
родитељ
комит
398418d04f
2 измењених фајлова са 13 додато и 40 уклоњено
  1. 0 8
      apache/apache.base
  2. 13 32
      apache/apache.spec

+ 0 - 8
apache/apache.base

@@ -194,14 +194,6 @@ DefaultType text/plain
     BrowserMatch "JDK/1\.0"        force-response-1.0
 </IfModule>
 
-#   IVW access logging
-<IfModule mod_zmod.c>
-    ZModSubPath   /cgi-bin/ivw
-    ZModFormat    ZMODS
-    ZModLog       @l_prefix@/var/apache/log/zmod.log
-    #ZModFileBase @l_prefix@/share/apache/htdocs/ivw/pics
-</IfModule>
-
 #   SSL/TLS support
 <IfModule mod_ssl.c>
     SSLRandomSeed           startup builtin

+ 13 - 32
apache/apache.spec

@@ -48,7 +48,6 @@
 #   the additionally used Apache modules (you have to know what you do)
 %{!?with_mod_auth_pam:       %define  with_mod_auth_pam       no}
 %{!?with_mod_gzip:           %define  with_mod_gzip           no}
-%{!?with_mod_zmod:           %define  with_mod_zmod           no}
 %{!?with_mod_fastcgi:        %define  with_mod_fastcgi        no}
 %{!?with_mod_throttle:       %define  with_mod_throttle       no}
 %{!?with_mod_access_referer: %define  with_mod_access_referer no}
@@ -126,7 +125,6 @@ exit 1
 %define       V_mod_macro          1.1.2
 %define       V_mod_auth_pam       1.0a
 %define       V_mod_gzip           1.3.19.1a
-%define       V_mod_zmod           2_3
 %define       V_mod_fastcgi        2.2.12
 %define       V_mod_throttle       312
 %define       V_mod_access_referer 1.0.2
@@ -143,7 +141,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20021122
+Release:      20021129
 
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -155,13 +153,12 @@ Source5:      http://software.tangent.org/download/mod_layout-%{V_mod_layout}.ta
 Source6:      http://www.cri.ensmp.fr/~coelho/mod_macro/mod_macro-%{V_mod_macro}.tar.gz
 Source7:      http://pam.sourceforge.net/mod_auth_pam/dist/mod_auth_pam.tar.gz
 Source8:      http://www.remotecommunications.com/apache/mod_gzip/src/%{V_mod_gzip}/mod_gzip.c
-Source9:      http://www.ivw.de/???/src.apapi.FIN%{V_mod_zmod}.tar.gz
-Source10:     http://www.fastcgi.com/dist/mod_fastcgi-%{V_mod_fastcgi}.tar.gz
-Source11:     http://www.snert.com/Software/mod_throttle/mod_throttle%{V_mod_throttle}.tgz
-Source12:     http://download.sourceforge.net/accessreferer/mod_access_referer-%{V_mod_access_referer}.tar.gz
-Source13:     http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz
-Source14:     http://software.tangent.org/download/mod_relocate-%{V_mod_relocate}.tar.gz
-Source15:     http://www.php.net/distributions/php-%{V_mod_php3}.tar.gz
+Source9:      http://www.fastcgi.com/dist/mod_fastcgi-%{V_mod_fastcgi}.tar.gz
+Source10:     http://www.snert.com/Software/mod_throttle/mod_throttle%{V_mod_throttle}.tgz
+Source11:     http://download.sourceforge.net/accessreferer/mod_access_referer-%{V_mod_access_referer}.tar.gz
+Source12:     http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz
+Source13:     http://software.tangent.org/download/mod_relocate-%{V_mod_relocate}.tar.gz
+Source14:     http://www.php.net/distributions/php-%{V_mod_php3}.tar.gz
 Source20:     apache.conf
 Source21:     apache.base
 Source22:     apache.vhost
@@ -283,7 +280,6 @@ AutoReqProv:  no
     --define 'with_mod_relocate         %{with_mod_relocate}' \
     --define 'with_mod_roaming          %{with_mod_roaming}' \
     --define 'with_mod_throttle         %{with_mod_throttle}' \
-    --define 'with_mod_zmod             %{with_mod_zmod}' \
 
     Options (additional extensions for mod_php):
     --define 'with_mod_php_bzip2        %{with_mod_php_bzip2}' \
@@ -342,26 +338,23 @@ AutoReqProv:  no
 %if "%{with_mod_auth_pam}" == "yes"
     %setup7 -q -T -D -a 7
 %endif
-%if "%{with_mod_zmod}" == "yes"
-    %setup9 -q -T -D -a 9
-%endif
 %if "%{with_mod_fastcgi}" == "yes"
-    %setup10 -q -T -D -a 10
+    %setup9 -q -T -D -a 9
 %endif
 %if "%{with_mod_throttle}" == "yes"
-    %setup11 -q -T -D -a 11
+    %setup10 -q -T -D -a 10
 %endif
 %if "%{with_mod_access_referer}" == "yes"
-    %setup12 -q -T -D -a 12
+    %setup11 -q -T -D -a 11
 %endif
 %if "%{with_mod_roaming}" == "yes"
-    %setup13 -q -T -D -a 13
+    %setup12 -q -T -D -a 12
 %endif
 %if "%{with_mod_relocate}" == "yes"
-    %setup14 -q -T -D -a 14
+    %setup13 -q -T -D -a 13
 %endif
 %if "%{with_mod_php3}" == "yes"
-    %setup15 -q -T -D -a 15
+    %setup14 -q -T -D -a 14
 %endif
 
 %build
@@ -636,15 +629,6 @@ AutoReqProv:  no
     cp %{SOURCE mod_gzip.c} apache_%{V_apache}/src/modules/extra/
 %endif
 
-    #   optionally prepare mod_zmod
-%if "%{with_mod_zmod}" == "yes"
-    ( cd src
-      mkdir ../apache_%{V_apache}/src/modules/zmod
-      %{l_shtool} subst -e 's;"compat.h";"ap_compat.h";' modules/zmod/mod_zmod.c
-      cp modules/zmod/* ../apache_%{V_apache}/src/modules/zmod/
-    )
-%endif
-
     #   optionally prepare mod_fastcgi
 %if "%{with_mod_fastcgi}" == "yes"
     ( cd mod_fastcgi-%{V_mod_fastcgi}
@@ -747,9 +731,6 @@ AutoReqProv:  no
 %if "%{with_mod_gzip}" == "yes"
           --activate-module=src/modules/extra/mod_gzip.o \
 %endif
-%if "%{with_mod_zmod}" == "yes"
-          --activate-module=src/modules/zmod/libzmod.a \
-%endif
 %if "%{with_mod_fastcgi}" == "yes"
           --activate-module=src/modules/fastcgi/libfastcgi.a \
 %endif