OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Mar-2008 10:53:17
Branch: HEAD Handle: 2008032509531600
Modified files:
openpkg-src/apache-php apache-php.spec
openpkg-src/php php.spec
Log:
add optional support for the PECL memcache extension, sponsored by
Ciao GmbH <http://www.ciao-group.com/>
Summary:
Revision Changes Path
1.21 +29 -6 openpkg-src/apache-php/apache-php.spec
1.175 +29 -6 openpkg-src/php/php.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/apache-php/apache-php.spec
============================================================================
$ cvs diff -u -r1.20 -r1.21 apache-php.spec
--- openpkg-src/apache-php/apache-php.spec 12 Mar 2008 09:36:42 -0000
1.20
+++ openpkg-src/apache-php/apache-php.spec 25 Mar 2008 09:53:16 -0000
1.21
@@ -27,6 +27,7 @@
%define V_php_suhosin_e 0.9.23
%define V_php_hardened 5.1.6-0.4.15
%define V_php_kolab 5.2.5
+%define V_php_pecl_memcache 2.2.3
# package information
Name: apache-php
@@ -39,7 +40,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20080312
+Release: 20080325
# package options
%option with_suhosin no
@@ -87,9 +88,10 @@
%option with_xml no
%option with_xslt no
%option with_zlib no
+%option with_pecl_memcache no
# fixing implicit extension dependencies and correlations
-%if "%{with_mm}" == "yes"
+%if "%{with_mm}" == "yes" || "%{with_pecl_memcache}" == "yes"
%undefine with_session
%define with_session yes
%endif
@@ -107,7 +109,7 @@
%undefine with_imap
%define with_imap yes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes" || "%{with_pecl_memcache}" == "yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -125,6 +127,7 @@
Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: apache-php.ini
Source3: apache-php.conf
+Source4: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
Patch1:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
@@ -136,7 +139,7 @@
PreReq: OpenPKG, openpkg >= 20050615
BuildPreReq: apache
PreReq: apache
-%if "%{with_suhosin}" == "yes"
+%if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
BuildPreReq: autoconf
%endif
%if "%{with_sqlite}" == "yes"
@@ -262,6 +265,10 @@
BuildPreReq: tidy
PreReq: tidy
%endif
+%if "%{with_pecl_memcache}" == "yes"
+BuildPreReq: memcached
+PreReq: memcached
+%endif
AutoReq: no
AutoReqProv: no
@@ -301,6 +308,11 @@
url =
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
regex = php-(\d+(\.\d+)+)/
}
+ prog apache-php:pecl_memcache = {
+ version = %{V_php_pecl_memcache}
+ url = http://pecl.php.net/package/memcache/
+ regex = memcache-(2(\.\d+)+)\.tgz
+ }
%prep
%setup -q -n php-%{V_php}
@@ -312,8 +324,16 @@
%patch -p1 -P 1
mv suhosin-%{V_php_suhosin_e} ext/suhosin
rm -f package.xml
- export PHP_AUTOCONF=autoconf-213
- ./buildconf --copy --force
+%endif
+%if "%{with_pecl_memcache}" == "yes"
+ %setup -q -n php-%{V_php} -T -D -a 4
+ mv memcache-%{V_php_pecl_memcache} ext/memcache
+%endif
+%if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
+ # in case we add extensions the configure script needs to be newly
+ # generated
+ export PHP_AUTOCONF="autoconf-213"
+ rm -f configure && ./buildconf --copy --force
$PHP_AUTOCONF
%endif
%{l_shtool} subst \
@@ -538,6 +558,9 @@
%else
--without-tidy \
%endif
+%if "%{with_pecl_memcache}" == "yes"
+ --enable-memcache \
+%endif
--with-apxs2=%{l_prefix}/sbin/apxs \
--disable-cli \
--disable-cgi \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/php/php.spec
============================================================================
$ cvs diff -u -r1.174 -r1.175 php.spec
--- openpkg-src/php/php.spec 12 Mar 2008 09:36:43 -0000 1.174
+++ openpkg-src/php/php.spec 25 Mar 2008 09:53:16 -0000 1.175
@@ -27,6 +27,7 @@
%define V_php_suhosin_e 0.9.23
%define V_php_hardened 5.1.6-0.4.15
%define V_php_kolab 5.2.5
+%define V_php_pecl_memcache 2.2.3
# package information
Name: php
@@ -39,7 +40,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20080312
+Release: 20080325
# package options
%option with_suhosin no
@@ -87,9 +88,10 @@
%option with_xml no
%option with_xslt no
%option with_zlib no
+%option with_pecl_memcache no
# fixing implicit extension dependencies and correlations
-%if "%{with_mm}" == "yes"
+%if "%{with_mm}" == "yes" || "%{with_pecl_memcache}" == "yes"
%undefine with_session
%define with_session yes
%endif
@@ -107,7 +109,7 @@
%undefine with_imap
%define with_imap yes
%endif
-%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes"
+%if "%{with_mysql}" == "yes" || "%{with_gd}" == "yes" || "%{with_dom}" ==
"yes" || "%{with_pecl_memcache}" == "yes"
%undefine with_zlib
%define with_zlib yes
%endif
@@ -124,6 +126,7 @@
Source0:
http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.gz
Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
Source2: php.ini
+Source3: http://pecl.php.net/get/memcache-%{V_php_pecl_memcache}.tgz
Patch0:
http://www.hardened-php.net/hardening-patch-%{V_php_hardened}.patch.gz
Patch1:
http://download.suhosin.org/suhosin-patch-%{V_php_suhosin_p}.patch.gz
Patch2:
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_Annotations.patch
@@ -133,7 +136,7 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20050615, gcc, flex, bison
PreReq: OpenPKG, openpkg >= 20050615
-%if "%{with_suhosin}" == "yes"
+%if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
BuildPreReq: autoconf
%endif
%if "%{with_sqlite}" == "yes"
@@ -259,6 +262,10 @@
BuildPreReq: tidy
PreReq: tidy
%endif
+%if "%{with_pecl_memcache}" == "yes"
+BuildPreReq: memcached
+PreReq: memcached
+%endif
AutoReq: no
AutoReqProv: no
@@ -300,6 +307,11 @@
url =
http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
regex = php-(\d+(\.\d+)+)/
}
+ prog php:pecl_memcache = {
+ version = %{V_php_pecl_memcache}
+ url = http://pecl.php.net/package/memcache/
+ regex = memcache-(2(\.\d+)+)\.tgz
+ }
%prep
%setup -q
@@ -311,8 +323,16 @@
%patch -p1 -P 1
mv suhosin-%{V_php_suhosin_e} ext/suhosin
rm -f package.xml
- export PHP_AUTOCONF=autoconf-213
- ./buildconf --copy --force
+%endif
+%if "%{with_pecl_memcache}" == "yes"
+ %setup -q -n php-%{V_php} -T -D -a 3
+ mv memcache-%{V_php_pecl_memcache} ext/memcache
+%endif
+%if "%{with_suhosin}" == "yes" || "%{with_pecl_memcache}" == "yes"
+ # in case we add extensions the configure script needs to be newly
+ # generated
+ export PHP_AUTOCONF="autoconf-213"
+ rm -f configure && ./buildconf --copy --force
$PHP_AUTOCONF
%endif
%{l_shtool} subst \
@@ -534,6 +554,9 @@
%else
--without-tidy \
%endif
+%if "%{with_pecl_memcache}" == "yes"
+ --enable-memcache \
+%endif
--enable-cli \
--enable-cgi \
--enable-force-cgi-redirect \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
