[Kolab-devel] tbits multidomain scripts error kolab 3.1

[Timotheus Pokorra]

sorry, I just realize, that I have not added the adddomain.php and
domain.kolab.conf.tpl yet to that github repo, and perhaps the
initMultiDomain.sh is also not complete (missing postfix lines).
So I have yet to finish complete integration of
https://gist.github.com/tpokorra/5244642 into
https://github.com/tpokorra/kolab3_tbits_scripts.
I hope I can do this next week, but have to work on another project
for the next couple of weeks as well.
Timotheus

On 19 July 2013 13:44, Timotheus Pokorra <timotheus at pokorra.de> wrote:
> Hello Manel,
> some of these patches are not necessary anymore in Kolab 3.1, since
> they have been integrated upstream.
>
> I am now maintaining some patches from bugzilla, that have not gone
> upstream yet, in
> https://github.com/tpokorra/kolab3_tbits_scripts/tree/master/kolab3.1
> (see the patches in
> https://github.com/tpokorra/kolab3_tbits_scripts/tree/master/kolab3.1/patches)
>
> I hope this helps,
>   Timotheus
>
> On 18 July 2013 16:12, Manel Gimeno Zaragozá <magiza83 at hotmail.com> wrote:
>> Hello,
>>
>> I've installed kolab 3.1 alpha release and I'm trying to apply the scripts
>> provided by tbits in:
>>
>> http://www.tbits.net/tbits-opensource/kolab3multipledomains.html
>>
>> and I'm getting the following errors:
>>
>> $ /bin/bash initMultiDomain.sh password
>>
>> Shutting down cyrus-imapd:                                 [  OK  ]
>> Starting cyrus-imapd:                                      [  OK  ]
>> Shutting down postfix:                                     [  OK  ]
>> Starting postfix:                                          [  OK  ]
>> modifying entry "associateddomain=kolab.ddol.es,cn=kolab,cn=config"
>>
>> patching file /usr/share/roundcubemail/plugins/kolab_auth/kolab_auth.php
>> Hunk #2 succeeded at 277 (offset 2 lines).
>> Hunk #3 succeeded at 455 (offset -7 lines).
>> Hunk #4 FAILED at 493.
>> 1 out of 4 hunks FAILED -- saving rejects to file
>> /usr/share/roundcubemail/plugins/kolab_auth/kolab_auth.php.rej
>> patching file
>> /usr/share/kolab-syncroton/lib/plugins/kolab_auth/kolab_auth.php
>> Hunk #1 succeeded at 32 with fuzz 2.
>> Hunk #2 FAILED at 259.
>> Hunk #3 FAILED at 438.
>> Hunk #4 succeeded at 450 with fuzz 2 (offset -4 lines).
>> 2 out of 4 hunks FAILED -- saving rejects to file
>> /usr/share/kolab-syncroton/lib/plugins/kolab_auth/kolab_auth.php.rej
>> patching file
>> /usr/share/kolab-webadmin/lib/api/kolab_api_service_domain_types.php
>> patching file /usr/share/kolab-webadmin/lib/Auth/LDAP.php
>> Hunk #2 succeeded at 145 (offset 13 lines).
>> Hunk #3 FAILED at 155.
>> Hunk #4 succeeded at 473 with fuzz 1 (offset 310 lines).
>> Hunk #5 succeeded at 570 (offset 310 lines).
>> Hunk #6 FAILED at 300.
>> Hunk #7 succeeded at 625 (offset 316 lines).
>> 2 out of 7 hunks FAILED -- saving rejects to file
>> /usr/share/kolab-webadmin/lib/Auth/LDAP.php.rej
>> patching file
>> /usr/share/kolab-webadmin/lib/client/kolab_client_task_domain.php
>> Hunk #1 succeeded at 232 (offset 8 lines).
>> Hunk #2 succeeded at 240 (offset 8 lines).
>> patching file /usr/share/kolab-webadmin/lib/kolab_api_service.php
>> Hunk #1 succeeded at 96 with fuzz 2 (offset 10 lines).
>>
>>
>> I've checked the patches  and there are some lines do not fit. For example:
>>
>> --- kolab_auth.php.orig 2013-03-26 15:36:56.388999054 +0100
>> +++ kolab_auth.php      2013-03-26 16:03:38.886999756 +0100
>> @@ -485,6 +493,9 @@
>>              return null;
>>          }
>>
>> +        $addressbook['base_dn'] = "ou=People,".self::$base_dn;
>> +        $addressbook['groups']['base_dn'] = "ou=Groups,".self::$base_dn;
>> +
>>          self::$ldap = new kolab_auth_ldap_backend(
>>              $addressbook,
>>              $rcmail->config->get('ldap_debug'),
>>
>>
>> any help about how can I apply the patches?
>>
>> Thanks & regards.
>>
>> Manel.
>>
>> _______________________________________________
>> devel mailing list
>> devel at lists.kolab.org
>> https://lists.kolab.org/mailman/listinfo/devel