OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   13-Apr-2007 16:18:12
  Branch: HEAD                             Handle: 2007041315180603

  Modified files:
    openpkg-src/apache      apache.spec
    openpkg-src/apache-php4 apache-php4.spec

  Log:
    mod_zeus support

  Summary:
    Revision    Changes     Path
    1.19        +16 -1      openpkg-src/apache-php4/apache-php4.spec
    1.396       +16 -1      openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache-php4/apache-php4.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 apache-php4.spec
  --- openpkg-src/apache-php4/apache-php4.spec  12 Apr 2007 09:52:29 -0000      
1.18
  +++ openpkg-src/apache-php4/apache-php4.spec  13 Apr 2007 14:18:09 -0000      
1.19
  @@ -68,7 +68,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20070412
  +Release:      20070413
   
   #   package options (Apache core related)
   %option       with_hard_server_limit    256
  @@ -110,6 +110,8 @@
   %option       with_mod_roaming          no
   %option       with_mod_security         no
   %option       with_mod_throttle         no
  +%option       with_mod_zeus             no
  +%option       with_mod_zeus_header      X-Cluster-Client-Ip
   
   #   package options (optional PHP4 specific settings; requires 
"with_mod_php")
   #   please note the lack of an PEAR option since PEAR is provided by the 
'php' package
  @@ -230,6 +232,7 @@
   Source26:     rc.apache
   Source27:     apache.sh
   Source28:     php.ini
  +Source29:     http://knowledgehub.zeus.com/media/apache/mod_zeus.c
   Patch0:       apache-php4.patch
   Patch1:       apache-php4.patch.modowa
   Patch2:       
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
  @@ -1153,6 +1156,15 @@
       mv mod_auth_kerb-* apache_%{V_apache}/src/modules/mod_auth_kerb
   %endif
   
  +    #   optionally prepare mod_zeus
  +%if "%{with_mod_zeus}" == "yes"
  +    ( %{l_shtool} install -c -m 644 \
  +          -e 's;X-Cluster-Client-Ip;%{with_mod_zeus_header};g' \
  +          %{SOURCE mod_zeus.c} \
  +          apache_%{V_apache}/src/modules/extra/
  +    ) || exit $?
  +%endif
  +
       #   configure Apache
       ( cd apache_%{V_apache}
   %if "%{with_debug}" == "yes"
  @@ -1325,6 +1337,9 @@
             --disable-module=digest \
             --enable-module=auth_digest \
   %endif
  +%if "%{with_mod_zeus}" == "yes"
  +          --activate-module=src/modules/extra/mod_zeus.o \
  +%endif
             --enable-module=so
         %{l_make} %{l_mflags -O} build-quiet
       ) || exit $?
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.395 -r1.396 apache.spec
  --- openpkg-src/apache/apache.spec    12 Apr 2007 09:52:27 -0000      1.395
  +++ openpkg-src/apache/apache.spec    13 Apr 2007 14:18:06 -0000      1.396
  @@ -68,7 +68,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20070412
  +Release:      20070413
   
   #   package options (Apache core related)
   %option       with_hard_server_limit    256
  @@ -110,6 +110,8 @@
   %option       with_mod_roaming          no
   %option       with_mod_security         no
   %option       with_mod_throttle         no
  +%option       with_mod_zeus             no
  +%option       with_mod_zeus_header      X-Cluster-Client-Ip
   
   #   package options (optional PHP5 specific settings; requires 
"with_mod_php")
   #   please note the lack of an PEAR option since PEAR is provided by the 
'php' package
  @@ -235,6 +237,7 @@
   Source26:     rc.apache
   Source27:     apache.sh
   Source28:     php.ini
  +Source29:     http://knowledgehub.zeus.com/media/apache/mod_zeus.c
   Patch0:       apache.patch
   Patch1:       apache.patch.modowa
   Patch2:       
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
  @@ -1147,6 +1150,15 @@
       mv mod_auth_kerb-* apache_%{V_apache}/src/modules/mod_auth_kerb
   %endif
   
  +    #   optionally prepare mod_zeus
  +%if "%{with_mod_zeus}" == "yes"
  +    ( %{l_shtool} install -c -m 644 \
  +          -e 's;X-Cluster-Client-Ip;%{with_mod_zeus_header};g' \
  +          %{SOURCE mod_zeus.c} \
  +          apache_%{V_apache}/src/modules/extra/
  +    ) || exit $?
  +%endif
  +
       #   configure Apache
       ( cd apache_%{V_apache}
   %if "%{with_debug}" == "yes"
  @@ -1331,6 +1343,9 @@
             --disable-module=digest \
             --enable-module=auth_digest \
   %endif
  +%if "%{with_mod_zeus}" == "yes"
  +          --activate-module=src/modules/extra/mod_zeus.o \
  +%endif
             --enable-module=so
         %{l_make} %{l_mflags -O} build-quiet
       ) || exit $?
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to