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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   12-Feb-2004 20:03:47
  Branch: HEAD                             Handle: 2004021219034700

  Modified files:
    openpkg-src/apache      apache.spec

  Log:
    - add optional support for mod_security
    - add optional support for mod_dosevasive
    - fix PHP's MTA dependency again
    
    Submitted by: Julien TOUCHE <[EMAIL PROTECTED]>

  Summary:
    Revision    Changes     Path
    1.210       +42 -1      openpkg-src/apache/apache.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.209 -r1.210 apache.spec
  --- openpkg-src/apache/apache.spec    12 Feb 2004 08:20:25 -0000      1.209
  +++ openpkg-src/apache/apache.spec    12 Feb 2004 19:03:47 -0000      1.210
  @@ -49,6 +49,8 @@
   %define       V_mod_access_referer 1.0.2
   %define       V_mod_roaming        1.0.2
   %define       V_mod_relocate       1.0
  +%define       V_mod_security       1.7.4
  +%define       V_mod_dosevasive     1.9
   %define       V_suphp              0.5
   
   #   package information
  @@ -92,6 +94,8 @@
   %option       with_mod_access_referer   no
   %option       with_mod_roaming          no
   %option       with_mod_relocate         no
  +%option       with_mod_security         yes
  +%option       with_mod_dosevasive       yes
   
   #   package options (optional PHP4 specific settings; requires "with_mod_php")
   %option       with_mod_php_calendar     no
  @@ -185,6 +189,8 @@
   Source14:     
http://www.muquit.com/muquit/software/mod_auth_ldap/mod_auth_ldap.tar.gz
   Source15:     http://www.suphp.org/download/suphp-%{V_suphp}.tar.gz
   Source16:     
http://osdn.dl.sourceforge.net/sourceforge/modauthmysql/mod_auth_mysql.tgz
  +Source17:     
http://www.modsecurity.org/download/mod_security-%{V_mod_security}.tar.gz
  +Source18:     
http://www.nuclearelephant.com/projects/dosevasive/mod_dosevasive.%{V_mod_dosevasive}.tar.gz
   Source20:     apache.conf
   Source21:     apache.base
   Source22:     apache.vhost
  @@ -208,7 +214,6 @@
   %endif
   %if "%{with_mod_php}" == "yes"
   BuildPreReq:  gcc, sed, flex, bison
  -PreReq:       MTA
   %if "%{with_mod_php_mysql}" == "yes"
   BuildPreReq:  mysql
   PreReq:       mysql
  @@ -423,6 +428,16 @@
           url       = http://www.suphp.org/Download.html
           regex     = suphp-(__VER__).tar.gz
       }
  +    prog apache:mod_security = {
  +        version   = %{V_mod_security}
  +        url       = http://www.modsecurity.org/download/
  +        regex     = mod_security-(__VER__).tar.gz
  +    }
  +    prog apache:mod_dosevasive = {
  +        version   = %{V_mod_dosevasive}
  +        url       = http://www.nuclearelephant.com/projects/dosevasive/
  +        regex     = mod_dosevasive.(__VER__).tar.gz
  +    }
   
   %prep
       #   unpack Apache distribution
  @@ -482,6 +497,12 @@
   %if "%{with_mod_auth_mysql}" == "yes"
       %setup -q -T -D -a 16
   %endif
  +%if "%{with_mod_security}" == "yes"
  +    %setup -q -T -D -a 17
  +%endif
  +%if "%{with_mod_dosevasive}" == "yes"
  +    %setup -q -T -D -a 18
  +%endif
   
   %build
       #   prepare environment
  @@ -873,6 +894,20 @@
       ) || exit $?
   %endif
   
  +    #   optionally prepare mod_security
  +%if "%{with_mod_security}" == "yes"
  +    ( cd mod_security-%{V_mod_security}/apache1
  +      cp mod_security.c ../../apache_%{V_apache}/src/modules/extra/
  +    ) || exit $?
  +%endif
  +
  +    #   optionally prepare mod_dosevasive
  +%if "%{with_mod_dosevasive}" == "yes"
  +    ( cd mod_dosevasive
  +      cp mod_dosevasive.c ../apache_%{V_apache}/src/modules/extra/
  +    ) || exit $?
  +%endif
  +
       #   configure Apache
       ( cd apache_%{V_apache}
   %if "%{with_debug}" == "yes"
  @@ -1007,6 +1042,12 @@
   %endif
   %if "%{with_suphp}" == "yes"
             --activate-module=src/modules/extra/mod_suphp.o \
  +%endif
  +%if "%{with_mod_security}" == "yes"
  +          --activate-module=src/modules/extra/mod_security.o \
  +%endif
  +%if "%{with_mod_dosevasive}" == "yes"
  +          --activate-module=src/modules/extra/mod_dosevasive.o \
   %endif
             --enable-module=so
         %{l_make} %{l_mflags -O} build-quiet
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to