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:   30-Nov-2004 22:08:25
  Branch: HEAD                             Handle: 2004113021082401

  Modified files:
    openpkg-src/apache      apache.spec php.ini

  Log:
    add include paths to make sure PEAR and other extensions are found by
    default

  Summary:
    Revision    Changes     Path
    1.275       +2  -2      openpkg-src/apache/apache.spec
    1.2         +6  -0      openpkg-src/apache/php.ini
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/apache.spec
  ============================================================================
  $ cvs diff -u -r1.274 -r1.275 apache.spec
  --- openpkg-src/apache/apache.spec    18 Nov 2004 13:37:06 -0000      1.274
  +++ openpkg-src/apache/apache.spec    30 Nov 2004 21:08:24 -0000      1.275
  @@ -66,7 +66,7 @@
   Group:        Web
   License:      ASF
   Version:      %{V_apache}
  -Release:      20041118
  +Release:      20041130
   
   #   package options (suexec related)
   %option       with_suexec               yes
  @@ -1208,7 +1208,7 @@
   
       #   optionally make PHP happy
   %if "%{with_mod_php}" == "yes"
  -    %{l_shtool} install -c -m 644 \
  +    %{l_shtool} install -c -m 644 %{l_value -s -a} \
           %{SOURCE php.ini} $RPM_BUILD_ROOT%{l_prefix}/etc/apache/php.ini
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/php
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/php/build
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/apache/php.ini
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 php.ini
  --- openpkg-src/apache/php.ini        25 Aug 2004 16:11:06 -0000      1.1
  +++ openpkg-src/apache/php.ini        30 Nov 2004 21:08:25 -0000      1.2
  @@ -3,6 +3,8 @@
   ;;
   
   [PHP]
  +
  +;   Resource Limits
   register_globals   = off    ; Global variables are no longer registered for 
input data
   safe_mode          = on     ; Enable Safe Mode (file UID comparisons)
   safe_mode_gid      = off    ; Whether to relax Safe Mode to file GID 
comparisons
  @@ -13,3 +15,7 @@
   memory_limit       = 8M     ; Maximum amount of memory a script may consume
   post_max_size      = 8M     ; Maximum amount of POST data accepted
   
  +;   Include Paths
  +include_path          = ".:@l_prefix@/lib/php"
  +safe_mode_include_dir = "@l_prefix@/lib/php"
  +
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to