diff --git a/SOPE/sope-patchset-r1660.diff b/SOPE/sope-patchset-r1660.diff index b629bc431..167dae849 100644 --- a/SOPE/sope-patchset-r1660.diff +++ b/SOPE/sope-patchset-r1660.diff @@ -1,7 +1,7 @@ Index: sope-ldap/NGLdap/NGLdapEntry.m =================================================================== ---- sope-ldap/NGLdap/NGLdapEntry.m (révision 1660) -+++ sope-ldap/NGLdap/NGLdapEntry.m (copie de travail) +--- sope-ldap/NGLdap/NGLdapEntry.m (revision 1660) ++++ sope-ldap/NGLdap/NGLdapEntry.m (working copy) @@ -105,14 +105,16 @@ - (NGLdapAttribute *)attributeWithName:(NSString *)_name { NSEnumerator *e; @@ -23,8 +23,8 @@ Index: sope-ldap/NGLdap/NGLdapEntry.m return nil; Index: sope-ldap/NGLdap/ChangeLog =================================================================== ---- sope-ldap/NGLdap/ChangeLog (révision 1660) -+++ sope-ldap/NGLdap/ChangeLog (copie de travail) +--- sope-ldap/NGLdap/ChangeLog (revision 1660) ++++ sope-ldap/NGLdap/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2009-08-13 Wolfgang Sourdeau + @@ -36,8 +36,8 @@ Index: sope-ldap/NGLdap/ChangeLog * NGLdapConnection.m (useSSL,startTLS): new method enabling Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m =================================================================== ---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (révision 1660) -+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail) +--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1660) ++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) @@ -713,6 +713,39 @@ return ms; } @@ -80,8 +80,8 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m @implementation PostgreSQL72Channel(PrimaryKeyGeneration) Index: sope-gdl1/MySQL/MySQL4Channel.m =================================================================== ---- sope-gdl1/MySQL/MySQL4Channel.m (révision 1660) -+++ sope-gdl1/MySQL/MySQL4Channel.m (copie de travail) +--- sope-gdl1/MySQL/MySQL4Channel.m (revision 1660) ++++ sope-gdl1/MySQL/MySQL4Channel.m (working copy) @@ -755,6 +755,39 @@ return pkey; } @@ -124,8 +124,8 @@ Index: sope-gdl1/MySQL/MySQL4Channel.m void __link_MySQL4Channel() { Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m =================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannel.m (révision 1660) -+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail) +--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1660) ++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) @@ -1,7 +1,7 @@ /* ** OracleAdaptorChannel.m @@ -389,8 +389,8 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m @" c_lastmodified INTEGER NOT NULL,\n" Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m =================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (révision 1660) -+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail) +--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1660) ++++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) @@ -31,6 +31,8 @@ #import #import @@ -437,8 +437,8 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m Index: sope-mime/NGImap4/NGImap4Functions.m =================================================================== ---- sope-mime/NGImap4/NGImap4Functions.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4Functions.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Functions.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4Functions.m (working copy) @@ -367,3 +367,16 @@ } @@ -458,8 +458,8 @@ Index: sope-mime/NGImap4/NGImap4Functions.m +} Index: sope-mime/NGImap4/NGImap4Client.h =================================================================== ---- sope-mime/NGImap4/NGImap4Client.h (révision 1660) -+++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.h (revision 1660) ++++ sope-mime/NGImap4/NGImap4Client.h (working copy) @@ -62,6 +62,8 @@ NGImap4ResponseNormalizer *normer; NSMutableArray *responseReceiver; @@ -488,8 +488,8 @@ Index: sope-mime/NGImap4/NGImap4Client.h - (NSDictionary *)copyUid:(unsigned)_uid toFolder:(NSString *)_folder; Index: sope-mime/NGImap4/NGImap4Client.m =================================================================== ---- sope-mime/NGImap4/NGImap4Client.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4Client.m (working copy) @@ -24,6 +24,8 @@ #include "NGImap4Client.h" #include "NGImap4Context.h" @@ -1001,8 +1001,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m - (void)setContext:(NGImap4Context *)_ctx { Index: sope-mime/NGImap4/NGSieveClient.m =================================================================== ---- sope-mime/NGImap4/NGSieveClient.m (révision 1660) -+++ sope-mime/NGImap4/NGSieveClient.m (copie de travail) +--- sope-mime/NGImap4/NGSieveClient.m (revision 1660) ++++ sope-mime/NGImap4/NGSieveClient.m (working copy) @@ -294,8 +294,8 @@ return con; } @@ -1037,8 +1037,8 @@ Index: sope-mime/NGImap4/NGSieveClient.m /* write */ Index: sope-mime/NGImap4/NGImap4Connection.h =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.h (révision 1660) -+++ sope-mime/NGImap4/NGImap4Connection.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.h (revision 1660) ++++ sope-mime/NGImap4/NGImap4Connection.h (working copy) @@ -89,6 +89,9 @@ - (NSArray *)subfoldersForURL:(NSURL *)_url; @@ -1051,8 +1051,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.m =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4Connection.m (working copy) @@ -22,6 +22,7 @@ #include "NGImap4Connection.h" #include "NGImap4MailboxInfo.h" @@ -1191,8 +1191,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.m /* create */ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) @@ -76,22 +76,6 @@ return self; } @@ -1290,8 +1290,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m if (objs) free(objs); Index: sope-mime/NGImap4/EOQualifier+IMAPAdditions.m =================================================================== ---- sope-mime/NGImap4/EOQualifier+IMAPAdditions.m (révision 1660) -+++ sope-mime/NGImap4/EOQualifier+IMAPAdditions.m (copie de travail) +--- sope-mime/NGImap4/EOQualifier+IMAPAdditions.m (revision 1660) ++++ sope-mime/NGImap4/EOQualifier+IMAPAdditions.m (working copy) @@ -53,13 +53,13 @@ if (FlagKeyWords) return; @@ -1451,8 +1451,8 @@ Index: sope-mime/NGImap4/EOQualifier+IMAPAdditions.m [search appendString:[lvalue stringValue]]; Index: sope-mime/NGImap4/NGImap4ResponseParser.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseParser.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) @@ -31,6 +31,7 @@ @interface NGImap4ResponseParser(ParsingPrivates) - (BOOL)_parseNumberUntaggedResponse:(NGMutableHashMap *)result_; @@ -1931,8 +1931,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m self->serverResponseDebug = Index: sope-mime/NGImap4/ChangeLog =================================================================== ---- sope-mime/NGImap4/ChangeLog (révision 1660) -+++ sope-mime/NGImap4/ChangeLog (copie de travail) +--- sope-mime/NGImap4/ChangeLog (revision 1660) ++++ sope-mime/NGImap4/ChangeLog (working copy) @@ -1,3 +1,61 @@ +2009-10-06 Wolfgang Sourdeau + @@ -1997,8 +1997,8 @@ Index: sope-mime/NGImap4/ChangeLog * NGImap4Connection.m: some fix for folders ending with a slash (OGo Index: sope-mime/NGImap4/NGImap4ConnectionManager.m =================================================================== ---- sope-mime/NGImap4/NGImap4ConnectionManager.m (révision 1660) -+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1660) ++++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) @@ -38,6 +38,9 @@ debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"]; @@ -2124,8 +2124,8 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m /* client object */ Index: sope-mime/NGImap4/NSString+Imap4.m =================================================================== ---- sope-mime/NGImap4/NSString+Imap4.m (révision 1660) -+++ sope-mime/NGImap4/NSString+Imap4.m (copie de travail) +--- sope-mime/NGImap4/NSString+Imap4.m (revision 1660) ++++ sope-mime/NGImap4/NSString+Imap4.m (working copy) @@ -20,117 +20,86 @@ 02111-1307, USA. */ @@ -2688,8 +2688,8 @@ Index: sope-mime/NGImap4/NSString+Imap4.m -} Index: sope-mime/NGImap4/NGImap4Functions.h =================================================================== ---- sope-mime/NGImap4/NGImap4Functions.h (révision 1660) -+++ sope-mime/NGImap4/NGImap4Functions.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Functions.h (revision 1660) ++++ sope-mime/NGImap4/NGImap4Functions.h (working copy) @@ -58,4 +58,6 @@ id_folder); BOOL _createSubFolderWithName(id self, NSString *_name, BOOL _app); @@ -2699,8 +2699,8 @@ Index: sope-mime/NGImap4/NGImap4Functions.h #endif /* __NGMime_NGImap4_NGImap4Functions_H__ */ Index: sope-mime/NGMail/NGMailAddressParser.h =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.h (révision 1660) -+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.h (revision 1660) ++++ sope-mime/NGMail/NGMailAddressParser.h (working copy) @@ -24,7 +24,9 @@ #import @@ -2737,8 +2737,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMimeMessageGenerator.m =================================================================== ---- sope-mime/NGMail/NGMimeMessageGenerator.m (révision 1660) -+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) +--- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1660) ++++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) @@ -86,37 +86,40 @@ char *des = NULL; unsigned int cnt; @@ -2803,8 +2803,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m unsigned isoEndLen = 2; Index: sope-mime/NGMail/NGMailAddressParser.m =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.m (révision 1660) -+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.m (revision 1660) ++++ sope-mime/NGMail/NGMailAddressParser.m (working copy) @@ -52,9 +52,9 @@ StrClass = [NSString class]; } @@ -2948,8 +2948,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m self->dataPos = 0; Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m =================================================================== ---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (révision 1660) -+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1660) ++++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) @@ -19,88 +19,45 @@ 02111-1307, USA. */ @@ -3353,8 +3353,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m #if 0 Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeMultipartBodyParser.m (révision 1660) -+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1660) ++++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) @@ -428,6 +428,7 @@ NSString *boundary = nil; NSArray *rawBodyParts = nil; @@ -3378,8 +3378,8 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m if (rawBodyParts) { Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m =================================================================== ---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (révision 1660) -+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) +--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1660) ++++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) @@ -77,6 +77,7 @@ [rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:Fields->from]; @@ -3390,8 +3390,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeType.m =================================================================== ---- sope-mime/NGMime/NGMimeType.m (révision 1660) -+++ sope-mime/NGMime/NGMimeType.m (copie de travail) +--- sope-mime/NGMime/NGMimeType.m (revision 1660) ++++ sope-mime/NGMime/NGMimeType.m (working copy) @@ -120,30 +120,30 @@ /* some unsupported, but known encoding */ @@ -3496,8 +3496,8 @@ Index: sope-mime/NGMime/NGMimeType.m - (NSString *)stringValue { Index: sope-mime/NGMime/NGMimeBodyPart.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyPart.m (révision 1660) -+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyPart.m (revision 1660) ++++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) @@ -31,18 +31,6 @@ return 2; } @@ -3534,8 +3534,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m - (NSString *)contentId { Index: sope-mime/NGMime/ChangeLog =================================================================== ---- sope-mime/NGMime/ChangeLog (révision 1660) -+++ sope-mime/NGMime/ChangeLog (copie de travail) +--- sope-mime/NGMime/ChangeLog (revision 1660) ++++ sope-mime/NGMime/ChangeLog (working copy) @@ -1,3 +1,25 @@ +2008-09-08 Wolfgang Sourdeau + @@ -3564,8 +3564,8 @@ Index: sope-mime/NGMime/ChangeLog * fixes for OGo bug #789 (reply-to QP encoding) Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (révision 1660) -+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1660) ++++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) @@ -36,8 +36,7 @@ NGMimeType *type = nil; // only one content-type field NSString *tmp = nil; @@ -3704,8 +3704,8 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m } Index: sope-mime/NGMime/NGMimePartGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimePartGenerator.m (révision 1660) -+++ sope-mime/NGMime/NGMimePartGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimePartGenerator.m (revision 1660) ++++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) @@ -155,8 +155,9 @@ BOOL isMultiValue, isFirst; @@ -3729,8 +3729,8 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimeBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyParser.m (révision 1660) -+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyParser.m (revision 1660) ++++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) @@ -67,7 +67,10 @@ if (_data == nil) return nil; @@ -3768,8 +3768,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m } Index: sope-mime/NGMime/NGMimePartParser.h =================================================================== ---- sope-mime/NGMime/NGMimePartParser.h (révision 1660) -+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.h (revision 1660) ++++ sope-mime/NGMime/NGMimePartParser.h (working copy) @@ -117,6 +117,7 @@ BOOL parserParseRawBodyDataOfPart:1; BOOL parserBodyParserForPart:1; @@ -3790,8 +3790,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h @interface NSObject(NGMimePartParser) Index: sope-mime/NGMime/NGMimePartParser.m =================================================================== ---- sope-mime/NGMime/NGMimePartParser.m (révision 1660) -+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.m (revision 1660) ++++ sope-mime/NGMime/NGMimePartParser.m (working copy) @@ -227,7 +227,7 @@ } @@ -3815,8 +3815,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m : [NGMimeType mimeType:[ctype stringValue]]; Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (révision 1660) -+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1660) ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) @@ -105,10 +105,10 @@ } @@ -3901,8 +3901,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m return data; Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (révision 1660) -+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1660) ++++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) @@ -49,80 +49,70 @@ // TODO: move the stuff below to some NSString or NSData category? @@ -4037,8 +4037,8 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m } Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (révision 1660) -+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) +--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1660) ++++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) @@ -30,6 +30,7 @@ @interface NSString(GSAdditions) @@ -4075,8 +4075,8 @@ Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h /* specific to libFoundation */ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (révision 1660) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1660) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) @@ -39,18 +39,6 @@ : (NSString *)[[self copy] autorelease]; } @@ -4164,8 +4164,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m - (BOOL)isAbsoluteURL Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (révision 1660) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1660) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) @@ -140,8 +140,12 @@ @@ -4207,8 +4207,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (révision 1660) -+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) +--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1660) ++++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) @@ -19,6 +19,7 @@ 02111-1307, USA. */ @@ -4217,10 +4217,28 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m #import #import +Index: sope-core/NGStreams/NGStream+serialization.m +=================================================================== +--- sope-core/NGStreams/NGStream+serialization.m (revision 1660) ++++ sope-core/NGStreams/NGStream+serialization.m (working copy) +@@ -282,10 +282,10 @@ + else { + char *result = NULL; + +-#if NeXT_Foundation_LIBRARY ++#if LIB_FOUNDATION_LIBRARY ++ result = NSZoneMallocAtomic(NULL, len + 1); ++#else + result = NSZoneMalloc(NULL, len + 1); +-#else +- result = NSZoneMallocAtomic(NULL, len + 1); + #endif + result[len] = '\0'; + Index: sope-core/NGStreams/NGStreams/NGDatagramSocket.h =================================================================== ---- sope-core/NGStreams/NGStreams/NGDatagramSocket.h (révision 1660) -+++ sope-core/NGStreams/NGStreams/NGDatagramSocket.h (copie de travail) +--- sope-core/NGStreams/NGStreams/NGDatagramSocket.h (revision 1660) ++++ sope-core/NGStreams/NGStreams/NGDatagramSocket.h (working copy) @@ -69,7 +69,7 @@ + (id)socketBoundToAddress:(id)_address; @@ -4232,8 +4250,8 @@ Index: sope-core/NGStreams/NGStreams/NGDatagramSocket.h // accessors Index: sope-core/NGStreams/NGStreams/NGActiveSocket.h =================================================================== ---- sope-core/NGStreams/NGStreams/NGActiveSocket.h (révision 1660) -+++ sope-core/NGStreams/NGStreams/NGActiveSocket.h (copie de travail) +--- sope-core/NGStreams/NGStreams/NGActiveSocket.h (revision 1660) ++++ sope-core/NGStreams/NGStreams/NGActiveSocket.h (working copy) @@ -60,7 +60,7 @@ - (id)initWithDomain:(id)_domain; // designated initializer @@ -4243,10 +4261,23 @@ Index: sope-core/NGStreams/NGStreams/NGActiveSocket.h #endif // ******************** operations ******************** +Index: sope-core/NGStreams/NGGZipStream.m +=================================================================== +--- sope-core/NGStreams/NGGZipStream.m (revision 1660) ++++ sope-core/NGStreams/NGGZipStream.m (working copy) +@@ -52,7 +52,7 @@ + @"invalid compression level %i (0-9)", _level); + + self->outBufLen = 2048; +-#if GNU_RUNTIME ++#if LIB_FOUNDATION_LIBRARY + self->outBuf = NSZoneMallocAtomic([self zone], self->outBufLen); + self->outp = NSZoneMallocAtomic([self zone], sizeof(z_stream)); + #else Index: sope-core/NGStreams/NGDatagramSocket.m =================================================================== ---- sope-core/NGStreams/NGDatagramSocket.m (révision 1660) -+++ sope-core/NGStreams/NGDatagramSocket.m (copie de travail) +--- sope-core/NGStreams/NGDatagramSocket.m (revision 1660) ++++ sope-core/NGStreams/NGDatagramSocket.m (working copy) @@ -25,6 +25,8 @@ #endif @@ -4293,8 +4324,8 @@ Index: sope-core/NGStreams/NGDatagramSocket.m } Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (révision 1660) -+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) +--- sope-core/NGStreams/GNUmakefile.preamble (revision 1660) ++++ sope-core/NGStreams/GNUmakefile.preamble (working copy) @@ -1,6 +1,7 @@ # compilation settings @@ -4306,8 +4337,8 @@ Index: sope-core/NGStreams/GNUmakefile.preamble -I$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS) \ Index: sope-core/NGStreams/ChangeLog =================================================================== ---- sope-core/NGStreams/ChangeLog (révision 1660) -+++ sope-core/NGStreams/ChangeLog (copie de travail) +--- sope-core/NGStreams/ChangeLog (revision 1660) ++++ sope-core/NGStreams/ChangeLog (working copy) @@ -1,3 +1,14 @@ +2009-11-11 Wolfgang Sourdeau + @@ -4323,10 +4354,29 @@ Index: sope-core/NGStreams/ChangeLog 2009-03-24 Wolfgang Sourdeau * GNUmakefile.preamble: add machine-type to include path (eg i386) (v4.7.57) +Index: sope-core/NGStreams/NGCharBuffer.m +=================================================================== +--- sope-core/NGStreams/NGCharBuffer.m (revision 1660) ++++ sope-core/NGStreams/NGCharBuffer.m (working copy) +@@ -46,11 +46,11 @@ + // Find first power of 2 >= to requested size + for (size = 2; size < _la; size *=2); + +-#if NeXT_Foundation_LIBRARY +- self->la = NSZoneMalloc([self zone], sizeof(LA_NGCharBuffer) * size); +-#else ++#if LIB_FOUNDATION_LIBRARY + self->la = NSZoneMallocAtomic([self zone], + sizeof(LA_NGCharBuffer) * size); ++#else ++ self->la = NSZoneMalloc([self zone], sizeof(LA_NGCharBuffer) * size); + #endif + memset(self->la, 0, sizeof(LA_NGCharBuffer) * size); + Index: sope-core/NGStreams/NGActiveSocket.m =================================================================== ---- sope-core/NGStreams/NGActiveSocket.m (révision 1660) -+++ sope-core/NGStreams/NGActiveSocket.m (copie de travail) +--- sope-core/NGStreams/NGActiveSocket.m (revision 1660) ++++ sope-core/NGStreams/NGActiveSocket.m (working copy) @@ -62,6 +62,8 @@ #include "common.h" @@ -4415,8 +4465,8 @@ Index: sope-core/NGStreams/NGActiveSocket.m - (NSTimeInterval)receiveTimeout { Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (révision 1660) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1660) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) @@ -19,6 +19,8 @@ 02111-1307, USA. */ @@ -4437,8 +4487,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h id entityResolver; Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (révision 1660) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1660) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) @@ -200,10 +200,10 @@ return self->entityResolver; } @@ -4454,8 +4504,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m Index: sope-appserver/mod_ngobjweb/GNUmakefile =================================================================== ---- sope-appserver/mod_ngobjweb/GNUmakefile (révision 1660) -+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) +--- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1660) ++++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) @@ -82,7 +82,7 @@ CFLAGS = -Wall -I. -fPIC \ @@ -4477,8 +4527,8 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ Index: sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m =================================================================== ---- sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m (copie de travail) +--- sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m (working copy) @@ -1,5 +1,6 @@ /* Copyright (C) 2000-2005 SKYRIX Software AG @@ -5737,8 +5787,8 @@ Index: sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m if (((sd == nil) || (sd == ud)) && (appDomainPath != nil)) { Index: sope-appserver/NGObjWeb/GNUmakefile.postamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.postamble (révision 1660) -+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) +--- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1660) ++++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) @@ -23,14 +23,20 @@ # install makefiles @@ -5769,8 +5819,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make Index: sope-appserver/NGObjWeb/WOMessage+XML.m =================================================================== ---- sope-appserver/NGObjWeb/WOMessage+XML.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOMessage+XML.m (copie de travail) +--- sope-appserver/NGObjWeb/WOMessage+XML.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOMessage+XML.m (working copy) @@ -84,7 +84,7 @@ id builder; @@ -5782,8 +5832,8 @@ Index: sope-appserver/NGObjWeb/WOMessage+XML.m /* cache DOM structure */ Index: sope-appserver/NGObjWeb/ChangeLog =================================================================== ---- sope-appserver/NGObjWeb/ChangeLog (révision 1660) -+++ sope-appserver/NGObjWeb/ChangeLog (copie de travail) +--- sope-appserver/NGObjWeb/ChangeLog (revision 1660) ++++ sope-appserver/NGObjWeb/ChangeLog (working copy) @@ -1,3 +1,56 @@ +2009-11-11 Wolfgang Sourdeau + @@ -5843,8 +5893,8 @@ Index: sope-appserver/NGObjWeb/ChangeLog * DAVPropMap.plist: mapped {DAV:}current-user-principal (v4.9.37) Index: sope-appserver/NGObjWeb/DAVPropMap.plist =================================================================== ---- sope-appserver/NGObjWeb/DAVPropMap.plist (révision 1660) -+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) +--- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1660) ++++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) @@ -157,6 +157,7 @@ "{urn:ietf:params:xml:ns:caldav}supported-calendar-data" = davSupportedCalendarDataTypes; @@ -5855,8 +5905,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{urn:ietf:params:xml:ns:carddav}addressbook-home-set" = davAddressbookHomeSet; Index: sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m (révision 1660) -+++ sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m (revision 1660) ++++ sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m (working copy) @@ -25,7 +25,14 @@ @implementation SoObjectResultEntry @@ -5914,8 +5964,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectResultEntry.m Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (révision 1660) -+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1660) ++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) @@ -49,6 +49,8 @@ #define XMLNS_INTTASK \ @"{http://schemas.microsoft.com/mapi/id/{00062003-0000-0000-C000-000000000046}/}" @@ -5980,8 +6030,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m } Index: sope-appserver/NGObjWeb/WODirectAction.m =================================================================== ---- sope-appserver/NGObjWeb/WODirectAction.m (révision 1660) -+++ sope-appserver/NGObjWeb/WODirectAction.m (copie de travail) +--- sope-appserver/NGObjWeb/WODirectAction.m (revision 1660) ++++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) @@ -46,7 +46,7 @@ } - (id)initWithContext:(WOContext *)_ctx { @@ -6015,8 +6065,8 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (révision 1660) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1660) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) @@ -216,6 +216,12 @@ assocCount++; } @@ -6032,8 +6082,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (révision 1660) -+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1660) ++++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) @@ -41,6 +41,7 @@ WOAssociation *string; WOAssociation *target; @@ -6065,8 +6115,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m return NO; Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (révision 1660) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1660) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) @@ -41,7 +41,8 @@ WOAssociation *pageName; WOAssociation *actionClass; @@ -6079,8 +6129,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h /* 'ivar' associations */ Index: sope-appserver/NGObjWeb/WOMessage.m =================================================================== ---- sope-appserver/NGObjWeb/WOMessage.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOMessage.m (copie de travail) +--- sope-appserver/NGObjWeb/WOMessage.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOMessage.m (working copy) @@ -182,7 +182,7 @@ NSString *key; @@ -6161,8 +6211,8 @@ Index: sope-appserver/NGObjWeb/WOMessage.m } Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (révision 1660) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1660) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) @@ -39,22 +39,34 @@ static int debugLookup = -1; static int debugBaseURL = -1; @@ -6312,8 +6362,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h =================================================================== ---- sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h (révision 1660) -+++ sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h (copie de travail) +--- sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h (revision 1660) ++++ sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h (working copy) @@ -27,6 +27,13 @@ @class NSString, NSDictionary; @class WOCoreApplication; @@ -6330,8 +6380,8 @@ Index: sope-appserver/NGObjWeb/NGObjWeb/WOAdaptor.h @protected Index: sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h =================================================================== ---- sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h (révision 1660) -+++ sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h (copie de travail) +--- sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h (revision 1660) ++++ sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h (working copy) @@ -31,6 +31,8 @@ @class WOAdaptor, WORequest, WOResponse, WORequestHandler; @class NSBundle; @@ -6368,8 +6418,8 @@ Index: sope-appserver/NGObjWeb/NGObjWeb/WOCoreApplication.h - (NSArray *)adaptors; Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h (révision 1660) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h (copie de travail) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h (revision 1660) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h (working copy) @@ -46,7 +46,6 @@ NSMutableArray *delayedResponses; } @@ -6380,8 +6430,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.h @end Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) @@ -48,8 +48,8 @@ NSString *WOAsyncResponseReadyNotificationName = @"WOAsyncResponseReadyNotification"; @@ -6459,8 +6509,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m (copie de travail) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m (working copy) @@ -71,18 +71,13 @@ static NGLogger *logger = nil; @@ -6876,8 +6926,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpAdaptor.m [[NSNotificationCenter defaultCenter] Index: sope-appserver/NGObjWeb/WOCoreApplication.m =================================================================== ---- sope-appserver/NGObjWeb/WOCoreApplication.m (révision 1660) -+++ sope-appserver/NGObjWeb/WOCoreApplication.m (copie de travail) +--- sope-appserver/NGObjWeb/WOCoreApplication.m (revision 1660) ++++ sope-appserver/NGObjWeb/WOCoreApplication.m (working copy) @@ -190,6 +190,9 @@ forSignal:SIGHUP immediatelyNotifyOnSignal:NO]; }