2 commits - apache-php/kolab.patch apache-php/Makefile php/kolab.patch php/Makefile
Christoph Wickert
wickert at kolabsys.com
Tue Jan 11 14:48:56 CET 2011
apache-php/Makefile | 38 ++++++++++++++++++++++--
apache-php/kolab.patch | 71 ++++++++++++++++++++++++++++-----------------
php/Makefile | 40 +++++++++++++++++++++++--
php/kolab.patch | 77 ++++++++++++++++++++++++++++++-------------------
4 files changed, 165 insertions(+), 61 deletions(-)
New commits:
commit 2218e3da4ca73486115ef1aabaa2a3b6525a5eef
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Jan 11 11:26:25 2011 +0100
apache-php: update to 5.3.4
diff --git a/apache-php/Makefile b/apache-php/Makefile
index 87d6089..eeac55e 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -3,11 +3,23 @@ include ../make-helper/kolab.mk
PACKAGE=apache-php
DOWNLOAD_VERSION=5.3.1
OPENPKG_RELEASE=20091129
-VERSION=5.3.3
-RELEASE=20101220_kolab1
+VERSION=5.3.4
+VERSION_SUHOSHIN_EXTENSION=0.9.32.1
+VERSION_SUHOSHIN_PATCH=5.3.4-0.9.10
+VERSION_MEMCACHE=2.2.6
+RELEASE=20101230_kolab1
SOURCE_URL=http://www.php.net/distributions
+SOURCE_1_URL=http://download.suhosin.org
+SOURCE_2_URL=http://pecl.php.net/get
+SOURCE_3_URL=http://download.suhosin.org
SOURCE_0=php-$(VERSION).tar.bz2
+SOURCE_1=suhosin-$(VERSION_SUHOSHIN_EXTENSION).tar.gz
+SOURCE_2=memcache-$(VERSION_MEMCACHE).tgz
+SOURCE_3=suhosin-patch-$(VERSION_SUHOSHIN_PATCH).patch.gz
+
+SOURCES=$(SOURCE_0) $(SOURCE_1) $(SOURCE_2) $(SOURCE_3)
+RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3)
PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch
@@ -24,6 +36,28 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
--define 'with_json yes' --define 'with_tokenizer yes'
+# Target for retrieving the second source package
+$(SOURCE_1):
+ wget -c "$(SOURCE_1_URL)/$(SOURCE_1)"
+
+# Target for retrieving the third source package
+$(SOURCE_2):
+ wget -c "$(SOURCE_2_URL)/$(SOURCE_2)"
+
+# Target for retrieving the fourth source package
+$(SOURCE_3):
+ wget -c "$(SOURCE_3_URL)/$(SOURCE_3)"
+
+# Target for the source files in the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1)
+ cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/
+
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_2)
+ cp $(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/
+
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_3)
+ cp $(SOURCE_3) $(KOLABRPMSRC)/$(PACKAGE)/
+
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
include ../make-helper/fetch.mk
diff --git a/apache-php/kolab.patch b/apache-php/kolab.patch
index 1a7d1ed..613573d 100644
--- a/apache-php/kolab.patch
+++ b/apache-php/kolab.patch
@@ -1,49 +1,67 @@
-Index: apache-php.spec
-===================================================================
-RCS file: /v/openpkg/cvs/openpkg-src/apache-php/apache-php.spec,v
-retrieving revision 1.30
-diff -u -B -r1.30 apache-php.spec
---- apache-php.spec 14 May 2008 10:38:56 -0000 1.30
-+++ apache-php.spec 15 May 2008 05:47:24 -0000
-@@ -22,7 +22,7 @@
+--- apache-php.orig/apache-php.spec 2009-11-29 19:41:05.000000000 +0100
++++ apache-php/apache-php.spec 2011-01-11 09:35:19.768739148 +0100
+@@ -22,11 +22,11 @@
##
# package versions
-%define V_php 5.3.1
-+%define V_php 5.3.3
- %define V_php_suhosin_p 5.3.1-0.9.8
- %define V_php_suhosin_e 0.9.29
- %define V_php_kolab 5.2.8
+-%define V_php_suhosin_p 5.3.1-0.9.8
+-%define V_php_suhosin_e 0.9.29
+-%define V_php_kolab 5.2.8
+-%define V_php_pecl_memcache 2.2.5
++%define V_php 5.3.4
++%define V_php_suhosin_p 5.3.4-0.9.10
++%define V_php_suhosin_e 0.9.32.1
++%define V_php_kolab 5.3.4
++%define V_php_pecl_memcache 2.2.6
+
+ # package information
+ Name: apache-php
@@ -39,7 +39,7 @@
Group: Web
License: PHP
Version: %{V_php}
-Release: 20091129
-+Release: 20101220_kolab1
++Release: 20101230_kolab1
# package options
%option with_suhosin no
-@@ -61,6 +61,8 @@
+@@ -60,6 +60,8 @@
%option with_iconv no
%option with_imap no
%option with_imap_annotate no
+%option with_hash no
+%option with_imap_myrights no
%option with_json no
+ %option with_tokenizer no
%option with_mbregex no
- %option with_mbstring no
-@@ -137,8 +139,9 @@
+@@ -132,13 +134,14 @@
+
+ # list of sources
+ Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
+-Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
++Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tar.gz
+ Source2: apache-php.ini
Source3: apache-php.conf
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
-+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_Annotations.patch
++Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
Patch2: apache-php.patch
-+Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php}/KOLAB_php-%{V_php}_myrights.patch
++Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
# build information
Prefix: %{l_prefix}
-@@ -340,7 +342,10 @@
+@@ -306,7 +309,7 @@
+ }
+ prog apache-php:kolab = {
+ version = %{V_php_kolab}
+- url = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
++ url = http://git.kolab.org/server/tree/php/patches/
+ regex = php-(\d+(\.\d+)+)/
+ }
+ prog apache-php:pecl_memcache = {
+@@ -342,7 +345,10 @@
configure \
ext/gd/config.m4
%if "%{with_imap_annotate}" == "yes"
@@ -53,16 +71,16 @@ diff -u -B -r1.30 apache-php.spec
+%if "%{with_imap_myrights}" == "yes"
+ %patch -p1 -P 3
%endif
+ %patch -p0 -P 2
- %build
-@@ -400,11 +400,15 @@
+@@ -404,11 +410,15 @@
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
+- --without-sqlite \
+ %if "%{with_hash}" == "yes"
+ --enable-hash \
+ %endif
-- --without-sqlite \
%if "%{with_sqlite}" == "yes"
--with-pdo-sqlite=%{l_prefix} \
+ --with-sqlite=%{l_prefix} \
@@ -70,11 +88,10 @@ diff -u -B -r1.30 apache-php.spec
--without-pdo-sqlite \
+ --without-sqlite \
%endif
- %if "%{with_mysql}" == "yes"
- --with-mysql=%{l_prefix} \
-diff -dur apache-php.orig/apache-php.conf apache-php/apache-php.conf
---- apache-php.conf.orig 2007-06-22 23:29:41.000000000 +0200
-+++ apache-php.conf 2010-12-20 09:59:17.832815205 +0100
+ %if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
+ %if "%{with_mysqlnd}" == "yes"
+--- apache-php.orig/apache-php.conf 2007-06-22 23:29:41.000000000 +0200
++++ apache-php/apache-php.conf 2011-01-11 09:22:53.551247984 +0100
@@ -10,5 +10,5 @@
# configure the PHP initialization file
commit 788b5827e0502e6efe8d0763ce7d377c9111c127
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Tue Jan 11 11:25:57 2011 +0100
php: update to 5.3.4
diff --git a/php/Makefile b/php/Makefile
index 68088a9..8d9ea1c 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -3,11 +3,23 @@ include ../make-helper/kolab.mk
PACKAGE=php
DOWNLOAD_VERSION=5.3.1
OPENPKG_RELEASE=20091129
-VERSION=5.3.3
-RELEASE=20091129_kolab3
+VERSION=5.3.4
+VERSION_SUHOSHIN_EXTENSION=0.9.32.1
+VERSION_SUHOSHIN_PATCH=5.3.4-0.9.10
+VERSION_MEMCACHE=2.2.6
+RELEASE=20101230_kolab1
SOURCE_URL=http://www.php.net/distributions
-SOURCE_0=php-5.3.3.tar.bz2
+SOURCE_1_URL=http://download.suhosin.org
+SOURCE_2_URL=http://pecl.php.net/get
+SOURCE_3_URL=http://download.suhosin.org
+SOURCE_0=php-$(VERSION).tar.bz2
+SOURCE_1=suhosin-$(VERSION_SUHOSHIN_EXTENSION).tar.gz
+SOURCE_2=memcache-$(VERSION_MEMCACHE).tgz
+SOURCE_3=suhosin-patch-$(VERSION_SUHOSHIN_PATCH).patch.gz
+
+SOURCES=$(SOURCE_0) $(SOURCE_1) $(SOURCE_2) $(SOURCE_3)
+RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3)
PATCHES=patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch \
@@ -24,6 +36,28 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_simplexml yes' --define 'with_sqlite yes' --define 'with_spl yes' \
--define 'with_json yes' --define 'with_tokenizer yes'
+# Target for retrieving the second source package
+$(SOURCE_1):
+ wget -c "$(SOURCE_1_URL)/$(SOURCE_1)"
+
+# Target for retrieving the third source package
+$(SOURCE_2):
+ wget -c "$(SOURCE_2_URL)/$(SOURCE_2)"
+
+# Target for retrieving the fourth source package
+$(SOURCE_3):
+ wget -c "$(SOURCE_3_URL)/$(SOURCE_3)"
+
+# Target for the source files in the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1)
+ cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/
+
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_2): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_2)
+ cp $(SOURCE_2) $(KOLABRPMSRC)/$(PACKAGE)/
+
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_3): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_3)
+ cp $(SOURCE_3) $(KOLABRPMSRC)/$(PACKAGE)/
+
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
include ../make-helper/fetch.mk
diff --git a/php/kolab.patch b/php/kolab.patch
index 1e4fc81..f83a45b 100644
--- a/php/kolab.patch
+++ b/php/kolab.patch
@@ -1,47 +1,66 @@
-Index: php.spec
-===================================================================
-RCS file: /v/openpkg/cvs/openpkg-src/php/php.spec,v
-retrieving revision 1.183
-diff -u -B -r1.183 php.spec
---- php.spec 11 May 2008 08:31:26 -0000 1.183
-+++ php.spec 13 May 2008 14:58:33 -0000
-@@ -22,7 +22,7 @@
+--- php.orig/php.spec 2009-11-29 19:41:17.000000000 +0100
++++ php/php.spec 2011-01-11 09:44:34.819576367 +0100
+@@ -22,11 +22,11 @@
##
# package versions
-%define V_php 5.3.1
-+%define V_php 5.3.3
- %define V_php_suhosin_p 5.3.1-0.9.8
- %define V_php_suhosin_e 0.9.29
- %define V_php_kolab 5.2.8
+-%define V_php_suhosin_p 5.3.1-0.9.8
+-%define V_php_suhosin_e 0.9.29
+-%define V_php_kolab 5.2.8
+-%define V_php_pecl_memcache 2.2.5
++%define V_php 5.3.4
++%define V_php_suhosin_p 5.3.4-0.9.10
++%define V_php_suhosin_e 0.9.32.1
++%define V_php_kolab 5.3.4
++%define V_php_pecl_memcache 2.2.6
+
+ # package information
+ Name: php
@@ -39,7 +39,7 @@
Group: Language
License: PHP
Version: %{V_php}
-Release: 20091129
-+Release: 20091129_kolab3
++Release: 20101230_kolab1
# package options
%option with_suhosin no
-@@ -61,6 +61,8 @@
+@@ -60,6 +60,8 @@
%option with_iconv no
%option with_imap no
%option with_imap_annotate no
+%option with_hash no
+%option with_imap_myrights no
%option with_json no
+ %option with_tokenizer no
%option with_mbregex no
- %option with_mbstring no
-@@ -138,6 +140,7 @@
+@@ -132,12 +134,13 @@
+
+ # list of sources
+ Source0: http://static.php.net/www.php.net/distributions/php-%{V_php}.tar.bz2
+-Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tgz
++Source1: http://download.suhosin.org/suhosin-%{V_php_suhosin_e}.tar.gz
+ 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
-+Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
++Patch1: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
Patch2: php.patch
-+Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/php-%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
++Patch3: http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
# build information
Prefix: %{l_prefix}
-@@ -336,7 +338,10 @@
+@@ -305,7 +308,7 @@
+ }
+ prog php:kolab = {
+ version = %{V_php_kolab}
+- url = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/php/
++ url = http://git.kolab.org/server/tree/php/patches/
+ regex = php-(\d+(\.\d+)+)/
+ }
+ prog php:pecl_memcache = {
+@@ -338,7 +341,10 @@
configure \
ext/gd/config.m4
%if "%{with_imap_annotate}" == "yes"
@@ -51,29 +70,29 @@ diff -u -B -r1.183 php.spec
+%if "%{with_imap_myrights}" == "yes"
+ %patch -p1 -P 3
%endif
+ %patch -p0 -P 2
- %build
-@@ -396,11 +396,15 @@
+@@ -400,11 +406,15 @@
%if "%{with_calendar}" == "yes"
--enable-calendar \
%endif
+- --without-sqlite \
+-%if "%{with_sqlite}" == "yes"
+ %if "%{with_hash}" == "yes"
+ --enable-hash \
+ %endif
-- --without-sqlite \
-+ --with-pdo-sqlite=%{l_prefix} \
- %if "%{with_sqlite}" == "yes"
-- --with-pdo-sqlite=%{l_prefix} \
+ --with-pdo-sqlite=%{l_prefix} \
++%if "%{with_sqlite}" == "yes"
+ --with-sqlite=%{l_prefix} \
+ --with-sqlite3=%{l_prefix} \
%else
- --without-pdo-sqlite \
+ --without-sqlite \
%endif
- %if "%{with_mysql}" == "yes"
- --with-mysql=%{l_prefix} \
---- php.ini.orig 2010-02-16 08:53:09.000000000 +0100
-+++ php.ini 2010-02-16 08:53:23.000000000 +0100
+ %if "%{with_mysql}" == "yes" || "%{with_mysqlnd}" == "yes"
+ %if "%{with_mysqlnd}" == "yes"
+--- php.orig/php.ini 2009-09-09 13:47:43.000000000 +0200
++++ php/php.ini 2011-01-11 09:23:10.051253836 +0100
@@ -6,17 +6,14 @@
; Resource Limits
More information about the commits
mailing list