SPECS (RA-branch_general): php.spec - merged patches from php4.spe...

[hawk]

Author: hawk                         Date: Wed Apr 26 14:06:55 2006 GMT
Module: SPECS                         Tag: RA-branch_general
---- Log message:
- merged patches from php4.spec: dextension, zlib-for-getimagesize,
  ini-search-path, bug-36017-and-session-chars, openssl-huge-hack,
  CVE-2006-0996, CVE-2006-1490

---- Files affected:
SPECS:
   php.spec (1.255.2.37 -> 1.255.2.38) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.255.2.37 SPECS/php.spec:1.255.2.38
--- SPECS/php.spec:1.255.2.37	Tue Jan 17 23:24:30 2006
+++ SPECS/php.spec	Wed Apr 26 16:06:50 2006
@@ -64,7 +64,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 4 -- ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	4.4.2
-Release:	1
+Release:	1.1
 Epoch:		3
 Group:		Libraries
 License:	PHP
@@ -113,6 +113,13 @@
 Patch32:	%{name}-uint32_t.patch
 Patch33:	%{name}-va_copy.patch
 Patch34:	%{name}-install_gd_headers.patch
+Patch35:	php-dextension.patch
+Patch36:	%{name}-zlib-for-getimagesize.patch
+Patch37:	%{name}-ini-search-path.patch
+Patch38:	%{name}-bug-36017-and-session-chars.patch
+Patch39:	%{name}-openssl-huge-hack.patch
+Patch40:	%{name}-CVE-2006-0996.patch
+Patch41:	%{name}-CVE-2006-1490.patch
 Icon:		php4.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -1564,6 +1571,13 @@
 %patch33 -p1
 %endif
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I%{_prefix}/X11R6/include"
@@ -2803,6 +2817,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.255.2.38  2006/04/26 14:06:50  hawk
+- merged patches from php4.spec: dextension, zlib-for-getimagesize,
+  ini-search-path, bug-36017-and-session-chars, openssl-huge-hack,
+  CVE-2006-0996, CVE-2006-1490
+
 Revision 1.255.2.37  2006/01/17 22:24:30  hawk
 - updated to 4.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.255.2.37&r2=1.255.2.38&f=u