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: 27-Jun-2006 16:45:23
Branch: OPENPKG_2_STABLE Handle: 2006062715452200
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/apache apache.base apache.spec
Log:
MFC: latest fixes from CURRENT
Summary:
Revision Changes Path
1.16.2.1 +2 -2 openpkg-src/apache/apache.base
1.335.2.2 +3 -3 openpkg-src/apache/apache.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.base
============================================================================
$ cvs diff -u -r1.16 -r1.16.2.1 apache.base
--- openpkg-src/apache/apache.base 20 Nov 2005 13:41:01 -0000 1.16
+++ openpkg-src/apache/apache.base 27 Jun 2006 14:45:22 -0000 1.16.2.1
@@ -239,8 +239,8 @@
</Files>
</IfModule>
-# PHP4 support
-<IfModule mod_php4.c>
+# PHP5 support
+<IfModule mod_php5.c>
AddType application/x-httpd-php .php
</IfModule>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.335.2.1 -r1.335.2.2 apache.spec
--- openpkg-src/apache/apache.spec 20 Jun 2006 15:14:36 -0000
1.335.2.1
+++ openpkg-src/apache/apache.spec 27 Jun 2006 14:45:22 -0000
1.335.2.2
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 2.20060622
+Release: 2.20060627
# package options (suexec related)
%option with_suexec yes
@@ -103,7 +103,7 @@
%option with_mod_security no
%option with_mod_evasive no
-# package options (optional PHP4 specific settings; requires
"with_mod_php")
+# 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
%option with_mod_php_bc no
%option with_mod_php_bdb no
@@ -501,7 +501,7 @@
%setup -q -c
%patch -p0
%{l_shtool} subst \
- -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%s"}";g' \
+ -e 's;"Unix";"%{l_openpkg_release -F "OpenPKG/%%t"}";g' \
apache_%{V_apache}/src/os/unix/os.h
# unpack optional extension modules
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
