- update to 5.1.3, ext/msession was moved to pecl

Changed files:
    php.spec -> 1.573

diff --git a/php.spec b/php.spec
index cf289de60c10f33068f1c69855ad34761b14b73b..3ff8a9845334751e04550631715706ff209d3880 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -28,7 +28,6 @@
 %bcond_without mhash           # without mhash extension module
 %bcond_without ming            # without ming extension module
 %bcond_without mm              # without mm support for session storage
-%bcond_without msession        # without msession extension module
 %bcond_without mssql           # without MS SQL extension module
 %bcond_without mysqli          # without mysqli support (Requires mysql > 4.1)
 %bcond_without mime_magic      # without mime-magic module
@@ -67,12 +66,7 @@
 ERROR: You need to select at least one Apache SAPI to build shared modules.
 %endif
 
-# x86-only lib
-%ifnarch %{ix86}
-%undefine      with_msession
-%endif
-
-%define        _rel 11
+%define        _rel 0.1
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr):   Le langage de script embarque-HTML PHP
 Summary(pl):   Jêzyk skryptowy PHP
@@ -80,13 +74,13 @@ Summary(pt_BR):     A linguagem de script PHP
 Summary(ru):   PHP ÷ÅÒÓÉÉ 5 - ÑÚÙË ÐÒÅÐÒÏÃÅÓÓÉÒÏ×ÁÎÉÑ HTML-ÆÁÊÌÏ×, ×ÙÐÏÌÎÑÅÍÙÊ ÎÁ ÓÅÒ×ÅÒÅ
 Summary(uk):   PHP ÷ÅÒÓ¦§ 5 - ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
-Version:       5.1.2
+Version:       5.1.3
 Release:       %{_rel}%{?with_hardening:hardened}
 Epoch:         4
 License:       PHP
 Group:         Libraries
 Source0:       http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 79cee17e9db85be878000a2a4198378e
+# Source0-md5: 081699305f7fd4903afda5a1f836e7b1
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source3:       %{name}-mod_%{name}.conf
@@ -101,7 +95,7 @@ Patch1:              %{name}-pldlogo.patch
 Patch2:                %{name}-mail.patch
 Patch3:                %{name}-link-libs.patch
 Patch4:                %{name}-libpq_fs_h_path.patch
-Patch5:                %{name}-msession-shared-lib.patch
+
 Patch6:                %{name}-build_modules.patch
 Patch7:                %{name}-sapi-ini-file.patch
 Patch8:                %{name}-no-metaccld.patch
@@ -131,8 +125,6 @@ Patch34:    %{name}-ini-search-path.patch
 Patch35:       %{name}-openssl-huge-hack.patch
 Patch36:       %{name}-versioning.patch
 Patch37:       %{name}-linkflags-clean.patch
-Patch38:       %{name}-CVE-2006-0996.patch
-Patch39:       %{name}-CVE-2006-1490.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
@@ -181,7 +173,6 @@ BuildRequires:      openssl-devel >= 0.9.7d
 %{?with_snmp:BuildRequires:    net-snmp-devel >= 5.0.7}
 BuildRequires: pam-devel
 %{?with_pcre:BuildRequires:    pcre-devel}
-%{?with_msession:BuildRequires:        phoenix-devel}
 %{?with_pgsql:BuildRequires:   postgresql-backend-devel >= 7.2}
 %{?with_pgsql:BuildRequires:   postgresql-devel}
 BuildRequires: readline-devel
@@ -825,25 +816,6 @@ This is a dynamic shared object (DSO) for PHP that will add ming
 Modu³ PHP dodaj±cy obs³ugê plików Flash (.swf) poprzez bibliotekê
 ming.
 
-%package msession
-Summary:       msession extension module for PHP
-Summary(pl):   Modu³ msession dla PHP
-Group:         Libraries
-Requires(post,preun):  %{name}-common = %{epoch}:%{version}-%{release}
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-
-%description msession
-This is a dynamic shared object (DSO) for PHP that will allow you to
-use msession. msession is a high speed session daemon which can run
-either locally or remotely. It is designed to provide consistent
-session management for a PHP web farm.
-
-%description msession -l pl
-Modu³ PHP dodaj±cy umo¿liwiaj±cy korzystanie z demona msession. Jest
-to demon szybkiej obs³ugi sesji, który mo¿e dzia³aæ lokalnie lub na
-innej maszynie. S³u¿y do zapewniania spójnej obs³ugi sesji dla farmy
-serwerów.
-
 %package mssql
 Summary:       MS SQL extension module for PHP
 Summary(pl):   Modu³ MS SQL dla PHP
@@ -1545,7 +1517,7 @@ Modu
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -1576,10 +1548,8 @@ patch -p1 < %{PATCH30} || exit 1
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
-%patch35 -p1
+#%patch35 -p1 CHECK THIS
 %{?with_versioning:%patch36 -p1}
-%patch38 -p1
-%patch39 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -1748,7 +1718,6 @@ for sapi in $sapis; do
        %{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic.mime}%{!?with_mime_magic:--disable-mime-magic} \
        %{?with_ming:--with-ming=shared} \
        %{?with_mm:--with-mm} \
-       %{?with_msession:--with-msession=shared}%{!?with_msession:--without-msession} \
        %{?with_mssql:--with-mssql=shared} \
        --with-mysql=shared,/usr \
        --with-mysql-sock=/var/lib/mysql/mysql.sock \
@@ -2153,12 +2122,6 @@ fi
 %postun ming
 %extension_postun
 
-%post msession
-%extension_post
-
-%postun msession
-%extension_postun
-
 %post mssql
 %extension_post
 
@@ -2450,9 +2413,6 @@ fi
 %triggerun ming -- %{name}-ming < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ming\.so/d' %{_sysconfdir}/php.ini
 
-%triggerun msession -- %{name}-msession < 4:5.0.4-9.1
-%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*msession\.so/d' %{_sysconfdir}/php.ini
-
 %triggerun mssql -- %{name}-mssql < 4:5.0.4-9.1
 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mssql\.so/d' %{_sysconfdir}/php.ini
 
@@ -2784,13 +2744,6 @@ fi
 %attr(755,root,root) %{extensionsdir}/ming.so
 %endif
 
-%if %{with msession}
-%files msession
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/msession.ini
-%attr(755,root,root) %{extensionsdir}/msession.so
-%endif
-
 %if %{with mssql}
 %files mssql
 %defattr(644,root,root,755)