OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 01-Jul-2009 10:46:07
Branch: HEAD Handle: 2009070109460600
Added files:
openpkg-src/apache-php apache-php.patch
Modified files:
openpkg-src/apache-php apache-php.spec
Log:
adjust packaging for PHP 5.3.0
Summary:
Revision Changes Path
1.1 +18 -0 openpkg-src/apache-php/apache-php.patch
1.50 +17 -27 openpkg-src/apache-php/apache-php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.patch
============================================================================
$ cvs diff -u -r0 -r1.1 apache-php.patch
--- /dev/null 2009-07-01 10:46:05 +0200
+++ apache-php.patch 2009-07-01 10:46:07 +0200
@@ -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
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.49 -r1.50 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 30 Jun 2009 18:44:59 -0000
1.49
+++ openpkg-src/apache-php/apache-php.spec 1 Jul 2009 08:46:06 -0000
1.50
@@ -39,7 +39,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20090630
+Release: 20090701
# package options
%option with_suhosin no
@@ -52,7 +52,6 @@
%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 @@
%option with_mhash 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 @@
%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 @@
%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
@@ -136,6 +132,7 @@
Source4: 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: apache-php.patch
# build information
Prefix: %{l_prefix}
@@ -144,6 +141,8 @@
PreReq: OpenPKG, openpkg >= 20050615
BuildPreReq: apache
PreReq: apache
+BuildPreReq: pcre
+PreReq: pcre
%if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
BuildPreReq: autoconf
%endif
@@ -194,10 +193,6 @@
BuildPreReq: mm
PreReq: mm
%endif
-%if "%{with_pcre}" == "yes"
-BuildPreReq: pcre
-PreReq: pcre
-%endif
%if "%{with_freetype}" == "yes"
BuildPreReq: freetype
PreReq: freetype
@@ -343,6 +338,7 @@
%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
@@ -395,6 +391,7 @@
--libdir=%{l_prefix}/lib/php \
--disable-all \
--enable-pdo \
+ --with-pcre-regex=%{l_prefix} \
%if "%{with_suhosin}" == "yes"
--enable-suhosin \
%endif
@@ -407,11 +404,19 @@
%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} \
@@ -427,11 +432,6 @@
--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} \
@@ -463,9 +463,6 @@
%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
@@ -557,11 +554,6 @@
%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
@@ -575,9 +567,7 @@
%endif
--with-apxs2=%{l_prefix}/sbin/apxs \
--disable-cli \
- --disable-cgi \
- --enable-force-cgi-redirect \
- --enable-discard-path
+ --disable-cgi
# build package
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
