gunnar: server/apache-php .cvsignore, 1.2, 1.3 Makefile, 1.15, 1.16 kolab.patch, 1.9, 1.10

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/apache-php
In directory doto:/tmp/cvs-serv18837

Modified Files:
	.cvsignore Makefile kolab.patch 
Log Message:
Update to 5.3.2 which should compile with openssl-1.0.0

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/apache-php/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	4 Jan 2010 15:51:57 -0000	1.2
+++ .cvsignore	21 Apr 2010 21:13:13 -0000	1.3
@@ -1,2 +1,3 @@
 *.src.rpm
-*.tar.gz
\ No newline at end of file
+*.tar.gz
+*.tar.bz2

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/apache-php/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	17 Jan 2010 13:22:55 -0000	1.15
+++ Makefile	21 Apr 2010 21:13:13 -0000	1.16
@@ -3,11 +3,11 @@
 PACKAGE=apache-php
 DOWNLOAD_VERSION=5.3.1
 OPENPKG_RELEASE=20091129
-VERSION=5.3.1
+VERSION=5.3.2
 RELEASE=20091129_kolab1
 
 SOURCE_URL=http://www.php.net/distributions
-SOURCE_0=php-5.3.1.tar.gz
+SOURCE_0=php-5.3.2.tar.bz2
 
 PATCHES=../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_Annotations.patch \
         ../php/patches/php-$(VERSION)/KOLAB_php-$(VERSION)_myrights.patch

Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/apache-php/kolab.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kolab.patch	24 Dec 2009 08:35:50 -0000	1.9
+++ kolab.patch	21 Apr 2010 21:13:13 -0000	1.10
@@ -5,6 +5,15 @@
 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 @@
+ ##
+ 
+ #   package versions
+-%define       V_php                     5.3.1
++%define       V_php                     5.3.2
+ %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
 @@ -39,7 +39,7 @@
  Group:        Web
  License:      PHP