- rel 23; fix gd module (libpng)

Changed files:
    php4-libpng.patch -> 1.1
    php4.spec -> 1.651

diff --git a/php4-libpng.patch b/php4-libpng.patch
new file mode 100644 (file)
index 0000000..972b3dd
--- /dev/null
+++ b/php4-libpng.patch
@@ -0,0 +1,11 @@
+--- php-5.2.12/ext/gd/libgd/gd_png.c~  2009-03-14 18:48:42.000000000 +0100
++++ php-5.2.12/ext/gd/libgd/gd_png.c   2010-01-28 21:23:10.826822644 +0100
+@@ -139,7 +139,7 @@
+               return NULL;
+       }
+ 
+-      if (!png_check_sig (sig, 8)) { /* bad signature */
++      if (png_sig_cmp(sig, 0, 8)) { /* bad signature */
+               return NULL;
+       }
+ 

diff --git a/php4.spec b/php4.spec
index 1762450438a988dcd9de40d4aa5fe145dc966983..0d69646ed335c9a4fa4d9af082f41d6442e19fc6 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -72,7 +72,7 @@
 %undefine      with_msession
 %endif
 
-%define                rel 22
+%define                rel 23
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -147,6 +147,7 @@ Patch51:    %{name}-tds.patch
 Patch52:       %{name}-lib64.patch
 Patch53:       %{name}-silent-session-cleanup.patch
 Patch54:       %{name}-m4-divert.patch
+Patch55:       %{name}-libpng.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}
@@ -1621,6 +1622,7 @@ cp php.ini-dist php.ini
 %endif
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
 
 %if %{with hardening}
 zcat %{SOURCE8} | patch -p1