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: 28-May-2006 14:28:23
Branch: HEAD Handle: 2006052813282200
Modified files:
openpkg-src/apache apache.spec
Removed files:
openpkg-src/apache apache.patch.php
Log:
upgrade embedded PHP from 4.4.2 to 5.1.4
Summary:
Revision Changes Path
1.6 +0 -62 openpkg-src/apache/apache.patch.php
1.332 +86 -92 openpkg-src/apache/apache.spec
____________________________________________________________________________
rm -f openpkg-src/apache/apache.patch.php <<'@@ .'
Index: openpkg-src/apache/apache.patch.php
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache/apache.spec
============================================================================
$ cvs diff -u -r1.331 -r1.332 apache.spec
--- openpkg-src/apache/apache.spec 24 May 2006 18:50:31 -0000 1.331
+++ openpkg-src/apache/apache.spec 28 May 2006 12:28:22 -0000 1.332
@@ -35,8 +35,8 @@
%define V_apache 1.3.36
%define V_mod_ssl 2.8.27-1.3.36
%define V_mod_perl 1.29
-%define V_mod_php 4.4.2
-%define V_mod_php_hardened 4.4.2-0.4.11
+%define V_mod_php 5.1.4
+%define V_mod_php_hardened 5.1.4-0.4.11
%define V_mod_dav 1.0.3-1.3.6
%define V_mod_layout 3.2.1
%define V_mod_macro 1.1.2
@@ -65,7 +65,7 @@
Group: Web
License: ASF
Version: %{V_apache}
-Release: 20060524
+Release: 20060528
# package options (suexec related)
%option with_suexec yes
@@ -104,48 +104,46 @@
# package options (optional PHP4 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_hardened no
-%option with_mod_php_calendar no
-%option with_mod_php_mssql no
-%option with_mod_php_mysql no
-%option with_mod_php_pgsql no
-%option with_mod_php_gd no
+%option with_mod_php_bc no
%option with_mod_php_bdb no
-%option with_mod_php_debug no
-%option with_mod_php_pdflib no
-%option with_mod_php_zlib no
%option with_mod_php_bzip2 no
-%option with_mod_php_ssl no
-%option with_mod_php_openldap no
-%option with_mod_php_openldapsasl no
-%option with_mod_php_mm no
-%option with_mod_php_pcre no
-%option with_mod_php_ftp no
-%option with_mod_php_java no
-%option with_mod_php_oci7 no
-%option with_mod_php_oci8 no
+%option with_mod_php_calendar no
+%option with_mod_php_crack no
+%option with_mod_php_curl no
+%option with_mod_php_debug no
+%option with_mod_php_dom no
+%option with_mod_php_exif no
%option with_mod_php_freetype no
-%option with_mod_php_t1lib no
+%option with_mod_php_ftp no
+%option with_mod_php_gd no
+%option with_mod_php_gdbm no
%option with_mod_php_gettext no
+%option with_mod_php_hardened no
+%option with_mod_php_iconv no
%option with_mod_php_imap no
-%option with_mod_php_xml no
-%option with_mod_php_dom no
-%option with_mod_php_bc no
-%option with_mod_php_transsid no
-%option with_mod_php_curl no
-%option with_mod_php_mhash no
-%option with_mod_php_mcrypt no
-%option with_mod_php_wddx no
-%option with_mod_php_gdbm no
-%option with_mod_php_versioning no
-%option with_mod_php_snmp no
-%option with_mod_php_odbc no
%option with_mod_php_mbregex no
%option with_mod_php_mbstring no
-%option with_mod_php_exif no
-%option with_mod_php_iconv no
+%option with_mod_php_mcrypt no
+%option with_mod_php_mhash no
+%option with_mod_php_mm no
+%option with_mod_php_mssql no
+%option with_mod_php_mysql no
+%option with_mod_php_oci8 no
+%option with_mod_php_odbc no
+%option with_mod_php_openldap no
+%option with_mod_php_openldapsasl no
+%option with_mod_php_pcre no
+%option with_mod_php_pgsql no
%option with_mod_php_sendmail no
-%option with_mod_php_crack no
+%option with_mod_php_snmp no
+%option with_mod_php_sqlite no
+%option with_mod_php_ssl no
+%option with_mod_php_t1lib no
+%option with_mod_php_versioning no
+%option with_mod_php_wddx no
+%option with_mod_php_xml no
+%option with_mod_php_xslt no
+%option with_mod_php_zlib no
# package options (braindead ones only)
%option with_gdbm_ndbm yes
@@ -167,7 +165,7 @@
%undefine with_mod_php_gd
%define with_mod_php_gd yes
%endif
-%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_pdflib}" == "yes" ||
"%{with_mod_php_gd}" == "yes" || "%{with_mod_php_dom}" == "yes"
+%if "%{with_mod_php_mysql}" == "yes" || "%{with_mod_php_gd}" == "yes" ||
"%{with_mod_php_dom}" == "yes"
%undefine with_mod_php_zlib
%define with_mod_php_zlib yes
%endif
@@ -211,9 +209,8 @@
Source26: php.ini
Patch0: apache.patch
Patch1: apache.patch.modowa
-Patch2: apache.patch.php
-Patch3:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
-Patch4: apache.patch.suphp
+Patch2:
http://www.hardened-php.net/hardening-patch-%{V_mod_php_hardened}.patch.gz
+Patch3: apache.patch.suphp
# build information
Prefix: %{l_prefix}
@@ -238,6 +235,10 @@
BuildPreReq: freetds, libiconv
PreReq: freetds, libiconv
%endif
+%if "%{with_mod_php_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
%if "%{with_mod_php_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -254,10 +255,6 @@
BuildPreReq: db
PreReq: db
%endif
-%if "%{with_mod_php_pdflib}" == "yes"
-BuildPreReq: pdflib, jpeg, png
-PreReq: pdflib, jpeg, png
-%endif
%if "%{with_mod_php_zlib}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@@ -289,10 +286,6 @@
BuildPreReq: pcre
PreReq: pcre
%endif
-%if "%{with_mod_php_java}" == "yes"
-BuildPreReq: j2se
-PreReq: j2se
-%endif
%if "%{with_mod_php_freetype}" == "yes"
BuildPreReq: freetype
PreReq: freetype
@@ -309,10 +302,18 @@
BuildPreReq: imap, openssl
PreReq: imap, openssl
%endif
-%if "%{with_mod_dav}" == "yes" || "%{with_mod_php_xml}" == "yes"
+%if "%{with_mod_dav}" == "yes"
BuildPreReq: expat
PreReq: expat
%endif
+%if "%{with_mod_php_xml}" == "yes"
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_mod_php_xslt}" == "yes"
+BuildPreReq: libxslt
+PreReq: libxslt
+%endif
%if "%{with_mod_php_dom}" == "yes"
BuildPreReq: libxml, libxslt
PreReq: libxml, libxslt
@@ -333,7 +334,7 @@
BuildPreReq: gdbm
PreReq: gdbm
%endif
-%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+%if "%{with_mod_php_oci8}" == "yes"
BuildPreReq: oracle
%endif
%if "%{with_mod_php_snmp}" == "yes"
@@ -447,12 +448,12 @@
prog apache:mod_php = {
version = %{V_mod_php}
url = http://www.php.net/downloads.php
- regex = php-(4\.\d+\.\d+)\.tar\.gz
+ regex = php-(5\.\d+\.\d+)\.tar\.gz
}
prog apache:mod_php_hardened = {
version = %{V_mod_php_hardened}
url = http://www.hardened-php.net/downloads.13.html
- regex = hardening-patch-(4\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
+ regex = hardening-patch-(5\.\d+\.\d+-\d+(\.\d+)+)\.patch\.gz
}
prog apache:mod_relocate = {
version = %{V_mod_relocate}
@@ -523,9 +524,8 @@
-e 's;^typedef short SHORT\;;;' \
ext/mssql/php_mssql.h
%endif
- %patch -p0 -P 2
%if "%{with_mod_php_hardened}" == "yes"
- %patch -p1 -P 3
+ %patch -p0 -P 2
%endif
) || exit $?
%endif
@@ -570,7 +570,7 @@
%endif
%if "%{with_suphp}" == "yes"
%setup -q -T -D -a 17
- %patch -p0 -d suphp-%{V_suphp} -P 4
+ %patch -p0 -d suphp-%{V_suphp} -P 3
%endif
%if "%{with_mod_security}" == "yes"
%setup -q -T -D -a 18
@@ -679,7 +679,7 @@
%if "%{with_mod_ssl}" == "yes"
CFLAGS="$CFLAGS -DEAPI"
%endif
-%if "%{with_mod_php_gd}" == "yes" || "%{with_mod_php_pdflib}" == "yes"
+%if "%{with_mod_php_gd}" == "yes"
LIBS="$LIBS -lpng -lz"
%endif
%if "%{with_mod_php_gettext}" == "yes" || "%{with_mod_php_mssql}" == "yes"
@@ -694,17 +694,9 @@
%if "%{with_mod_php_bdb}" == "yes"
LIBS="$LIBS -ldb"
%endif
-%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+%if "%{with_mod_php_oci8}" == "yes"
ORACLE_HOME="`%{l_rc} --query oracle_home`"
export ORACLE_HOME
- oracle_libdir="`%{l_rc} --query oracle_libdir`"
- case "$oracle_libdir" in
- */lib32 )
- %{l_shtool} subst \
- -e 's;OCI8_DIR/lib;OCI8_DIR/lib32;' \
- configure
- ;;
- esac
%endif
%if "%{with_mod_php_sendmail}" == "yes"
PROG_SENDMAIL="%{l_prefix}/sbin/sendmail" \
@@ -716,6 +708,8 @@
--prefix=%{l_prefix} \
--with-apache=../apache_%{V_apache} \
--with-config-file-path=%{l_prefix}/etc/apache \
+ --disable-all \
+ --enable-pdo \
%if "%{with_mod_php_mbregex}" == "yes"
--enable-mbregex \
%endif
@@ -725,8 +719,15 @@
%if "%{with_mod_php_calendar}" == "yes"
--enable-calendar \
%endif
+%if "%{with_mod_php_sqlite}" == "yes"
+ --with-sqlite=%{l_prefix} \
+ --with-pdo-sqlite=%{l_prefix} \
+%else
+ --without-sqlite \
+%endif
%if "%{with_mod_php_mssql}" == "yes"
--with-mssql=%{l_prefix} \
+ --with-pdo-mysql=%{l_prefix} \
%else
--without-mssql \
%endif
@@ -737,6 +738,7 @@
%endif
%if "%{with_mod_php_pgsql}" == "yes"
--with-pgsql=%{l_prefix} \
+ --with-pdo-pgsql=%{l_prefix} \
%else
--without-pgsql \
%endif
@@ -746,7 +748,6 @@
--with-png-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_freetype}" == "yes"
- --enable-gd-imgstrttf \
--enable-gd-native-ttf \
--with-freetype-dir=%{l_prefix} \
%endif
@@ -768,11 +769,6 @@
%if "%{with_mod_php_bzip2}" == "yes"
--with-bz2=%{l_prefix} \
%endif
-%if "%{with_mod_php_pdflib}" == "yes"
- --with-pdflib=%{l_prefix} \
- --with-jpeg-dir=%{l_prefix} \
- --with-png-dir=%{l_prefix} \
-%endif
%if "%{with_mod_php_ssl}" == "yes" || "%{with_mod_php_openldap}" == "yes"
--with-openssl=%{l_prefix} \
%endif
@@ -784,20 +780,13 @@
--enable-session \
%endif
%if "%{with_mod_php_pcre}" == "yes"
- --with-pcre=%{l_prefix} \
+ --with-pcre-regex=%{l_prefix} \
%endif
%if "%{with_mod_php_ftp}" == "yes"
--enable-ftp \
%endif
-%if "%{with_mod_php_java}" == "yes"
- --with-java=%{l_prefix}/libexec/j2se \
-%endif
-%if "%{with_mod_php_oci7}" == "yes"
- --with-oracle \
-%endif
%if "%{with_mod_php_oci8}" == "yes"
--with-oci8 \
- --enable-sigchld \
%endif
%if "%{with_mod_php_gettext}" == "yes"
--with-gettext=%{l_prefix} \
@@ -808,14 +797,21 @@
%endif
%if "%{with_mod_php_xml}" == "yes"
--enable-xml \
- --with-expat-dir=%{l_prefix} \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
%else
--disable-xml \
%endif
+%if "%{with_mod_php_xslt}" == "yes"
+ --with-xsl=%{l_prefix} \
+%else
+ --without-xsl \
+%endif
%if "%{with_mod_php_dom}" == "yes"
- --with-dom=%{l_prefix} \
- --with-dom-xslt=%{l_prefix} \
- --with-dom-exslt=%{l_prefix} \
+ --enable-dom \
+ --with-libxml-dir=%{l_prefix} \
+%else
+ --disable-dom \
%endif
%if "%{with_mod_php_wddx}" == "yes"
--enable-wddx \
@@ -823,9 +819,6 @@
%if "%{with_mod_php_bc}" == "yes"
--enable-bcmath \
%endif
-%if "%{with_mod_php_transsid}" == "yes"
- --enable-trans-sid \
-%endif
%if "%{with_mod_php_mhash}" == "yes"
--with-mhash=%{l_prefix} \
%endif
@@ -843,9 +836,11 @@
%endif
%if "%{with_mod_php_odbc}" == "yes"
--with-unixODBC=%{l_prefix} \
+ --with-pdo-odbc=unixODBC,%{l_prefix} \
%endif
%if "%{with_mod_php_snmp}" == "yes"
--with-snmp=%{l_prefix} \
+ --with-openssl-dir=%{l_prefix} \
%endif
%if "%{with_mod_php_exif}" == "yes"
--with-exif \
@@ -859,8 +854,7 @@
--disable-cli \
--without-pear \
--disable-shared \
- --enable-inline-optimization \
- --enable-track-vars
+ --enable-inline-optimization
%{l_make} %{l_mflags}
%{l_make} %{l_mflags} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
@@ -1075,14 +1069,14 @@
ldflags="$ldflags %{l_ldflags}"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_mod_php_oci7}" == "yes" || "%{with_mod_php_oci8}" == "yes"
+%if "%{with_mod_php_oci8}" == "yes"
# workaround Oracle inter-library depencency by explicitly
# linking in all libraries
ldflags="$ldflags `%{l_rc} --query oracle_ldflags`"
libs="$libs `%{l_rc} --query oracle_libs`"
%endif
%if "%{with_mod_php}" == "yes" && "%{with_mod_php_imap}" == "yes"
- libs="$libs -limap -lmodphp4 -limap"
+ libs="$libs -limap -lmodphp5 -limap"
%endif
%if "%{with_suphp}" == "yes"
cflags="$cflags -DSUPHP_PATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
@@ -1124,7 +1118,7 @@
--activate-module=src/modules/perl/libperl.a \
%endif
%if "%{with_mod_php}" == "yes"
- --activate-module=src/modules/php4/libphp4.a \
+ --activate-module=src/modules/php5/libphp5.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]
