From 29f1a1e093ca8c8e8c44ac880981ad45e45b0323 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Wed, 1 Jul 2009 08:13:01 +0000
Subject: [PATCH] adjust packaging for PHP 5.3.0

---
 php/php.patch | 18 ++++++++++++++++++
 php/php.spec  | 44 +++++++++++++++++---------------------------
 2 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 php/php.patch

diff --git a/php/php.patch b/php/php.patch
new file mode 100644
index 0000000000..8fcb2c74ac
--- /dev/null
+++ b/php/php.patch
@@ -0,0 +1,18 @@
+Index: ext/gd/libgd/gd_arc.c
+--- ext/gd/libgd/gd_arc.c.orig	2009-05-26 22:14:31 +0200
++++ ext/gd/libgd/gd_arc.c	2009-07-01 08:56:12 +0200
+@@ -53,6 +53,7 @@
+ 	}
+ }
+ 
++#if 0
+ void gdImageFilledEllipse (gdImagePtr im, int mx, int my, int w, int h, int c)
+ {
+ 	int x=0,mx1=0,mx2=0,my1=0,my2=0;
+@@ -106,5 +107,6 @@
+ 		old_y1 = my1;
+ 	}
+ }
++#endif
+ 
+ 
diff --git a/php/php.spec b/php/php.spec
index 99061450df..20047ef118 100644
--- a/php/php.spec
+++ b/php/php.spec
@@ -39,7 +39,7 @@ Class:        BASE
 Group:        Language
 License:      PHP
 Version:      %{V_php}
-Release:      20090630
+Release:      20090701
 
 #   package options
 %option       with_suhosin              no
@@ -52,7 +52,6 @@ Release:      20090630
 %option       with_debug                no
 %option       with_dom                  no
 %option       with_exif                 no
-%option       with_fastcgi              no
 %option       with_freetype             no
 %option       with_ftp                  no
 %option       with_gd                   no
@@ -68,11 +67,11 @@ Release:      20090630
 %option       with_hash                 no
 %option       with_mm                   no
 %option       with_mysql                no
+%option       with_mysqlnd              no
 %option       with_oci8                 no
 %option       with_odbc                 no
 %option       with_openldap             no
 %option       with_openldapsasl         no
-%option       with_pcre                 no
 %option       with_pear                 no
 %option       with_pgsql                no
 %option       with_posix                no
@@ -81,7 +80,6 @@ Release:      20090630
 %option       with_simplexml            no
 %option       with_snmp                 no
 %option       with_sqlite               no
-%option       with_spl                  no
 %option       with_ssl                  no
 %option       with_tidy                 no
 %option       with_versioning           no
@@ -100,8 +98,6 @@ Release:      20090630
 %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
@@ -135,12 +131,15 @@ Source2:      php.ini
 Source3:      http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
 Patch0:       http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
 Patch1:       http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php_kolab}_Annotations.patch
+Patch2:       php.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20050615, gcc, flex, bison
 PreReq:       OpenPKG, openpkg >= 20050615
+BuildPreReq:  pcre
+PreReq:       pcre
 %if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
 BuildPreReq:  autoconf
 %endif
@@ -191,10 +190,6 @@ PreReq:       openldap::with_sasl = no
 BuildPreReq:  mm
 PreReq:       mm
 %endif
-%if "%{with_pcre}" == "yes"
-BuildPreReq:  pcre
-PreReq:       pcre
-%endif
 %if "%{with_freetype}" == "yes"
 BuildPreReq:  freetype
 PreReq:       freetype
@@ -339,6 +334,7 @@ AutoReqProv:  no
 %if "%{with_imap_annotate}" == "yes"
     sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1
 %endif
+    %patch -p0 -P 2
 
 %build
     #   configure package
@@ -391,6 +387,7 @@ AutoReqProv:  no
         --libdir=%{l_prefix}/lib/php \
         --disable-all \
         --enable-pdo \
+        --with-pcre-regex=%{l_prefix} \
 %if "%{with_suhosin}" == "yes"
         --enable-suhosin \
 %endif
@@ -403,11 +400,19 @@ AutoReqProv:  no
 %else
         --without-pdo-sqlite \
 %endif
-%if "%{with_mysql}" == "yes"
+%if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
+%if "%{with_mysqlnd}" == "yes"
+        --with-mysql=mysqlnd \
+        --with-pdo-mysql=mysqlnd \
+%else
         --with-mysql=%{l_prefix} \
         --with-pdo-mysql=%{l_prefix} \
+%endif
+        --with-mysqli=mysqlnd \
+        --with-mysql-sock=%{l_prefix}/var/mysql/mysql.sock \
 %else
         --without-mysql \
+        --without-pdo-mysql \
 %endif
 %if "%{with_pgsql}" == "yes"
         --with-pgsql=%{l_prefix} \
@@ -423,11 +428,6 @@ AutoReqProv:  no
         --with-jpeg-dir=%{l_prefix} \
         --with-png-dir=%{l_prefix} \
 %endif
-%if "%{with_fastcgi}" == "yes"
-         --enable-fastcgi \
-%else
-         --disable-fastcgi \
-%endif
 %if "%{with_freetype}" == "yes"
         --enable-gd-native-ttf \
         --with-freetype-dir=%{l_prefix} \
@@ -459,9 +459,6 @@ AutoReqProv:  no
 %if "%{with_mm}" == "yes"
         --with-mm=%{l_prefix} \
 %endif
-%if "%{with_pcre}" == "yes"
-        --with-pcre-regex=%{l_prefix} \
-%endif
 %if "%{with_ftp}" == "yes"
         --enable-ftp \
 %endif
@@ -553,11 +550,6 @@ AutoReqProv:  no
 %if "%{with_iconv}" == "yes"
         --with-iconv=%{l_prefix} \
 %endif
-%if "%{with_spl}" == "yes"
-        --enable-spl \
-%else
-        --disable-spl \
-%endif
 %if "%{with_tidy}" == "yes"
         --with-tidy=%{l_prefix} \
 %else
@@ -570,9 +562,7 @@ AutoReqProv:  no
         --enable-memcache \
 %endif
         --enable-cli \
-        --enable-cgi \
-        --enable-force-cgi-redirect \
-        --enable-discard-path
+        --enable-cgi
 
     #   build package
     %{l_make} %{l_mflags}