SPECS (DEVEL): php.spec - update to snap 2009.02.24 15:30 (beta2 status) - ...
zergin
zergin at pld-linux.org
Tue Feb 24 19:21:57 CET 2009
Author: zergin Date: Tue Feb 24 18:21:56 2009 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- update to snap 2009.02.24 15:30 (beta2 status)
- update zend_module_api to 20090115
- update zend_extension_api to 220090115
- remove unrecognized configure options:
--with-apache-version, --enable-memory-limit, --with-inifile,
--with-flatfile, --enable-gd-jus-conf, --enable-track-vars,
--enable-trans-sid, --with-expat-dir, --without-sablot-js,
--with-tiff-dir
--enable-reflection
--enable-fastcgi, --with-fastcgi, --enable-force-cgi-redirect
(fastcgi and reflection are always enabled)
- drop gcc2 patch (gcc2 and php 5.3? please... and it would require maintaing
php 5.3+ branch as it doesn't apply to current sources)
- drop hardening patch and bcond: unavailable for php 5.3 and dropped on MAIN
- drop versioning patch and bcond: unmaintained
- preserve ORACLE_HOME env var if oci8 bcond is on (from MAIN)
- add php-use-prog_sendmail.patch (from MAIN)
- still doesn't build with sybase_ct
---- Files affected:
SPECS:
php.spec (1.688.2.19 -> 1.688.2.20)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.688.2.19 SPECS/php.spec:1.688.2.20
--- SPECS/php.spec:1.688.2.19 Mon Dec 29 20:52:27 2008
+++ SPECS/php.spec Tue Feb 24 19:21:50 2009
@@ -17,7 +17,6 @@
#
# Conditional build:
%bcond_with fdf # with FDF (PDF forms) module (BR: proprietary lib)
-%bcond_with hardening # build with hardening patch applied (http://www.hardened-php.net/)
%bcond_with interbase_inst # use InterBase install., not Firebird (BR: proprietary libs)
%bcond_with oci8 # with Oracle oci8 extension module (BR: proprietary libs)
%bcond_without curl # without CURL extension module
@@ -45,7 +44,6 @@
%bcond_without fcgi # disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
%bcond_with tests # default off; test process very often hangs on buildersl; perform "make test"
-%bcond_with versioning # build with experimental versioning (to load php4/php5 into same apache)
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
@@ -65,7 +63,7 @@
%endif
%define _rel 0.18
-%define _snap 200812271530
+%define _snap 200902241530
Summary: PHP: Hypertext Preprocessor
Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
Summary(pl.UTF-8): Język skryptowy PHP
@@ -74,20 +72,18 @@
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів, виконувана на сервері
Name: php
Version: 5.3
-Release: %{_rel}%{?with_hardening:hardened}@%{_snap}
+Release: %{_rel}@%{_snap}
Epoch: 4
License: PHP
Group: Libraries
Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2
-# Source0-md5: 5af2615d3f9547157138a713cf7bab7c
+# Source0-md5: 8ac3a7ca1f401a95893d764e536efb77
Source2: zend.gif
Source3: %{name}-mod_%{name}.conf
Source4: %{name}-cgi-fcgi.ini
Source5: %{name}-cgi.ini
Source6: %{name}-apache.ini
Source7: %{name}-cli.ini
-Source8: http://www.hardened-php.net/hardening-patch-5.0.4-0.3.0.patch.gz
-# Source8-md5: 47a742fa9fab2826ad10c13a2376111a
# Taken from: http://browsers.garykeith.com/downloads.asp
Source9: %{name}_browscap.ini
Patch0: %{name}-shared.patch
@@ -102,7 +98,6 @@
Patch10: %{name}-ini.patch
# XXX: needs fix
Patch12: %{name}-threads-acfix.patch
-Patch13: %{name}-tsrmlsfetchgcc2.patch
Patch14: %{name}-no_pear_install.patch
Patch15: %{name}-zlib.patch
Patch17: %{name}-readline.patch
@@ -110,14 +105,13 @@
Patch19: %{name}-gd_imagerotate_enable.patch
Patch20: %{name}-uint32_t.patch
Patch21: %{name}-dba-link.patch
-Patch22: %{name}-hardening-fix.patch
Patch23: %{name}-both-apxs.patch
Patch24: %{name}-builddir.patch
Patch25: %{name}-zlib-for-getimagesize.patch
-Patch26: %{name}-versioning.patch
Patch29: %{name}-config-dir.patch
Patch31: %{name}-fcgi-graceful.patch
Patch38: %{name}-tds.patch
+Patch43: %{name}-use-prog_sendmail.patch
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
@@ -193,10 +187,15 @@
# must be in sync with source. extra check ensuring that it is so is done in %%build
%define php_api_version 20041225
-%define zend_module_api 20071006
-%define zend_extension_api 220070929
-%define zend_zts %{!?with_zts:0}%{?with_zts:1}
-%define php_debug %{!?debug:0}%{?debug:1}
+%define zend_module_api 20090115
+%define zend_extension_api 220090115
+%define zend_zts %{!?with_zts:0}%{?with_zts:1}
+%define php_debug %{!?debug:0}%{?debug:1}
+
+%if %{with oci8}
+# ORACLE_HOME is required for oci8 ext to build
+%{expand:%%define _preserve_env %_preserve_env ORACLE_HOME}
+%endif
%description
PHP is an HTML-embedded scripting language. PHP attempts to make it
@@ -1466,7 +1465,7 @@
%setup -q -n %{name}%{version}-%{_snap}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -1477,7 +1476,6 @@
cp php.ini-dist php.ini
#%patch10 -p1
%patch12 -p1
-%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch17 -p1
@@ -1486,19 +1484,16 @@
%patch20 -p1
%patch21 -p1
-%if %{with hardening}
-zcat %{SOURCE8} | patch -p1 || exit 1
-patch -p1 < %{PATCH22} || exit 1
-%endif
%patch23 -p1
%patch24 -p1
%patch25 -p1
-%{?with_versioning:%patch26 -p1}
%patch29 -p1
%patch31 -p1
#%patch38 -p1
+%patch43 -p1
+
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1569,15 +1564,15 @@
sapi_args='--disable-cgi'
;;
fcgi)
- sapi_args='--enable-fastcgi --with-fastcgi=/usr --enable-force-cgi-redirect'
+ sapi_args=''
;;
apxs1)
ver=$(rpm -q --qf '%{V}' apache1-devel)
- sapi_args="--with-apxs=%{apxs1} --with-apache-version=$ver"
+ sapi_args="--with-apxs=%{apxs1}"
;;
apxs2)
ver=$(rpm -q --qf '%{V}' apache-devel)
- sapi_args="--with-apxs2=%{apxs2} --with-apache-version=$ver"
+ sapi_args="--with-apxs2=%{apxs2}"
;;
esac
@@ -1593,18 +1588,14 @@
--%{!?debug:dis}%{?debug:en}able-debug \
%{?with_zts:--enable-maintainer-zts} \
--enable-inline-optimization \
- --enable-memory-limit \
--enable-bcmath=shared \
--enable-calendar=shared \
--enable-ctype=shared \
--enable-dba=shared \
- --with-inifile \
- --with-flatfile \
--enable-dom=shared \
--enable-exif=shared \
--enable-ftp=shared \
--enable-gd-native-ttf \
- --enable-gd-jus-conf \
--enable-libxml \
--enable-magic-quotes \
--enable-mbstring=shared,all \
@@ -1627,7 +1618,6 @@
%{?with_pgsql:--with-pdo-pgsql=shared} \
%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
--enable-posix=shared \
- --enable-reflection \
--enable-session \
--enable-shared \
--enable-shmop=shared \
@@ -1635,8 +1625,6 @@
--enable-sysvmsg=shared \
--enable-sysvsem=shared \
--enable-sysvshm=shared \
- --enable-track-vars \
- --enable-trans-sid \
--enable-safe-mode \
--enable-soap=shared \
--enable-sockets=shared \
@@ -1648,11 +1636,6 @@
--with-bz2=shared \
%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
--with-db4 \
-%if %{with xmlrpc}
- --with-expat-dir=shared,/usr \
-%else
- --without-expat-dir \
-%endif
%{?with_fdf:--with-fdftk=shared} \
--with-iconv=shared \
--with-freetype-dir=shared \
@@ -1682,13 +1665,11 @@
--with-readline=shared \
%{?with_recode:--with-recode=shared} \
--with-regex=php \
- --without-sablot-js \
%{?with_snmp:--with-snmp=shared} \
%{?with_sybase_ct:--with-sybase-ct=shared,/usr} \
%{!?with_sqlite:--without-sqlite --without-pdo-sqlite}%{?with_sqlite:--with-sqlite=shared,/usr --enable-sqlite-utf8} \
--with-t1lib=shared \
%{?with_tidy:--with-tidy=shared} \
- --with-tiff-dir=/usr \
%{?with_odbc:--with-unixODBC=shared,/usr} \
%{!?with_xmlrpc:--without-xmlrpc}%{?with_xmlrpc:--with-xmlrpc=shared,/usr} \
--with-xsl=shared \
@@ -2590,6 +2571,31 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.688.2.20 2009/02/24 18:21:50 zergin
+- update to snap 2009.02.24 15:30 (beta2 status)
+- update zend_module_api to 20090115
+- update zend_extension_api to 220090115
+
+- remove unrecognized configure options:
+ --with-apache-version, --enable-memory-limit, --with-inifile,
+ --with-flatfile, --enable-gd-jus-conf, --enable-track-vars,
+ --enable-trans-sid, --with-expat-dir, --without-sablot-js,
+ --with-tiff-dir
+
+ --enable-reflection
+ --enable-fastcgi, --with-fastcgi, --enable-force-cgi-redirect
+ (fastcgi and reflection are always enabled)
+
+- drop gcc2 patch (gcc2 and php 5.3? please... and it would require maintaing
+ php 5.3+ branch as it doesn't apply to current sources)
+- drop hardening patch and bcond: unavailable for php 5.3 and dropped on MAIN
+- drop versioning patch and bcond: unmaintained
+
+- preserve ORACLE_HOME env var if oci8 bcond is on (from MAIN)
+- add php-use-prog_sendmail.patch (from MAIN)
+
+- still doesn't build with sybase_ct
+
Revision 1.688.2.19 2008/12/29 19:52:27 zergin
- adapt to current snap
- drop linkflags clean patch (as on HEAD)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.19&r2=1.688.2.20&f=u
More information about the pld-cvs-commit
mailing list