summaryrefslogtreecommitdiff
path: root/php/kolab.patch
blob: f83a45b0239af22b43180aa12df25d6bbcebe246 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
--- 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_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:      20101230_kolab1
 
 #   package options
 %option       with_suhosin              no
@@ -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
@@ -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://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
 Patch2:       php.patch
+Patch3:       http://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_myrights.patch
 
 #   build information
 Prefix:       %{l_prefix}
@@ -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"
-    sed <%{PATCH1} -e '/php-5.2.1\/ext\/imap\/php_imap.c.orig/,/^[^\+]/d' | %{l_patch} -p1
+    %patch -p1 -P 1
+%endif
+%if "%{with_imap_myrights}" == "yes"
+    %patch -p1 -P 3
 %endif
     %patch -p0 -P 2
 
@@ -400,11 +406,15 @@
 %if "%{with_calendar}" == "yes"
         --enable-calendar \
 %endif
-        --without-sqlite \
-%if "%{with_sqlite}" == "yes"
+ %if "%{with_hash}" == "yes"
+         --enable-hash \
+ %endif
         --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_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
 register_globals   = off    ; Global variables are no longer registered for input data
-safe_mode          = on     ; Enable Safe Mode (file UID comparisons)
-safe_mode_gid      = off    ; Whether to relax Safe Mode to file GID comparisons
 allow_url_fopen    = off    ; Disable the opening of remote URLs
 display_errors     = off    ; Errors will NOT be displayed
 log_errors         = on     ; Errors will be logged
 max_execution_time = 60     ; Maximum execution time of each script, in seconds
 max_input_time     = 60     ; Maximum amount of time each script may spend parsing request data
-memory_limit       = 8M     ; Maximum amount of memory a script may consume
-post_max_size      = 8M     ; Maximum amount of POST data accepted
+memory_limit       = 128M   ; Maximum amount of memory a script may consume
+post_max_size      = 128M   ; Maximum amount of POST data accepted
 
 ;   Include Paths
 include_path          = ".:@l_prefix@/lib/php"
-safe_mode_include_dir = "@l_prefix@/lib/php"