apache-php/kolab.patch
Git Service User
git at kolabsys.com
Mon Feb 21 20:57:17 CET 2011
apache-php/kolab.patch | 249 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 249 insertions(+)
New commits:
commit 36e83043d1f93bdbf14398a045bbfd5a3c605e04
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Mon Feb 21 20:57:01 2011 +0100
apache-php: Add accidentially deleted kolab.patch again
diff --git a/apache-php/kolab.patch b/apache-php/kolab.patch
new file mode 100644
index 0000000..3caf7ca
--- /dev/null
+++ b/apache-php/kolab.patch
@@ -0,0 +1,249 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
+<head>
+<title>server - The Kolab Server repository</title>
+<meta name='generator' content='cgit v0.8.2.1'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
+<link rel='shortcut icon' href='/cgit-data/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='http://git.kolab.org/server/atom/apache-php/kolab.patch?h=master' type='application/atom+xml'/></head>
+<body>
+<table id='header'>
+<tr>
+<td class='logo' rowspan='2'><a href='/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
+<td class='main'><a href='/'>index</a> : <a title='server' href='/server/'>server</a></td><td class='form'><form method='get' action=''>
+<input type='hidden' name='id' value='2218e3da4ca73486115ef1aabaa2a3b6525a5eef'/><select name='h' onchange='this.form.submit();'>
+<option value='1.0-stable'>1.0-stable</option>
+<option value='1.x-stable'>1.x-stable</option>
+<option value='2.0-stable'>2.0-stable</option>
+<option value='2.1-stable'>2.1-stable</option>
+<option value='2.2-feature-suc'>2.2-feature-suc</option>
+<option value='2.2-stable'>2.2-stable</option>
+<option value='2.3-stable'>2.3-stable</option>
+<option value='horde4'>horde4</option>
+<option value='master' selected='selected'>master</option>
+<option value='refactor-kolab-webadmin'>refactor-kolab-webadmin</option>
+<option value='refactor-kolabd'>refactor-kolabd</option>
+</select> <input type='submit' name='' value='switch'/></form></td></tr>
+<tr><td class='sub'>The Kolab Server repository</td><td class='sub right'>kolab-devel at kolab.org</td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/server/'>summary</a><a href='/server/refs/?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>refs</a><a href='/server/log/'>log</a><a class='active' href='/server/tree/?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>tree</a><a href='/server/commit/?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>commit</a><a href='/server/diff/?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>diff</a></td><td class='form'><form class='right' method='get' action='/server/log/apache-php/kolab.patch'>
+<input type='hidden' name='id' value='2218e3da4ca73486115ef1aabaa2a3b6525a5eef'/><select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='content'>path: <a href='/server/tree/?h=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>root</a>/<a href='/server/tree/apache-php?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>apache-php</a>/<a href='/server/tree/apache-php/kolab.patch?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>kolab.patch</a> (<a href='/server/plain/apache-php/kolab.patch?id=2218e3da4ca73486115ef1aabaa2a3b6525a5eef'>plain</a>)<br/>blob: 613573d689318bd44d98825a3f777f072c765f1a
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a class='no' id='n1' name='n1' href='#n1'>1</a>
+<a class='no' id='n2' name='n2' href='#n2'>2</a>
+<a class='no' id='n3' name='n3' href='#n3'>3</a>
+<a class='no' id='n4' name='n4' href='#n4'>4</a>
+<a class='no' id='n5' name='n5' href='#n5'>5</a>
+<a class='no' id='n6' name='n6' href='#n6'>6</a>
+<a class='no' id='n7' name='n7' href='#n7'>7</a>
+<a class='no' id='n8' name='n8' href='#n8'>8</a>
+<a class='no' id='n9' name='n9' href='#n9'>9</a>
+<a class='no' id='n10' name='n10' href='#n10'>10</a>
+<a class='no' id='n11' name='n11' href='#n11'>11</a>
+<a class='no' id='n12' name='n12' href='#n12'>12</a>
+<a class='no' id='n13' name='n13' href='#n13'>13</a>
+<a class='no' id='n14' name='n14' href='#n14'>14</a>
+<a class='no' id='n15' name='n15' href='#n15'>15</a>
+<a class='no' id='n16' name='n16' href='#n16'>16</a>
+<a class='no' id='n17' name='n17' href='#n17'>17</a>
+<a class='no' id='n18' name='n18' href='#n18'>18</a>
+<a class='no' id='n19' name='n19' href='#n19'>19</a>
+<a class='no' id='n20' name='n20' href='#n20'>20</a>
+<a class='no' id='n21' name='n21' href='#n21'>21</a>
+<a class='no' id='n22' name='n22' href='#n22'>22</a>
+<a class='no' id='n23' name='n23' href='#n23'>23</a>
+<a class='no' id='n24' name='n24' href='#n24'>24</a>
+<a class='no' id='n25' name='n25' href='#n25'>25</a>
+<a class='no' id='n26' name='n26' href='#n26'>26</a>
+<a class='no' id='n27' name='n27' href='#n27'>27</a>
+<a class='no' id='n28' name='n28' href='#n28'>28</a>
+<a class='no' id='n29' name='n29' href='#n29'>29</a>
+<a class='no' id='n30' name='n30' href='#n30'>30</a>
+<a class='no' id='n31' name='n31' href='#n31'>31</a>
+<a class='no' id='n32' name='n32' href='#n32'>32</a>
+<a class='no' id='n33' name='n33' href='#n33'>33</a>
+<a class='no' id='n34' name='n34' href='#n34'>34</a>
+<a class='no' id='n35' name='n35' href='#n35'>35</a>
+<a class='no' id='n36' name='n36' href='#n36'>36</a>
+<a class='no' id='n37' name='n37' href='#n37'>37</a>
+<a class='no' id='n38' name='n38' href='#n38'>38</a>
+<a class='no' id='n39' name='n39' href='#n39'>39</a>
+<a class='no' id='n40' name='n40' href='#n40'>40</a>
+<a class='no' id='n41' name='n41' href='#n41'>41</a>
+<a class='no' id='n42' name='n42' href='#n42'>42</a>
+<a class='no' id='n43' name='n43' href='#n43'>43</a>
+<a class='no' id='n44' name='n44' href='#n44'>44</a>
+<a class='no' id='n45' name='n45' href='#n45'>45</a>
+<a class='no' id='n46' name='n46' href='#n46'>46</a>
+<a class='no' id='n47' name='n47' href='#n47'>47</a>
+<a class='no' id='n48' name='n48' href='#n48'>48</a>
+<a class='no' id='n49' name='n49' href='#n49'>49</a>
+<a class='no' id='n50' name='n50' href='#n50'>50</a>
+<a class='no' id='n51' name='n51' href='#n51'>51</a>
+<a class='no' id='n52' name='n52' href='#n52'>52</a>
+<a class='no' id='n53' name='n53' href='#n53'>53</a>
+<a class='no' id='n54' name='n54' href='#n54'>54</a>
+<a class='no' id='n55' name='n55' href='#n55'>55</a>
+<a class='no' id='n56' name='n56' href='#n56'>56</a>
+<a class='no' id='n57' name='n57' href='#n57'>57</a>
+<a class='no' id='n58' name='n58' href='#n58'>58</a>
+<a class='no' id='n59' name='n59' href='#n59'>59</a>
+<a class='no' id='n60' name='n60' href='#n60'>60</a>
+<a class='no' id='n61' name='n61' href='#n61'>61</a>
+<a class='no' id='n62' name='n62' href='#n62'>62</a>
+<a class='no' id='n63' name='n63' href='#n63'>63</a>
+<a class='no' id='n64' name='n64' href='#n64'>64</a>
+<a class='no' id='n65' name='n65' href='#n65'>65</a>
+<a class='no' id='n66' name='n66' href='#n66'>66</a>
+<a class='no' id='n67' name='n67' href='#n67'>67</a>
+<a class='no' id='n68' name='n68' href='#n68'>68</a>
+<a class='no' id='n69' name='n69' href='#n69'>69</a>
+<a class='no' id='n70' name='n70' href='#n70'>70</a>
+<a class='no' id='n71' name='n71' href='#n71'>71</a>
+<a class='no' id='n72' name='n72' href='#n72'>72</a>
+<a class='no' id='n73' name='n73' href='#n73'>73</a>
+<a class='no' id='n74' name='n74' href='#n74'>74</a>
+<a class='no' id='n75' name='n75' href='#n75'>75</a>
+<a class='no' id='n76' name='n76' href='#n76'>76</a>
+<a class='no' id='n77' name='n77' href='#n77'>77</a>
+<a class='no' id='n78' name='n78' href='#n78'>78</a>
+<a class='no' id='n79' name='n79' href='#n79'>79</a>
+<a class='no' id='n80' name='n80' href='#n80'>80</a>
+<a class='no' id='n81' name='n81' href='#n81'>81</a>
+<a class='no' id='n82' name='n82' href='#n82'>82</a>
+<a class='no' id='n83' name='n83' href='#n83'>83</a>
+<a class='no' id='n84' name='n84' href='#n84'>84</a>
+<a class='no' id='n85' name='n85' href='#n85'>85</a>
+<a class='no' id='n86' name='n86' href='#n86'>86</a>
+<a class='no' id='n87' name='n87' href='#n87'>87</a>
+<a class='no' id='n88' name='n88' href='#n88'>88</a>
+<a class='no' id='n89' name='n89' href='#n89'>89</a>
+<a class='no' id='n90' name='n90' href='#n90'>90</a>
+<a class='no' id='n91' name='n91' href='#n91'>91</a>
+<a class='no' id='n92' name='n92' href='#n92'>92</a>
+<a class='no' id='n93' name='n93' href='#n93'>93</a>
+<a class='no' id='n94' name='n94' href='#n94'>94</a>
+<a class='no' id='n95' name='n95' href='#n95'>95</a>
+<a class='no' id='n96' name='n96' href='#n96'>96</a>
+<a class='no' id='n97' name='n97' href='#n97'>97</a>
+<a class='no' id='n98' name='n98' href='#n98'>98</a>
+<a class='no' id='n99' name='n99' href='#n99'>99</a>
+<a class='no' id='n100' name='n100' href='#n100'>100</a>
+<a class='no' id='n101' name='n101' href='#n101'>101</a>
+</pre></td>
+<td class='lines'><pre><code>--- 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_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: 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,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://git.kolab.org/server/tree/php/patches/%{V_php_kolab}/KOLAB_php-%{V_php}_Annotations.patch
+ Patch2: apache-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}
+@@ -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"
+- 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
+
+@@ -404,11 +410,15 @@
+ %if "%{with_calendar}" == "yes"
+ --enable-calendar \
+ %endif
+- --without-sqlite \
++ %if "%{with_hash}" == "yes"
++ --enable-hash \
++ %endif
+ %if "%{with_sqlite}" == "yes"
+ --with-pdo-sqlite=%{l_prefix} \
++ --with-sqlite=%{l_prefix} \
+ %else
+ --without-pdo-sqlite \
++ --without-sqlite \
+ %endif
+ %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
+ # (this directory directive really accepts a file, too!)
+-PHPINIDir @l_prefix@/etc/apache/apache-php.ini
++PHPINIDir @l_prefix@/etc/apache/php.ini
+
+</code></pre></td></tr></table>
+</div><div class='footer'>generated by cgit v0.8.2.1 at 2011-02-21 19:43:24 (GMT)</div>
+</body>
+</html>
More information about the commits
mailing list