OpenPKG CVS Repository
http://www.openpkg.org/cvsweb/cvsweb.cgi
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Jul-2002 17:31:58
Branch: HEAD Handle: 2002072316315800
Modified files:
openpkg-src/apache apache.base apache.spec
Log:
PHP3 support doesn't make things better but nevertheless sometimes it is
required :-/
Summary:
Revision Changes Path
1.4 +5 -0 openpkg-src/apache/apache.base
1.72 +124 -8 openpkg-src/apache/apache.spec
____________________________________________________________________________
Index: openpkg-src/apache/apache.base
============================================================
$ cvs diff -u -r1.3 -r1.4 apache.base
--- openpkg-src/apache/apache.base 7 Feb 2002 14:20:54 -0000 1.3
+++ openpkg-src/apache/apache.base 23 Jul 2002 15:31:58 -0000 1.4
@@ -228,3 +228,8 @@
AddType application/x-httpd-php .php
</IfModule>
+# PHP3 support
+<IfModule mod_php3.c>
+ AddType application/x-httpd-php3 .php3
+</IfModule>
+
Index: openpkg-src/apache/apache.spec
============================================================
$ cvs diff -u -r1.71 -r1.72 apache.spec
--- openpkg-src/apache/apache.spec 22 Jul 2002 19:01:11 -0000 1.71
+++ openpkg-src/apache/apache.spec 23 Jul 2002 15:31:58 -0000 1.72
@@ -40,6 +40,7 @@
%{!?with_mod_ssl: %define with_mod_ssl no}
%{!?with_mod_perl: %define with_mod_perl no}
%{!?with_mod_php: %define with_mod_php no}
+%{!?with_mod_php3: %define with_mod_php3 no}
%{!?with_mod_dav: %define with_mod_dav no}
%{!?with_mod_layout: %define with_mod_layout no}
%{!?with_mod_macro: %define with_mod_macro no}
@@ -54,7 +55,7 @@
%{!?with_mod_roaming: %define with_mod_roaming no}
%{!?with_mod_relocate: %define with_mod_relocate no}
-# more optional settings
+# more optional PHP4 specific settings
# (requires "with_mod_php" set to "yes" above!)
%{!?with_mod_php_mysql: %define with_mod_php_mysql no}
%{!?with_mod_php_gd: %define with_mod_php_gd no}
@@ -76,25 +77,49 @@
%{!?with_mod_php_bc: %define with_mod_php_bc no}
%{!?with_mod_php_transsid: %define with_mod_php_transsid no}
+# more optional PHP3 specific settings
+# (requires "with_mod_php3" set to "yes" above!)
+%{!?with_mod_php3_ftp: %define with_mod_php3_ftp no}
+%{!?with_mod_php3_gd: %define with_mod_php3_gd no}
+%{!?with_mod_php3_jpeg: %define with_mod_php3_jpeg no}
+%{!?with_mod_php3_mysql: %define with_mod_php3_mysql no}
+%{!?with_mod_php3_openssl: %define with_mod_php3_openssl no}
+%{!?with_mod_php3_pdflib: %define with_mod_php3_pdflib no}
+%{!?with_mod_php3_zlib: %define with_mod_php3_zlib no}
+
# fixing implicit inter-module dependencies and correlations
%if "%{with_mod_php}" == "yes"
+%if "%{with_mod_php3}" == "yes"
+%{error: with_mod_php conflicts with with_mod_php3}
+# FIXME: error macro does not terminate execution
+exit 1
+%endif
%if "%{with_mod_ssl}" == "yes"
%define with_mod_php_openssl yes
%define with_mod_php_mm yes
%endif
-%if "%{with_mod_php_mysql}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
%define with_mod_php_zlib yes
%endif
%if "%{with_mod_php_freetype}" == "yes"
%define with_mod_php_gd yes
%endif
%endif
+%if "%{with_mod_php3}" == "yes"
+%if "%{with_mod_ssl}" == "yes"
+%define with_mod_php3_openssl yes
+%endif
+%if "%{with_mod_php3_mysql}" == "yes" || "%{with_mod_php3_pdflib}" == "yes"
+%define with_mod_php3_zlib yes
+%endif
+%endif
# package component versions
%define V_apache 1.3.26
%define V_mod_ssl 2.8.10-1.3.26
%define V_mod_perl 1.27
%define V_mod_php 4.2.2
+%define V_mod_php3 3.0.18
%define V_mod_dav 1.0.3-1.3.6
%define V_mod_layout 3.2
%define V_mod_macro 1.1.2
@@ -117,7 +142,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20020722
+Release: 20020723
# list of sources
Source0: http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -135,6 +160,7 @@
Source12:
http://download.sourceforge.net/accessreferer/mod_access_referer-%{V_mod_access_referer}.tar.gz
Source13: http://www.klomp.org/mod_roaming/mod_roaming-%{V_mod_roaming}.tar.gz
Source14:
http://software.tangent.org/download/mod_relocate-%{V_mod_relocate}.tar.gz
+Source15: http://www.php.net/distributions/php-%{V_mod_php3}.tar.gz
Source20: apache.conf
Source21: apache.base
Source22: apache.vhost
@@ -164,7 +190,7 @@
BuildPreReq: db
%endif
%if "%{with_mod_php_pdflib}" == "yes"
-BuildPreReq: pdflib, zlib
+BuildPreReq: pdflib
%endif
%if "%{with_mod_php_zlib}" == "yes"
BuildPreReq: zlib
@@ -200,6 +226,29 @@
BuildPreReq: expat
%endif
%endif
+
+%if "%{with_mod_php3}" == "yes"
+BuildPreReq: make, bison, flex
+%if "%{with_mod_php3_gd}" == "yes"
+BuildPreReq: gd
+%endif
+%if "%{with_mod_php3_jpeg}" == "yes"
+BuildPreReq: jpeg
+%endif
+%if "%{with_mod_php3_mysql}" == "yes"
+BuildPreReq: mysql
+%endif
+%if "%{with_mod_php3_openssl}" == "yes"
+BuildPreReq: openssl
+%endif
+%if "%{with_mod_php3_pdflib}" == "yes"
+BuildPreReq: pdflib
+%endif
+%if "%{with_mod_php3_zlib}" == "yes"
+BuildPreReq: zlib
+%endif
+%endif
+
%if "%{with_mod_auth_pam}" == "yes"
BuildPreReq: PAM
PreReq: PAM
@@ -219,7 +268,8 @@
project.
Options (additional modules I):
- with_mod_ssl=%{with_mod_ssl} with_mod_perl=%{with_mod_perl}
with_mod_php=%{with_mod_php}
+ with_mod_ssl=%{with_mod_ssl} with_mod_perl=%{with_mod_perl}
+ with_mod_php=%{with_mod_php} with_mod_php3=%{with_mod_php3}
with_mod_dav=%{with_mod_dav} with_mod_layout=%{with_mod_layout}
with_mod_macro=%{with_mod_macro}
Options (additional modules II):
@@ -236,6 +286,15 @@
with_mod_php_imap=%{with_mod_php_imap} with_mod_php_xml=%{with_mod_php_xml}
with_mod_php_bc=%{with_mod_php_bc}
+ Options (additional extensions for mod_php3):
+ with_mod_php3_ftp %{with_mod_php3_ftp}
+ with_mod_php3_gd %{with_mod_php3_gd}
+ with_mod_php3_jpeg %{with_mod_php3_jpeg}
+ with_mod_php3_mysql %{with_mod_php3_mysql}
+ with_mod_php3_openssl %{with_mod_php3_openssl}
+ with_mod_php3_pdflib %{with_mod_php3_pdflib}
+ with_mod_php3_zlib %{with_mod_php3_zlib}
+
%prep
# unpack Apache distribution
%setup0 -q -c
@@ -279,6 +338,9 @@
%if "%{with_mod_relocate}" == "yes"
%setup14 -q -T -D -a 14
%endif
+%if "%{with_mod_php3}" == "yes"
+ %setup15 -q -T -D -a 15
+%endif
%build
# prepare environment
@@ -295,8 +357,8 @@
)
%endif
- # optionally pre-configure Apache for mod_php and mod_dav
-%if "%{with_mod_php}" == "yes" || "%{with_mod_dav}" == "yes"
+ # optionally pre-configure Apache for mod_php, mod_php3 and mod_dav
+%if "%{with_mod_php}" == "yes" || "%{with_mod_php3}" == "yes" || "%{with_mod_dav}"
== "yes"
( cd apache_%{V_apache}
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ -388,7 +450,7 @@
%if "%{with_mod_php_db}" == "yes"
--with-db3=%{l_prefix} \
%endif
-%if "%{with_mod_php_zlib}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
+%if "%{with_mod_php_zlib}" == "yes"
--with-zlib=%{l_prefix} \
%endif
%if "%{with_mod_php_bzip2}" == "yes"
@@ -446,6 +508,57 @@
)
%endif
+ # optionally prepare mod_php3
+%if "%{with_mod_php3}" == "yes"
+ ( cd php-%{V_mod_php3}
+ CC="%{l_cc}" \
+%if "%{with_mod_ssl}" == "yes"
+ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include -DEAPI" \
+%else
+ CFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
+%endif
+ CPPFLAGS="%{l_cflags -O} -I%{l_prefix}/include" \
+ LDFLAGS="%{l_cflags -O} -L%{l_prefix}/lib" \
+ ./configure \
+ --prefix=%{l_prefix} \
+ --with-apache=../apache_%{V_apache} \
+ --with-config-file-path=%{l_prefix}/etc/apache \
+%if "%{with_mod_php3_ftp}" == "yes"
+ --with-ftp \
+%endif
+%if "%{with_mod_php3_mysql}" == "yes"
+ --with-mysql=%{l_prefix} \
+%endif
+%if "%{with_mod_php3_zlib}" == "yes"
+ --with-zlib=%{l_prefix} \
+%endif
+%if "%{with_mod_php3_pdflib}" == "yes"
+ --with-pdflib=%{l_prefix} \
+%endif
+%if "%{with_mod_php3_jpeg}" == "yes"
+ --with-jpeg=${prefix} \
+%endif
+%if "%{with_mod_php3_gd}" == "yes"
+ --with-gd=${prefix} \
+%endif
+%if "%{with_mod_php3_openssl}" == "yes"
+ --with-openssl=%{l_prefix} \
+%endif
+ --disable-shared \
+ --enable-track-vars
+# FIXME:
+# --enable-safe-mode
+# --with-exec-dir[=DIR]
+# --enable-magic-quotes
+# --enable-memory-limit
+# --enable-sysvsem
+# --enable-sysvshm
+ %{l_make} %{l_mflags}
+ %{l_make} %{l_mflags} install \
+ prefix=$RPM_BUILD_ROOT%{l_prefix}
+ )
+%endif
+
# optionally prepare mod_dav
%if "%{with_mod_dav}" == "yes"
( cd mod_dav-%{V_mod_dav}
@@ -583,6 +696,9 @@
%endif
%if "%{with_mod_php}" == "yes"
--activate-module=src/modules/php4/libphp4.a \
+%endif
+%if "%{with_mod_php3}" == "yes"
+ --activate-module=src/modules/php3/libphp3.a \
%endif
%if "%{with_mod_dav}" == "yes"
--activate-module=src/modules/dav/libdav.a \
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
