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 11:45:58
Branch: HEAD Handle: 2006052810455601
Modified files:
openpkg-src/php php.spec
Removed files:
openpkg-src/php php.patch
Log:
upgrade stand-alone PHP from 4.4.2 to 5.1.4
Summary:
Revision Changes Path
1.13 +0 -92 openpkg-src/php/php.patch
1.123 +82 -97 openpkg-src/php/php.spec
____________________________________________________________________________
rm -f openpkg-src/php/php.patch <<'@@ .'
Index: openpkg-src/php/php.patch
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.122 -r1.123 php.spec
--- openpkg-src/php/php.spec 14 May 2006 07:44:00 -0000 1.122
+++ openpkg-src/php/php.spec 28 May 2006 09:45:57 -0000 1.123
@@ -22,9 +22,9 @@
## SUCH DAMAGE.
##
-# package component versions
-%define V_php 4.4.2
-%define V_php_hardened 4.4.2-0.4.11
+# package versions
+%define V_php 5.1.4
+%define V_php_hardened 5.1.4-0.4.11
# package information
Name: php
@@ -37,61 +37,60 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20060514
+Release: 20060528
# package options
-%option with_bc no
+%option with_calendar no
+%option with_sqlite no
+%option with_mysql no
+%option with_pgsql no
+%option with_gd no
%option with_bdb no
+%option with_zlib no
%option with_bzip2 no
-%option with_calendar no
-%option with_curl no
-%option with_debug no
-%option with_dom no
-%option with_exif no
+%option with_ssl no
+%option with_openldap no
+%option with_openldapsasl no
+%option with_mm no
+%option with_pcre no
+%option with_ftp no
+%option with_oci8 no
%option with_fastcgi no
%option with_freetype no
-%option with_ftp no
-%option with_gdbm no
-%option with_gd no
%option with_gettext no
%option with_hardened no
-%option with_iconv no
%option with_imap no
-%option with_java no
-%option with_mbregex no
-%option with_mbstring no
-%option with_mcrypt no
+%option with_xml no
+%option with_xslt no
+%option with_dom no
+%option with_bc no
+%option with_curl no
%option with_mhash no
-%option with_mm no
-%option with_mysql no
-%option with_oci7 no
-%option with_oci8 no
+%option with_mcrypt no
+%option with_wddx no
+%option with_gdbm no
+%option with_versioning no
+%option with_snmp no
%option with_odbc no
-%option with_openldap no
-%option with_openldapsasl no
-%option with_pcre no
-%option with_pdflib no
-%option with_pear no
-%option with_pgsql no
+%option with_mbregex no
+%option with_mbstring no
+%option with_exif no
+%option with_iconv no
%option with_sendmail no
-%option with_snmp no
-%option with_ssl no
-%option with_transsid no
-%option with_versioning no
-%option with_wddx no
-%option with_xml no
-%option with_zlib no
+%option with_pear no
# fixing implicit extension dependencies and correlations
%if "%{with_pear}" == "yes"
%undefine with_xml
%define with_xml yes
+%undefine with_pcre
+%define with_pcre yes
%endif
%if "%{with_freetype}" == "yes"
%undefine with_gd
%define with_gd yes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_pdflib}" ==
"yes" || "%{with_dom}" == "yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -104,13 +103,16 @@
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: php.ini
Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
-Patch1: php.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, sed, flex, bison
-PreReq: OpenPKG, openpkg >= 20050615
+BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
+PreReq: OpenPKG, openpkg >= 20050615, MTA
+%if "%{with_sqlite}" == "yes"
+BuildPreReq: sqlite
+PreReq: sqlite
+%endif
%if "%{with_mysql}" == "yes"
BuildPreReq: mysql
PreReq: mysql
@@ -127,10 +129,6 @@
BuildPreReq: db
PreReq: db
%endif
-%if "%{with_pdflib}" == "yes"
-BuildPreReq: pdflib, jpeg, png
-PreReq: pdflib, jpeg, png
-%endif
%if "%{with_zlib}" == "yes"
BuildPreReq: zlib
PreReq: zlib
@@ -162,10 +160,6 @@
BuildPreReq: pcre
PreReq: pcre
%endif
-%if "%{with_java}" == "yes"
-BuildPreReq: j2se
-PreReq: j2se
-%endif
%if "%{with_freetype}" == "yes"
BuildPreReq: freetype
PreReq: freetype
@@ -183,8 +177,12 @@
PreReq: imap, openssl
%endif
%if "%{with_xml}" == "yes"
-BuildPreReq: expat
-PreReq: expat
+BuildPreReq: libxml
+PreReq: libxml
+%endif
+%if "%{with_xslt}" == "yes"
+BuildPreReq: libxslt
+PreReq: libxslt
%endif
%if "%{with_dom}" == "yes"
BuildPreReq: libxml, libxslt
@@ -206,7 +204,7 @@
BuildPreReq: gdbm, gdbm::with_ndbm = yes
PreReq: gdbm, gdbm::with_ndbm = yes
%endif
-%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
+%if "%{with_oci8}" == "yes"
BuildPreReq: oracle
PreReq: oracle
%endif
@@ -241,27 +239,23 @@
prog php = {
version = %{V_php}
url = http://www.php.net/downloads.php
- regex = php-(4\.\d+\.\d+)\.tar\.gz
+ regex = php-(5.\d+\.\d+)\.tar\.gz
}
prog php:hardened = {
version = %{V_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
}
%prep
%setup -q
+%if "%{with_hardened}" == "yes"
+ %patch -p1
+%endif
%{l_shtool} subst \
-e 's;\(/include\)/freetype2;\1;' \
configure \
ext/gd/config.m4
-%if "%{with_hardened}" == "yes"
- %patch -p1 -P 0
-%endif
- %patch -p0 -P 1
- %{l_shtool} subst \
- %{l_value -s l_prefix l_rpm l_rpmtool} \
- scripts/phpize.in
%build
# configure package
@@ -272,7 +266,7 @@
%if "%{with_gdbm}" == "yes"
libs="$libs -lndbm -lgdbm"
%endif
-%if "%{with_gd}" == "yes" || "%{with_pdflib}" == "yes"
+%if "%{with_gd}" == "yes"
libs="$libs -lpng -lz"
%endif
%if "%{with_gettext}" == "yes"
@@ -287,17 +281,9 @@
%if "%{with_bdb}" == "yes"
libs="$libs -ldb"
%endif
-%if "%{with_oci7}" == "yes" || "%{with_oci8}" == "yes"
+%if "%{with_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
CC="%{l_cc}" \
CFLAGS="$cflags" \
@@ -313,16 +299,27 @@
--prefix=%{l_prefix} \
--sysconfdir=%{l_prefix}/etc/php \
--with-config-file-path=%{l_prefix}/etc/php \
+ --libdir=%{l_prefix}/lib/php \
+ --disable-all \
+ --enable-pdo \
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
+%if "%{with_sqlite}" == "yes"
+ --with-sqlite=%{l_prefix} \
+ --with-pdo-sqlite=%{l_prefix} \
+%else
+ --without-sqlite \
+%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+ --with-pdo-mysql=%{l_prefix} \
%else
--without-mysql \
%endif
%if "%{with_pgsql}" == "yes"
--with-pgsql=%{l_prefix} \
+ --with-pdo-pgsql=%{l_prefix} \
%else
--without-pgsql \
%endif
@@ -337,18 +334,12 @@
--disable-fastcgi \
%endif
%if "%{with_freetype}" == "yes"
- --enable-gd-imgstrttf \
--enable-gd-native-ttf \
--with-freetype-dir=%{l_prefix} \
%endif
%if "%{with_bdb}" == "yes"
--with-db4=%{l_prefix} \
%endif
-%if "%{with_debug}" == "yes"
- --with-debug=yes \
-%else
- --with-debug=no \
-%endif
%if "%{with_zlib}" == "yes"
--with-zlib=%{l_prefix} \
--with-zlib-dir=%{l_prefix} \
@@ -356,11 +347,6 @@
%if "%{with_bzip2}" == "yes"
--with-bz2=%{l_prefix} \
%endif
-%if "%{with_pdflib}" == "yes"
- --with-pdflib=%{l_prefix} \
- --with-jpeg-dir=%{l_prefix} \
- --with-png-dir=%{l_prefix} \
-%endif
%if "%{with_ssl}" == "yes" || "%{with_openldap}" == "yes"
--with-openssl=%{l_prefix} \
%endif
@@ -372,20 +358,13 @@
--enable-session \
%endif
%if "%{with_pcre}" == "yes"
- --with-pcre=%{l_prefix} \
+ --with-pcre-regex=%{l_prefix} \
%endif
%if "%{with_ftp}" == "yes"
--enable-ftp \
%endif
-%if "%{with_java}" == "yes"
- --with-java=%{l_prefix}/libexec/j2se \
-%endif
-%if "%{with_oci7}" == "yes"
- --with-oracle \
-%endif
%if "%{with_oci8}" == "yes"
--with-oci8 \
- --enable-sigchld \
%endif
%if "%{with_gettext}" == "yes"
--with-gettext=%{l_prefix} \
@@ -396,14 +375,21 @@
%endif
%if "%{with_xml}" == "yes"
--enable-xml \
- --with-expat-dir=%{l_prefix} \
+ --enable-libxml \
+ --with-libxml-dir=%{l_prefix} \
%else
--disable-xml \
%endif
+%if "%{with_xslt}" == "yes"
+ --with-xsl=%{l_prefix} \
+%else
+ --without-xsl \
+%endif
%if "%{with_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_wddx}" == "yes"
--enable-wddx \
@@ -411,9 +397,6 @@
%if "%{with_bc}" == "yes"
--enable-bcmath \
%endif
-%if "%{with_transsid}" == "yes"
- --enable-trans-sid \
-%endif
%if "%{with_mhash}" == "yes"
--with-mhash=%{l_prefix} \
%endif
@@ -430,15 +413,17 @@
--enable-versioning \
%endif
%if "%{with_pear}" == "yes"
- --with-pear \
+ --with-pear=%{l_prefix}/lib/php \
%else
--without-pear \
%endif
%if "%{with_snmp}" == "yes"
--with-snmp=%{l_prefix} \
+ --with-openssl-dir=%{l_prefix} \
%endif
%if "%{with_odbc}" == "yes"
--with-unixODBC=%{l_prefix} \
+ --with-pdo-odbc=unixODBC,%{l_prefix} \
%endif
%if "%{with_mbregex}" == "yes"
--enable-mbregex \
@@ -456,7 +441,6 @@
--enable-cgi \
--enable-force-cgi-redirect \
--enable-discard-path \
- --enable-track-vars \
--enable-memory-limit
# build package
@@ -490,6 +474,7 @@
%{SOURCE php.ini} $RPM_BUILD_ROOT%{l_prefix}/etc/php/
# strip down installation
+ rmdir $RPM_BUILD_ROOT%{l_prefix}/lib/php >/dev/null 2>&1 || true
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
# determine installation files
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
