[Kolab-devel] Patches for cyrus imapd 2.3.14 (was: Re: thomas: server/patches/cyrus-imapd/cyrus-imapd-2.3.13 KOLAB_cyrus-imapd-2.3.13_Groups2.patch, 1.1.2.1, 1.1.2.2)

[Gunnar Wrobel]

Quoting Gunnar Wrobel <wrobel at pardus.de>:

> Quoting cvs at kolab.org:
>
>> Author: thomas
>>
>> Update of /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.13
>> In directory doto:/tmp/cvs-serv25163/cyrus-imapd-2.3.13
>>
>> Modified Files:
>>      Tag: kolab_2_2_branch
>> 	KOLAB_cyrus-imapd-2.3.13_Groups2.patch
>> Log Message:
>> Forgotten commit for "Final changes for kolab/issue2535: use strcasecmp ..."
>>
>> Having the imapd patches outside the imapd directory just calls for
>> mistakes like this one ...
>
> I don't care too much for the "patches" directory. It helps in   
> clarifying which upstream packages need patches. But on the other  
> hand  I also see an advantage in having patches within the package  
> directory  (which I actually also do within the Kolab_* packages).  
> And somebody  trying to port the OpenPKG server to another platform  
> will have to  take a close look at the package definitions anyhow.
>
> I would like to keep the general structure though and keep track of   
> the patches for each of the available upstream versions. I think  
> this  is vital information for native ports.

@thomas:

I still had stuff open to merge from the 2_2 branch of the imapd  
package which I did now.

In addition I moved the whole patches directory for cyrus-imapd into  
the imapd package. I kept the basic structure to cope with different  
version numbers and ensure that old patch versions are retained. I  
consider this important for the native distributions that might not  
use the same version as we do on OpenPKG.

I also converted the manual procedure I use to care for the cyrus  
imapd patch series into a Makefile. Mercurial is required to run that  
Makefile. It should try to automatically update the patch series to a  
new version. Conflict resolution when pushing the patch series on the  
new version is of course left to the programmer.

The Makefile has been used to generate the patches for  
cyrus-imapd-2.3.14. One conflict was resolved manually.

I was somehow unable to fetch the imapd-2.3.14-RPM from OpenPKG. So  
the package has not been updated to this newer version.

Please take a look at the changes and comment.

Cheers,

Gunnar

>
> Cheers,
>
> Gunnar
>
>>
>>
>> Index: KOLAB_cyrus-imapd-2.3.13_Groups2.patch
>> ===================================================================
>> RCS file:   
>> /kolabrepository/server/patches/cyrus-imapd/cyrus-imapd-2.3.13/KOLAB_cyrus-imapd-2.3.13_Groups2.patch,v
>> retrieving revision 1.1.2.1
>> retrieving revision 1.1.2.2
>> diff -u -d -r1.1.2.1 -r1.1.2.2
>> --- KOLAB_cyrus-imapd-2.3.13_Groups2.patch	1 Apr 2009 17:03:45 -0000	1.1.2.1
>> +++ KOLAB_cyrus-imapd-2.3.13_Groups2.patch	6 Apr 2009 14:48:35 -0000	1.1.2.2
>> @@ -148,7 +148,7 @@
>> +    if (!groupfile) groupfile = fopen("/etc/group", "r");
>> +    if (groupfile) {
>> +       while ((grp = fgetgrent(groupfile))) {
>> -+         if (strcmp(grp->gr_name, name) == 0) {
>> ++         if (strcasecmp(grp->gr_name, name) == 0) {
>> +           fclose(groupfile);
>> +           return grp;
>> +         }
>> @@ -207,7 +207,7 @@
>> +    if (groupfile) {
>> +       while ((grp = fgetgrent(groupfile))) {
>> +         for (mem = grp->gr_mem; *mem; mem++) {
>> -+            if (!strcmp(*mem, identifier)) break;
>> ++            if (!strcasecmp(*mem, identifier)) break;
>> +         }
>>
>> -	if (*mem || (pwd && pwd->pw_gid == grp->gr_gid)) {
>>
>>
>> _______________________________________________
>> Kolab-commits mailing list
>> Kolab-commits at kolab.org
>> https://kolab.org/mailman/listinfo/kolab-commits
>>
>
>
>
> -- 
> ____ http://www.pardus.de _________________ http://gunnarwrobel.de _
>
> E-mail : p at rdus.de                                 Dr. Gunnar Wrobel
> Tel.   : +49 700 6245 0000                         Bundesstrasse 29
> Fax    : +49 721 1513 52322                        D-20146 Hamburg
> --------------------------------------------------------------------
>    >> Mail at ease - Rent a kolab groupware server at p at rdus <<
> --------------------------------------------------------------------
>
>
> ----------------------------------------------------------------
> This message was sent using IMP, the Internet Messaging Program.
>



-- 
______ http://kdab.com _______________ http://kolab-konsortium.com _

p at rdus Kolab work is funded in part by KDAB and the Kolab Konsortium

____ http://www.pardus.de _________________ http://gunnarwrobel.de _
E-mail : p at rdus.de                                 Dr. Gunnar Wrobel
Tel.   : +49 700 6245 0000                          Bundesstrasse 29
Fax    : +49 721 1513 52322                          D-20146 Hamburg
--------------------------------------------------------------------
    >> Mail at ease - Rent a kolab groupware server at p at rdus <<
--------------------------------------------------------------------


----------------------------------------------------------------
This message was sent using IMP, the Internet Messaging Program.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.kolab.org/pipermail/devel/attachments/20090423/590b2680/attachment.sig>