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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   29-May-2007 11:44:36
  Branch: HEAD                             Handle: 2007052910443500

  Modified files:
    openpkg-src/apache2     apache2.spec

  Log:
    allow one to try out the experimental 'event' MPM

  Summary:
    Revision    Changes     Path
    1.85        +7  -6      openpkg-src/apache2/apache2.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache2/apache2.spec
  ============================================================================
  $ cvs diff -u -r1.84 -r1.85 apache2.spec
  --- openpkg-src/apache2/apache2.spec  10 Jan 2007 18:55:01 -0000      1.84
  +++ openpkg-src/apache2/apache2.spec  29 May 2007 09:44:35 -0000      1.85
  @@ -39,7 +39,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20070110
  +Release:      20070529
   
   #   package options (generic)
   %option       with_mpm                  prefork
  @@ -131,11 +131,12 @@
   
   %prep
       #   some pre-flight checks on options specified
  -%if "%{with_mpm}" != "prefork" && "%{with_mpm}" != "worker"
  +%if "%{with_mpm}" != "prefork" && "%{with_mpm}" != "worker" && "%{with_mpm}" 
!= "event"
       ( echo "Invalid value specified for option 'with_mpm'. Currently the"
         echo "only supported Multi-Processing Modules (MPMs) are ..."
         echo "- 'prefork' -- non-threaded, pre-forking web server (default)"
         echo "- 'worker'  -- hybrid multi-threaded multi-process web server"
  +      echo "- 'event'   -- event-based I/O multiplexing web server"
       ) | %{l_rpmtool} msg -b -t error
       exit 1
   %endif
  @@ -193,7 +194,7 @@
         case "%{l_platform -t}" in
             *-sunos* ) LIBS="$LIBS -lrt" ;;
         esac
  -%if "%{with_mpm}" == "worker" || "%{with_mod_memcache}" == "yes"
  +%if "%{with_mpm}" == "worker" || "%{with_mpm}" == "event" || 
"%{with_mod_memcache}" == "yes"
         THREADS="--enable-threads"
   %else
         THREADS="--disable-threads"
  @@ -278,9 +279,9 @@
         #   setting might affect package dependencies, therefore fallbacks
         #   are not acceptable
         if ! grep '^MPM_NAME = %{with_mpm}$' build/config_vars.mk >/dev/null 
2>&1; then
  -          ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested 
using the 'with_mpm'"
  -            echo "option doesn't seem to be available on this particular 
platform."
  -            echo "Please check corresponding 'config.log' for details."
  +          ( echo "The Multi-Processing Module (MPM) '%{with_mpm}' requested 
using the"
  +            echo "'with_mpm' option doesn't seem to be available on this 
particular"
  +            echo "platform. Please check corresponding 'config.log' for 
details."
             ) | %{l_rpmtool} msg -b -t error
             exit 1
         fi
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to