From 897fdccf52f28163211b0152f99fffd289ebc15f Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 13:41:44 +0000 Subject: [PATCH 01/10] Monotone-Parent: cb528516476836d7575692fe4e1cd2380c58f2d9 Monotone-Revision: 478e5eec344abe2e6946e22b5c853865f80a2b66 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T13:41:44 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-gsmake2.diff | 252 +++++++-------- ...et-r1630.diff => sope-patchset-r1632.diff} | 298 ++++++++++-------- 2 files changed, 291 insertions(+), 259 deletions(-) rename SOPE/{sope-patchset-r1630.diff => sope-patchset-r1632.diff} (93%) diff --git a/SOPE/sope-gsmake2.diff b/SOPE/sope-gsmake2.diff index 0e55cdc68..a2172e35f 100644 --- a/SOPE/sope-gsmake2.diff +++ b/SOPE/sope-gsmake2.diff @@ -1,6 +1,6 @@ Index: configure =================================================================== ---- configure (révision 1608) +--- configure (rĂ©vision 1632) +++ configure (copie de travail) @@ -1,4 +1,4 @@ -#!/bin/bash @@ -316,7 +316,7 @@ Index: configure fi Index: sope-ldap/samples/GNUmakefile =================================================================== ---- sope-ldap/samples/GNUmakefile (révision 1608) +--- sope-ldap/samples/GNUmakefile (rĂ©vision 1632) +++ sope-ldap/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -345,7 +345,7 @@ Index: sope-ldap/samples/GNUmakefile --include fhs.make Index: sope-ldap/NGLdap/GNUmakefile =================================================================== ---- sope-ldap/NGLdap/GNUmakefile (révision 1608) +--- sope-ldap/NGLdap/GNUmakefile (rĂ©vision 1632) +++ sope-ldap/NGLdap/GNUmakefile (copie de travail) @@ -1,11 +1,9 @@ # GNUstep makefile @@ -386,7 +386,7 @@ Index: sope-ldap/NGLdap/GNUmakefile --include fhs.make Index: sope-ldap/GNUmakefile =================================================================== ---- sope-ldap/GNUmakefile (révision 1608) +--- sope-ldap/GNUmakefile (rĂ©vision 1632) +++ sope-ldap/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -398,7 +398,7 @@ Index: sope-ldap/GNUmakefile PACKAGE_NAME=sope-ldap Index: GNUmakefile =================================================================== ---- GNUmakefile (révision 1608) +--- GNUmakefile (rĂ©vision 1632) +++ GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -419,7 +419,7 @@ Index: GNUmakefile distclean :: Index: sope-gdl1/PostgreSQL/GNUmakefile.preamble =================================================================== ---- sope-gdl1/PostgreSQL/GNUmakefile.preamble (révision 1608) +--- sope-gdl1/PostgreSQL/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-gdl1/PostgreSQL/GNUmakefile.preamble (copie de travail) @@ -27,7 +27,7 @@ ifeq ($(frameworks),yes) @@ -432,7 +432,7 @@ Index: sope-gdl1/PostgreSQL/GNUmakefile.preamble Index: sope-gdl1/PostgreSQL/GNUmakefile =================================================================== ---- sope-gdl1/PostgreSQL/GNUmakefile (révision 1608) +--- sope-gdl1/PostgreSQL/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/PostgreSQL/GNUmakefile (copie de travail) @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, @@ -450,7 +450,7 @@ Index: sope-gdl1/PostgreSQL/GNUmakefile -include fhs.make Index: sope-gdl1/SQLite3/GNUmakefile.preamble =================================================================== ---- sope-gdl1/SQLite3/GNUmakefile.preamble (révision 1608) +--- sope-gdl1/SQLite3/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-gdl1/SQLite3/GNUmakefile.preamble (copie de travail) @@ -27,7 +27,7 @@ ifeq ($(frameworks),yes) @@ -463,7 +463,7 @@ Index: sope-gdl1/SQLite3/GNUmakefile.preamble Index: sope-gdl1/SQLite3/GNUmakefile =================================================================== ---- sope-gdl1/SQLite3/GNUmakefile (révision 1608) +--- sope-gdl1/SQLite3/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/SQLite3/GNUmakefile (copie de travail) @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, @@ -481,7 +481,7 @@ Index: sope-gdl1/SQLite3/GNUmakefile -include fhs.make Index: sope-gdl1/FrontBase2/GNUmakefile =================================================================== ---- sope-gdl1/FrontBase2/GNUmakefile (révision 1608) +--- sope-gdl1/FrontBase2/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/FrontBase2/GNUmakefile (copie de travail) @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, @@ -512,7 +512,7 @@ Index: sope-gdl1/FrontBase2/GNUmakefile BUNDLE_EXTENSION = .gdladaptor Index: sope-gdl1/MySQL/GNUmakefile.preamble =================================================================== ---- sope-gdl1/MySQL/GNUmakefile.preamble (révision 1608) +--- sope-gdl1/MySQL/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-gdl1/MySQL/GNUmakefile.preamble (copie de travail) @@ -27,7 +27,7 @@ ifeq ($(frameworks),yes) @@ -525,7 +525,7 @@ Index: sope-gdl1/MySQL/GNUmakefile.preamble Index: sope-gdl1/MySQL/GNUmakefile =================================================================== ---- sope-gdl1/MySQL/GNUmakefile (révision 1608) +--- sope-gdl1/MySQL/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/MySQL/GNUmakefile (copie de travail) @@ -22,7 +22,7 @@ # If not, write to the Free Software Foundation, @@ -543,7 +543,7 @@ Index: sope-gdl1/MySQL/GNUmakefile -include fhs.make Index: sope-gdl1/GNUmakefile =================================================================== ---- sope-gdl1/GNUmakefile (révision 1608) +--- sope-gdl1/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -555,7 +555,7 @@ Index: sope-gdl1/GNUmakefile PACKAGE_NAME=sope-gdl1 Index: sope-gdl1/GDLAccess/GNUmakefile.preamble =================================================================== ---- sope-gdl1/GDLAccess/GNUmakefile.preamble (révision 1608) +--- sope-gdl1/GDLAccess/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/GNUmakefile.preamble (copie de travail) @@ -21,17 +21,12 @@ -I$(SOPE_ROOT)/sope-core/NGExtensions/ @@ -579,7 +579,7 @@ Index: sope-gdl1/GDLAccess/GNUmakefile.preamble libGDLAccess_LIBRARIES_DEPEND_UPON += -lEOControl Index: sope-gdl1/GDLAccess/GNUmakefile =================================================================== ---- sope-gdl1/GDLAccess/GNUmakefile (révision 1608) +--- sope-gdl1/GDLAccess/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/GNUmakefile (copie de travail) @@ -1,12 +1,10 @@ # GNUstep makefile @@ -631,7 +631,7 @@ Index: sope-gdl1/GDLAccess/GNUmakefile -include fhs.make Index: sope-gdl1/GDLAccess/EOAdaptor.h =================================================================== ---- sope-gdl1/GDLAccess/EOAdaptor.h (révision 1608) +--- sope-gdl1/GDLAccess/EOAdaptor.h (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/EOAdaptor.h (copie de travail) @@ -62,11 +62,14 @@ + (id)adaptorWithModel:(EOModel *)aModel; @@ -650,7 +650,7 @@ Index: sope-gdl1/GDLAccess/EOAdaptor.h - (NSDictionary*)connectionDictionary; Index: sope-gdl1/GDLAccess/EOAdaptor.m =================================================================== ---- sope-gdl1/GDLAccess/EOAdaptor.m (révision 1608) +--- sope-gdl1/GDLAccess/EOAdaptor.m (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/EOAdaptor.m (copie de travail) @@ -53,14 +53,23 @@ + (NSArray *)adaptorSearchPathes { @@ -718,7 +718,7 @@ Index: sope-gdl1/GDLAccess/EOAdaptor.m "Database URLs" Index: sope-gdl1/GDLAccess/FoundationExt/GNUmakefile =================================================================== ---- sope-gdl1/GDLAccess/FoundationExt/GNUmakefile (révision 1608) +--- sope-gdl1/GDLAccess/FoundationExt/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/FoundationExt/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -730,7 +730,7 @@ Index: sope-gdl1/GDLAccess/FoundationExt/GNUmakefile include ../Version Index: sope-gdl1/GDLAccess/common.h =================================================================== ---- sope-gdl1/GDLAccess/common.h (révision 1608) +--- sope-gdl1/GDLAccess/common.h (rĂ©vision 1632) +++ sope-gdl1/GDLAccess/common.h (copie de travail) @@ -42,7 +42,7 @@ #import @@ -743,7 +743,7 @@ Index: sope-gdl1/GDLAccess/common.h Index: sope-gdl1/Oracle8/GNUmakefile =================================================================== ---- sope-gdl1/Oracle8/GNUmakefile (révision 1608) +--- sope-gdl1/Oracle8/GNUmakefile (rĂ©vision 1632) +++ sope-gdl1/Oracle8/GNUmakefile (copie de travail) @@ -19,7 +19,7 @@ # License along with this library; if not, write to the Free Software @@ -765,7 +765,7 @@ Index: sope-gdl1/Oracle8/GNUmakefile Oracle8_OBJC_FILES = \ Index: sope-mime/NGImap4/GNUmakefile =================================================================== ---- sope-mime/NGImap4/GNUmakefile (révision 1608) +--- sope-mime/NGImap4/GNUmakefile (rĂ©vision 1632) +++ sope-mime/NGImap4/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -789,7 +789,7 @@ Index: sope-mime/NGImap4/GNUmakefile else Index: sope-mime/samples/GNUmakefile =================================================================== ---- sope-mime/samples/GNUmakefile (révision 1608) +--- sope-mime/samples/GNUmakefile (rĂ©vision 1632) +++ sope-mime/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -827,7 +827,7 @@ Index: sope-mime/samples/GNUmakefile --include fhs.make Index: sope-mime/NGMail/GNUmakefile =================================================================== ---- sope-mime/NGMail/GNUmakefile (révision 1608) +--- sope-mime/NGMail/GNUmakefile (rĂ©vision 1632) +++ sope-mime/NGMail/GNUmakefile (copie de travail) @@ -1,10 +1,8 @@ # GNUstep makefile @@ -853,7 +853,7 @@ Index: sope-mime/NGMail/GNUmakefile else Index: sope-mime/GNUmakefile =================================================================== ---- sope-mime/GNUmakefile (révision 1608) +--- sope-mime/GNUmakefile (rĂ©vision 1632) +++ sope-mime/GNUmakefile (copie de travail) @@ -1,11 +1,9 @@ # GNUstep makefile @@ -898,7 +898,7 @@ Index: sope-mime/GNUmakefile # package Index: sope-mime/NGMime/GNUmakefile.preamble =================================================================== ---- sope-mime/NGMime/GNUmakefile.preamble (révision 1608) +--- sope-mime/NGMime/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-mime/NGMime/GNUmakefile.preamble (copie de travail) @@ -5,6 +5,15 @@ -DLIBRARY_MINOR_VERSION=${MINOR_VERSION} \ @@ -918,7 +918,7 @@ Index: sope-mime/NGMime/GNUmakefile.preamble -I../../sope-core/NGStreams/ \ Index: sope-mime/NGMime/GNUmakefile =================================================================== ---- sope-mime/NGMime/GNUmakefile (révision 1608) +--- sope-mime/NGMime/GNUmakefile (rĂ©vision 1632) +++ sope-mime/NGMime/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -939,7 +939,7 @@ Index: sope-mime/NGMime/GNUmakefile -include GNUmakefile.postamble Index: sope-core/NGExtensions/NGExtensions/NGResourceLocator.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NGResourceLocator.h (révision 1608) +--- sope-core/NGExtensions/NGExtensions/NGResourceLocator.h (rĂ©vision 1632) +++ sope-core/NGExtensions/NGExtensions/NGResourceLocator.h (copie de travail) @@ -52,23 +52,54 @@ int reserved:29; @@ -999,7 +999,7 @@ Index: sope-core/NGExtensions/NGExtensions/NGResourceLocator.h Index: sope-core/NGExtensions/NGBundleManager.m =================================================================== ---- sope-core/NGExtensions/NGBundleManager.m (révision 1608) +--- sope-core/NGExtensions/NGBundleManager.m (rĂ©vision 1632) +++ sope-core/NGExtensions/NGBundleManager.m (copie de travail) @@ -332,10 +332,7 @@ } @@ -1036,7 +1036,7 @@ Index: sope-core/NGExtensions/NGBundleManager.m - (void)_setupBundleSearchPathes { Index: sope-core/NGExtensions/FdExt.subproj/GNUmakefile =================================================================== ---- sope-core/NGExtensions/FdExt.subproj/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/FdExt.subproj/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/FdExt.subproj/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1048,7 +1048,7 @@ Index: sope-core/NGExtensions/FdExt.subproj/GNUmakefile SUBPROJECT_NAME = FdExt Index: sope-core/NGExtensions/XmlExt.subproj/GNUmakefile =================================================================== ---- sope-core/NGExtensions/XmlExt.subproj/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/XmlExt.subproj/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/XmlExt.subproj/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1060,7 +1060,7 @@ Index: sope-core/NGExtensions/XmlExt.subproj/GNUmakefile SUBPROJECT_NAME = XmlExt Index: sope-core/NGExtensions/EOExt.subproj/GNUmakefile =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/EOExt.subproj/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/EOExt.subproj/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1072,7 +1072,7 @@ Index: sope-core/NGExtensions/EOExt.subproj/GNUmakefile SUBPROJECT_NAME = EOExt Index: sope-core/NGExtensions/GNUmakefile =================================================================== ---- sope-core/NGExtensions/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1108,7 +1108,7 @@ Index: sope-core/NGExtensions/GNUmakefile --include fhs.make Index: sope-core/NGExtensions/NGResourceLocator.m =================================================================== ---- sope-core/NGExtensions/NGResourceLocator.m (révision 1608) +--- sope-core/NGExtensions/NGResourceLocator.m (rĂ©vision 1632) +++ sope-core/NGExtensions/NGResourceLocator.m (copie de travail) @@ -43,7 +43,11 @@ return self; @@ -1166,7 +1166,7 @@ Index: sope-core/NGExtensions/NGResourceLocator.m e = ([self->fhsSubPath length] > 0) Index: sope-core/NGExtensions/NGLogging.subproj/GNUmakefile =================================================================== ---- sope-core/NGExtensions/NGLogging.subproj/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/NGLogging.subproj/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/NGLogging.subproj/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1178,7 +1178,7 @@ Index: sope-core/NGExtensions/NGLogging.subproj/GNUmakefile SUBPROJECT_NAME = NGLogging Index: sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile =================================================================== ---- sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile (révision 1608) +--- sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1190,7 +1190,7 @@ Index: sope-core/NGExtensions/NGRuleEngine.subproj/GNUmakefile SUBPROJECT_NAME = NGRuleEngine Index: sope-core/GNUmakefile =================================================================== ---- sope-core/GNUmakefile (révision 1608) +--- sope-core/GNUmakefile (rĂ©vision 1632) +++ sope-core/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1208,7 +1208,7 @@ Index: sope-core/GNUmakefile + ../maintenance/make-osxpkg.sh $(PACKAGE_NAME) Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (révision 1608) +--- sope-core/NGStreams/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) @@ -38,7 +38,11 @@ endif @@ -1224,7 +1224,7 @@ Index: sope-core/NGStreams/GNUmakefile.preamble endif Index: sope-core/NGStreams/GNUmakefile =================================================================== ---- sope-core/NGStreams/GNUmakefile (révision 1608) +--- sope-core/NGStreams/GNUmakefile (rĂ©vision 1632) +++ sope-core/NGStreams/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1260,7 +1260,7 @@ Index: sope-core/NGStreams/GNUmakefile --include fhs.make Index: sope-core/samples/GNUmakefile =================================================================== ---- sope-core/samples/GNUmakefile (révision 1608) +--- sope-core/samples/GNUmakefile (rĂ©vision 1632) +++ sope-core/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1277,7 +1277,7 @@ Index: sope-core/samples/GNUmakefile --include fhs.make Index: sope-core/EOControl/GNUmakefile =================================================================== ---- sope-core/EOControl/GNUmakefile (révision 1608) +--- sope-core/EOControl/GNUmakefile (rĂ©vision 1632) +++ sope-core/EOControl/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1313,7 +1313,7 @@ Index: sope-core/EOControl/GNUmakefile --include fhs.make Index: sope-core/common.make =================================================================== ---- sope-core/common.make (révision 1608) +--- sope-core/common.make (rĂ©vision 1632) +++ sope-core/common.make (copie de travail) @@ -6,8 +6,6 @@ include $(SKYROOT)/Version @@ -1326,7 +1326,7 @@ Index: sope-core/common.make ADDITIONAL_CPPFLAGS += -D_REENTRANT=1 Index: sope-core/EOCoreData/GNUmakefile =================================================================== ---- sope-core/EOCoreData/GNUmakefile (révision 1608) +--- sope-core/EOCoreData/GNUmakefile (rĂ©vision 1632) +++ sope-core/EOCoreData/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1362,7 +1362,7 @@ Index: sope-core/EOCoreData/GNUmakefile --include fhs.make Index: sopex/GNUmakefile =================================================================== ---- sopex/GNUmakefile (révision 1608) +--- sopex/GNUmakefile (rĂ©vision 1632) +++ sopex/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1374,7 +1374,7 @@ Index: sopex/GNUmakefile ifeq ($(FOUNDATION_LIB),apple) Index: sopex/SOPEX/GNUmakefile =================================================================== ---- sopex/SOPEX/GNUmakefile (révision 1608) +--- sopex/SOPEX/GNUmakefile (rĂ©vision 1632) +++ sopex/SOPEX/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1386,7 +1386,7 @@ Index: sopex/SOPEX/GNUmakefile Index: xmlrpc_call/GNUmakefile =================================================================== ---- xmlrpc_call/GNUmakefile (révision 1608) +--- xmlrpc_call/GNUmakefile (rĂ©vision 1632) +++ xmlrpc_call/GNUmakefile (copie de travail) @@ -1,10 +1,11 @@ # GNUstep makefile @@ -1411,7 +1411,7 @@ Index: xmlrpc_call/GNUmakefile # do not build a pkg just for this tool Index: xmlrpc_call/GNUmakefile.preamble =================================================================== ---- xmlrpc_call/GNUmakefile.preamble (révision 1608) +--- xmlrpc_call/GNUmakefile.preamble (rĂ©vision 1632) +++ xmlrpc_call/GNUmakefile.preamble (copie de travail) @@ -1,5 +1,6 @@ # compilation settings @@ -1440,7 +1440,7 @@ Index: xmlrpc_call/GNUmakefile.preamble endif Index: sope-xml/libxmlSAXDriver/GNUmakefile =================================================================== ---- sope-xml/libxmlSAXDriver/GNUmakefile (révision 1608) +--- sope-xml/libxmlSAXDriver/GNUmakefile (rĂ©vision 1632) +++ sope-xml/libxmlSAXDriver/GNUmakefile (copie de travail) @@ -1,13 +1,13 @@ # GNUstep makefile @@ -1465,7 +1465,7 @@ Index: sope-xml/libxmlSAXDriver/GNUmakefile --include fhs.make Index: sope-xml/DOM/GNUmakefile.preamble =================================================================== ---- sope-xml/DOM/GNUmakefile.preamble (révision 1608) +--- sope-xml/DOM/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-xml/DOM/GNUmakefile.preamble (copie de travail) @@ -1,10 +1,13 @@ # compilation settings @@ -1485,7 +1485,7 @@ Index: sope-xml/DOM/GNUmakefile.preamble Index: sope-xml/DOM/GNUmakefile =================================================================== ---- sope-xml/DOM/GNUmakefile (révision 1608) +--- sope-xml/DOM/GNUmakefile (rĂ©vision 1632) +++ sope-xml/DOM/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1511,7 +1511,7 @@ Index: sope-xml/DOM/GNUmakefile --include fhs.make Index: sope-xml/ChangeLogSaxDriver/GNUmakefile =================================================================== ---- sope-xml/ChangeLogSaxDriver/GNUmakefile (révision 1608) +--- sope-xml/ChangeLogSaxDriver/GNUmakefile (rĂ©vision 1632) +++ sope-xml/ChangeLogSaxDriver/GNUmakefile (copie de travail) @@ -1,13 +1,13 @@ # GNUstep makefile @@ -1536,7 +1536,7 @@ Index: sope-xml/ChangeLogSaxDriver/GNUmakefile --include fhs.make Index: sope-xml/GNUmakefile =================================================================== ---- sope-xml/GNUmakefile (révision 1608) +--- sope-xml/GNUmakefile (rĂ©vision 1632) +++ sope-xml/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1548,7 +1548,7 @@ Index: sope-xml/GNUmakefile PACKAGE_NAME=sope-xml Index: sope-xml/SaxObjC/SaxXMLReaderFactory.m =================================================================== ---- sope-xml/SaxObjC/SaxXMLReaderFactory.m (révision 1608) +--- sope-xml/SaxObjC/SaxXMLReaderFactory.m (rĂ©vision 1632) +++ sope-xml/SaxObjC/SaxXMLReaderFactory.m (copie de travail) @@ -137,11 +137,19 @@ @@ -1594,7 +1594,7 @@ Index: sope-xml/SaxObjC/SaxXMLReaderFactory.m #endif Index: sope-xml/SaxObjC/SaxObjectModel.h =================================================================== ---- sope-xml/SaxObjC/SaxObjectModel.h (révision 1608) +--- sope-xml/SaxObjC/SaxObjectModel.h (rĂ©vision 1632) +++ sope-xml/SaxObjC/SaxObjectModel.h (copie de travail) @@ -34,6 +34,7 @@ @@ -1606,7 +1606,7 @@ Index: sope-xml/SaxObjC/SaxObjectModel.h Index: sope-xml/SaxObjC/SaxObjectModel.m =================================================================== ---- sope-xml/SaxObjC/SaxObjectModel.m (révision 1608) +--- sope-xml/SaxObjC/SaxObjectModel.m (rĂ©vision 1632) +++ sope-xml/SaxObjC/SaxObjectModel.m (copie de travail) @@ -67,12 +67,12 @@ if (searchPathes == nil) { @@ -1652,7 +1652,7 @@ Index: sope-xml/SaxObjC/SaxObjectModel.m NSEnumerator *pathes; Index: sope-xml/SaxObjC/GNUmakefile.preamble =================================================================== ---- sope-xml/SaxObjC/GNUmakefile.preamble (révision 1608) +--- sope-xml/SaxObjC/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-xml/SaxObjC/GNUmakefile.preamble (copie de travail) @@ -1,9 +1,12 @@ # compilation settings @@ -1682,7 +1682,7 @@ Index: sope-xml/SaxObjC/GNUmakefile.preamble # Apple Index: sope-xml/SaxObjC/GNUmakefile =================================================================== ---- sope-xml/SaxObjC/GNUmakefile (révision 1608) +--- sope-xml/SaxObjC/GNUmakefile (rĂ©vision 1632) +++ sope-xml/SaxObjC/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1708,7 +1708,7 @@ Index: sope-xml/SaxObjC/GNUmakefile --include fhs.make Index: sope-xml/common.make =================================================================== ---- sope-xml/common.make (révision 1608) +--- sope-xml/common.make (rĂ©vision 1632) +++ sope-xml/common.make (copie de travail) @@ -1,13 +1,7 @@ # GNUstep makefile @@ -1726,7 +1726,7 @@ Index: sope-xml/common.make ADDITIONAL_INCLUDE_DIRS += -I.. Index: sope-xml/samples/PlistSaxDriver/GNUmakefile =================================================================== ---- sope-xml/samples/PlistSaxDriver/GNUmakefile (révision 1608) +--- sope-xml/samples/PlistSaxDriver/GNUmakefile (rĂ©vision 1632) +++ sope-xml/samples/PlistSaxDriver/GNUmakefile (copie de travail) @@ -1,11 +1,11 @@ # GNUstep Makefile @@ -1744,7 +1744,7 @@ Index: sope-xml/samples/PlistSaxDriver/GNUmakefile PlistSaxDriver.m Index: sope-xml/samples/GNUmakefile =================================================================== ---- sope-xml/samples/GNUmakefile (révision 1608) +--- sope-xml/samples/GNUmakefile (rĂ©vision 1632) +++ sope-xml/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1778,7 +1778,7 @@ Index: sope-xml/samples/GNUmakefile --include fhs.make Index: sope-xml/samples/GNUmakefile.preamble =================================================================== ---- sope-xml/samples/GNUmakefile.preamble (révision 1608) +--- sope-xml/samples/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-xml/samples/GNUmakefile.preamble (copie de travail) @@ -1,5 +1,6 @@ # compilation settings @@ -1800,7 +1800,7 @@ Index: sope-xml/samples/GNUmakefile.preamble endif Index: sope-xml/XmlRpc/GNUmakefile.preamble =================================================================== ---- sope-xml/XmlRpc/GNUmakefile.preamble (révision 1608) +--- sope-xml/XmlRpc/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-xml/XmlRpc/GNUmakefile.preamble (copie de travail) @@ -1,10 +1,13 @@ # compilation settings @@ -1820,7 +1820,7 @@ Index: sope-xml/XmlRpc/GNUmakefile.preamble Index: sope-xml/XmlRpc/GNUmakefile =================================================================== ---- sope-xml/XmlRpc/GNUmakefile (révision 1608) +--- sope-xml/XmlRpc/GNUmakefile (rĂ©vision 1632) +++ sope-xml/XmlRpc/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1846,7 +1846,7 @@ Index: sope-xml/XmlRpc/GNUmakefile --include fhs.make Index: sope-xml/STXSaxDriver/ExtraSTX/GNUmakefile =================================================================== ---- sope-xml/STXSaxDriver/ExtraSTX/GNUmakefile (révision 1608) +--- sope-xml/STXSaxDriver/ExtraSTX/GNUmakefile (rĂ©vision 1632) +++ sope-xml/STXSaxDriver/ExtraSTX/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1858,7 +1858,7 @@ Index: sope-xml/STXSaxDriver/ExtraSTX/GNUmakefile SUBPROJECT_NAME = ExtraSTX Index: sope-xml/STXSaxDriver/GNUmakefile =================================================================== ---- sope-xml/STXSaxDriver/GNUmakefile (révision 1608) +--- sope-xml/STXSaxDriver/GNUmakefile (rĂ©vision 1632) +++ sope-xml/STXSaxDriver/GNUmakefile (copie de travail) @@ -1,13 +1,13 @@ # GNUstep makefile @@ -1883,7 +1883,7 @@ Index: sope-xml/STXSaxDriver/GNUmakefile --include fhs.make Index: sope-xml/STXSaxDriver/Model/GNUmakefile =================================================================== ---- sope-xml/STXSaxDriver/Model/GNUmakefile (révision 1608) +--- sope-xml/STXSaxDriver/Model/GNUmakefile (rĂ©vision 1632) +++ sope-xml/STXSaxDriver/Model/GNUmakefile (copie de travail) @@ -6,7 +6,7 @@ # Date: 24 November 2003 @@ -1896,7 +1896,7 @@ Index: sope-xml/STXSaxDriver/Model/GNUmakefile SUBPROJECT_NAME = Model Index: sope-xml/pyxSAXDriver/GNUmakefile =================================================================== ---- sope-xml/pyxSAXDriver/GNUmakefile (révision 1608) +--- sope-xml/pyxSAXDriver/GNUmakefile (rĂ©vision 1632) +++ sope-xml/pyxSAXDriver/GNUmakefile (copie de travail) @@ -1,17 +1,16 @@ # GNUstep makefile @@ -1920,7 +1920,7 @@ Index: sope-xml/pyxSAXDriver/GNUmakefile --include fhs.make Index: sope-appserver/GNUmakefile =================================================================== ---- sope-appserver/GNUmakefile (révision 1608) +--- sope-appserver/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -1930,17 +1930,7 @@ Index: sope-appserver/GNUmakefile include $(GNUSTEP_MAKEFILES)/common.make PACKAGE_NAME=sope-appserver -@@ -13,7 +13,8 @@ - WOXML \ - SoOFS \ - NGXmlRpc \ -- WEPrototype -+ WEPrototype \ -+ mod_ngobjweb - - - ifeq ($(frameworks),yes) -@@ -38,4 +39,4 @@ +@@ -38,4 +38,4 @@ # package macosx-pkg :: all @@ -1948,7 +1938,7 @@ Index: sope-appserver/GNUmakefile + ../maintenance/make-osxpkg.sh $(PACKAGE_NAME) Index: sope-appserver/SoOFS/GNUmakefile.preamble =================================================================== ---- sope-appserver/SoOFS/GNUmakefile.preamble (révision 1608) +--- sope-appserver/SoOFS/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/SoOFS/GNUmakefile.preamble (copie de travail) @@ -76,17 +76,9 @@ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) @@ -1979,7 +1969,7 @@ Index: sope-appserver/SoOFS/GNUmakefile.preamble endif Index: sope-appserver/SoOFS/GNUmakefile =================================================================== ---- sope-appserver/SoOFS/GNUmakefile (révision 1608) +--- sope-appserver/SoOFS/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/SoOFS/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2029,7 +2019,7 @@ Index: sope-appserver/SoOFS/GNUmakefile --include fhs.make Index: sope-appserver/NGXmlRpc/GNUmakefile =================================================================== ---- sope-appserver/NGXmlRpc/GNUmakefile (révision 1608) +--- sope-appserver/NGXmlRpc/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGXmlRpc/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2066,7 +2056,7 @@ Index: sope-appserver/NGXmlRpc/GNUmakefile --include fhs.make Index: sope-appserver/WEExtensions/GNUmakefile.preamble =================================================================== ---- sope-appserver/WEExtensions/GNUmakefile.preamble (révision 1608) +--- sope-appserver/WEExtensions/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/WEExtensions/GNUmakefile.preamble (copie de travail) @@ -21,7 +21,8 @@ cp ../bundle-info.plist .) @@ -2080,7 +2070,7 @@ Index: sope-appserver/WEExtensions/GNUmakefile.preamble Index: sope-appserver/WEExtensions/GNUmakefile =================================================================== ---- sope-appserver/WEExtensions/GNUmakefile (révision 1608) +--- sope-appserver/WEExtensions/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WEExtensions/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2116,7 +2106,7 @@ Index: sope-appserver/WEExtensions/GNUmakefile --include fhs.make Index: sope-appserver/WEExtensions/WEResourceManager.m =================================================================== ---- sope-appserver/WEExtensions/WEResourceManager.m (révision 1608) +--- sope-appserver/WEExtensions/WEResourceManager.m (rĂ©vision 1632) +++ sope-appserver/WEExtensions/WEResourceManager.m (copie de travail) @@ -53,28 +53,43 @@ @@ -2194,7 +2184,7 @@ Index: sope-appserver/WEExtensions/WEResourceManager.m Index: sope-appserver/WEExtensions/WETableView/GNUmakefile =================================================================== ---- sope-appserver/WEExtensions/WETableView/GNUmakefile (révision 1608) +--- sope-appserver/WEExtensions/WETableView/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WEExtensions/WETableView/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2206,7 +2196,7 @@ Index: sope-appserver/WEExtensions/WETableView/GNUmakefile SUBPROJECT_NAME = WETableView Index: sope-appserver/NGObjWeb/WOCoreApplication+Bundle.m =================================================================== ---- sope-appserver/NGObjWeb/WOCoreApplication+Bundle.m (révision 1608) +--- sope-appserver/NGObjWeb/WOCoreApplication+Bundle.m (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/WOCoreApplication+Bundle.m (copie de travail) @@ -50,8 +50,6 @@ } @@ -2240,7 +2230,7 @@ Index: sope-appserver/NGObjWeb/WOCoreApplication+Bundle.m tmp = [tmp componentsSeparatedByString:@":"]; Index: sope-appserver/NGObjWeb/wobundle-gs.make =================================================================== ---- sope-appserver/NGObjWeb/wobundle-gs.make (révision 1608) +--- sope-appserver/NGObjWeb/wobundle-gs.make (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/wobundle-gs.make (copie de travail) @@ -85,7 +85,7 @@ endif @@ -2266,7 +2256,7 @@ Index: sope-appserver/NGObjWeb/wobundle-gs.make endif Index: sope-appserver/NGObjWeb/GNUmakefile.preamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.preamble (révision 1608) +--- sope-appserver/NGObjWeb/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/GNUmakefile.preamble (copie de travail) @@ -50,9 +50,6 @@ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) @@ -2305,7 +2295,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.preamble endif Index: sope-appserver/NGObjWeb/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/GNUmakefile (copie de travail) @@ -1,11 +1,9 @@ # GNUstep makefile @@ -2374,7 +2364,7 @@ Index: sope-appserver/NGObjWeb/GNUmakefile --include fhs.make Index: sope-appserver/NGObjWeb/WebDAV/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/WebDAV/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/WebDAV/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2386,7 +2376,7 @@ Index: sope-appserver/NGObjWeb/WebDAV/GNUmakefile include $(GNUSTEP_MAKEFILES)/common.make Index: sope-appserver/NGObjWeb/DynamicElements/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/DynamicElements/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/DynamicElements/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2398,7 +2388,7 @@ Index: sope-appserver/NGObjWeb/DynamicElements/GNUmakefile SUBPROJECT_NAME = DynamicElements Index: sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m (révision 1608) +--- sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m (copie de travail) @@ -74,6 +74,14 @@ } @@ -2425,7 +2415,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoProductLoader.m - (void)_addFHSPathesToArray:(NSMutableArray *)ma { Index: sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m (révision 1608) +--- sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m (copie de travail) @@ -231,7 +231,7 @@ @@ -2502,7 +2492,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoProductRegistry.m #endif Index: sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble (révision 1608) +--- sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble (copie de travail) @@ -1,5 +1,7 @@ # compilation settings @@ -2523,7 +2513,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/GNUmakefile.preamble endif Index: sope-appserver/NGObjWeb/SoObjects/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/SoObjects/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/SoObjects/GNUmakefile (copie de travail) @@ -1,7 +1,7 @@ # GNUstep makefile @@ -2536,7 +2526,7 @@ Index: sope-appserver/NGObjWeb/SoObjects/GNUmakefile Index: sope-appserver/NGObjWeb/Templates/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/Templates/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/Templates/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/Templates/GNUmakefile (copie de travail) @@ -1,7 +1,7 @@ # GNUmakefile makefile @@ -2549,7 +2539,7 @@ Index: sope-appserver/NGObjWeb/Templates/GNUmakefile Index: sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m =================================================================== ---- sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m (révision 1608) +--- sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m (copie de travail) @@ -76,7 +76,7 @@ @@ -2610,7 +2600,7 @@ Index: sope-appserver/NGObjWeb/Templates/WOApplication+Builders.m [FHS_INSTALL_ROOT stringByAppendingString:relPath], Index: sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble =================================================================== ---- sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble (révision 1608) +--- sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble (copie de travail) @@ -6,6 +6,6 @@ ADDITIONAL_CPPFLAGS += -DFHS_INSTALL_ROOT=\@\"$(FHS_INSTALL_ROOT)\" @@ -2623,7 +2613,7 @@ Index: sope-appserver/NGObjWeb/Templates/GNUmakefile.preamble endif Index: sope-appserver/NGObjWeb/Associations/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/Associations/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/Associations/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/Associations/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2635,7 +2625,7 @@ Index: sope-appserver/NGObjWeb/Associations/GNUmakefile SUBPROJECT_NAME = Associations Index: sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2647,7 +2637,7 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/GNUmakefile SUBPROJECT_NAME = WOHttpAdaptor Index: sope-appserver/NGObjWeb/woapp-gs.make =================================================================== ---- sope-appserver/NGObjWeb/woapp-gs.make (révision 1608) +--- sope-appserver/NGObjWeb/woapp-gs.make (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/woapp-gs.make (copie de travail) @@ -103,7 +103,7 @@ # Determine the application directory extension @@ -2672,7 +2662,7 @@ Index: sope-appserver/NGObjWeb/woapp-gs.make endif Index: sope-appserver/NGObjWeb/WOCoreApplication.m =================================================================== ---- sope-appserver/NGObjWeb/WOCoreApplication.m (révision 1608) +--- sope-appserver/NGObjWeb/WOCoreApplication.m (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/WOCoreApplication.m (copie de travail) @@ -730,9 +730,15 @@ [self sopeMajorVersion], [self sopeMinorVersion]]; @@ -2692,7 +2682,7 @@ Index: sope-appserver/NGObjWeb/WOCoreApplication.m + (NSArray *)resourcesSearchPathes { Index: sope-appserver/NGObjWeb/NGHttp/GNUmakefile =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/GNUmakefile (révision 1608) +--- sope-appserver/NGObjWeb/NGHttp/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/NGObjWeb/NGHttp/GNUmakefile (copie de travail) @@ -1,10 +1,8 @@ # GNUstep makefile @@ -2717,7 +2707,7 @@ Index: sope-appserver/NGObjWeb/NGHttp/GNUmakefile -include GNUmakefile.postamble Index: sope-appserver/WEPrototype/GNUmakefile =================================================================== ---- sope-appserver/WEPrototype/GNUmakefile (révision 1608) +--- sope-appserver/WEPrototype/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WEPrototype/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2753,7 +2743,7 @@ Index: sope-appserver/WEPrototype/GNUmakefile --include fhs.make Index: sope-appserver/WEPrototype/doc/GNUmakefile =================================================================== ---- sope-appserver/WEPrototype/doc/GNUmakefile (révision 1608) +--- sope-appserver/WEPrototype/doc/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WEPrototype/doc/GNUmakefile (copie de travail) @@ -2,7 +2,7 @@ @@ -2766,7 +2756,7 @@ Index: sope-appserver/WEPrototype/doc/GNUmakefile Index: sope-appserver/WEPrototype/GNUmakefile.preamble =================================================================== ---- sope-appserver/WEPrototype/GNUmakefile.preamble (révision 1608) +--- sope-appserver/WEPrototype/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/WEPrototype/GNUmakefile.preamble (copie de travail) @@ -1,4 +1,4 @@ -# compiler flags @@ -2786,7 +2776,7 @@ Index: sope-appserver/WEPrototype/GNUmakefile.preamble libWEPrototype_LIBRARIES_DEPEND_UPON += \ Index: sope-appserver/common.make =================================================================== ---- sope-appserver/common.make (révision 1608) +--- sope-appserver/common.make (rĂ©vision 1632) +++ sope-appserver/common.make (copie de travail) @@ -4,8 +4,6 @@ include ../Version @@ -2799,7 +2789,7 @@ Index: sope-appserver/common.make ADDITIONAL_INCLUDE_DIRS += \ Index: sope-appserver/samples/CoreDataBlog/GNUmakefile =================================================================== ---- sope-appserver/samples/CoreDataBlog/GNUmakefile (révision 1608) +--- sope-appserver/samples/CoreDataBlog/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/CoreDataBlog/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2811,7 +2801,7 @@ Index: sope-appserver/samples/CoreDataBlog/GNUmakefile WOAPP_NAME = CoreDataBlog Index: sope-appserver/samples/HelloForm/GNUmakefile =================================================================== ---- sope-appserver/samples/HelloForm/GNUmakefile (révision 1608) +--- sope-appserver/samples/HelloForm/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/HelloForm/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2823,7 +2813,7 @@ Index: sope-appserver/samples/HelloForm/GNUmakefile WOAPP_NAME = HelloForm Index: sope-appserver/samples/GNUmakefile =================================================================== ---- sope-appserver/samples/GNUmakefile (révision 1608) +--- sope-appserver/samples/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2835,7 +2825,7 @@ Index: sope-appserver/samples/GNUmakefile SUBPROJECTS += \ Index: sope-appserver/samples/iCalPortal/GNUmakefile.preamble =================================================================== ---- sope-appserver/samples/iCalPortal/GNUmakefile.preamble (révision 1608) +--- sope-appserver/samples/iCalPortal/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/samples/iCalPortal/GNUmakefile.preamble (copie de travail) @@ -7,7 +7,9 @@ -lEOControl \ @@ -2849,7 +2839,7 @@ Index: sope-appserver/samples/iCalPortal/GNUmakefile.preamble SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib Index: sope-appserver/samples/iCalPortal/GNUmakefile =================================================================== ---- sope-appserver/samples/iCalPortal/GNUmakefile (révision 1608) +--- sope-appserver/samples/iCalPortal/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/iCalPortal/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2861,7 +2851,7 @@ Index: sope-appserver/samples/iCalPortal/GNUmakefile WOAPP_NAME = iCalPortal Index: sope-appserver/samples/iCalPortal/Pages/GNUmakefile =================================================================== ---- sope-appserver/samples/iCalPortal/Pages/GNUmakefile (révision 1608) +--- sope-appserver/samples/iCalPortal/Pages/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/iCalPortal/Pages/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2873,7 +2863,7 @@ Index: sope-appserver/samples/iCalPortal/Pages/GNUmakefile SUBPROJECT_NAME = Pages Index: sope-appserver/samples/iCalPortal/WebDAV/GNUmakefile =================================================================== ---- sope-appserver/samples/iCalPortal/WebDAV/GNUmakefile (révision 1608) +--- sope-appserver/samples/iCalPortal/WebDAV/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/iCalPortal/WebDAV/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2885,7 +2875,7 @@ Index: sope-appserver/samples/iCalPortal/WebDAV/GNUmakefile SUBPROJECT_NAME = DAV Index: sope-appserver/samples/SoCookieAuth/GNUmakefile =================================================================== ---- sope-appserver/samples/SoCookieAuth/GNUmakefile (révision 1608) +--- sope-appserver/samples/SoCookieAuth/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/SoCookieAuth/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2897,7 +2887,7 @@ Index: sope-appserver/samples/SoCookieAuth/GNUmakefile WOAPP_NAME = SoCookieAuth Index: sope-appserver/samples/WOxExtTest/GNUmakefile =================================================================== ---- sope-appserver/samples/WOxExtTest/GNUmakefile (révision 1608) +--- sope-appserver/samples/WOxExtTest/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/WOxExtTest/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2909,7 +2899,7 @@ Index: sope-appserver/samples/WOxExtTest/GNUmakefile WOAPP_NAME = WOxExtTest Index: sope-appserver/samples/TestPages/GNUmakefile =================================================================== ---- sope-appserver/samples/TestPages/GNUmakefile (révision 1608) +--- sope-appserver/samples/TestPages/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/TestPages/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2921,7 +2911,7 @@ Index: sope-appserver/samples/TestPages/GNUmakefile WOAPP_NAME = TestPages Index: sope-appserver/samples/parsedav/GNUmakefile =================================================================== ---- sope-appserver/samples/parsedav/GNUmakefile (révision 1608) +--- sope-appserver/samples/parsedav/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/parsedav/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2933,7 +2923,7 @@ Index: sope-appserver/samples/parsedav/GNUmakefile TOOL_NAME = parsedav Index: sope-appserver/samples/xmlrpc/GNUmakefile =================================================================== ---- sope-appserver/samples/xmlrpc/GNUmakefile (révision 1608) +--- sope-appserver/samples/xmlrpc/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/xmlrpc/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2945,7 +2935,7 @@ Index: sope-appserver/samples/xmlrpc/GNUmakefile TOOL_NAME = \ Index: sope-appserver/samples/TestPrototype/GNUmakefile =================================================================== ---- sope-appserver/samples/TestPrototype/GNUmakefile (révision 1608) +--- sope-appserver/samples/TestPrototype/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/TestPrototype/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2957,7 +2947,7 @@ Index: sope-appserver/samples/TestPrototype/GNUmakefile WOAPP_NAME = TestPrototype Index: sope-appserver/samples/HelloWorld/GNUmakefile =================================================================== ---- sope-appserver/samples/HelloWorld/GNUmakefile (révision 1608) +--- sope-appserver/samples/HelloWorld/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/HelloWorld/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2969,7 +2959,7 @@ Index: sope-appserver/samples/HelloWorld/GNUmakefile WOAPP_NAME = HelloWorld Index: sope-appserver/samples/davpropget/GNUmakefile =================================================================== ---- sope-appserver/samples/davpropget/GNUmakefile (révision 1608) +--- sope-appserver/samples/davpropget/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/samples/davpropget/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -2981,7 +2971,7 @@ Index: sope-appserver/samples/davpropget/GNUmakefile TOOL_NAME = davpropget Index: sope-appserver/WOExtensions/GNUmakefile.preamble =================================================================== ---- sope-appserver/WOExtensions/GNUmakefile.preamble (révision 1608) +--- sope-appserver/WOExtensions/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/WOExtensions/GNUmakefile.preamble (copie de travail) @@ -12,7 +12,8 @@ -I$(SOPE_ROOT)/sope-xml @@ -2995,7 +2985,7 @@ Index: sope-appserver/WOExtensions/GNUmakefile.preamble Index: sope-appserver/WOExtensions/GNUmakefile =================================================================== ---- sope-appserver/WOExtensions/GNUmakefile (révision 1608) +--- sope-appserver/WOExtensions/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WOExtensions/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -3031,7 +3021,7 @@ Index: sope-appserver/WOExtensions/GNUmakefile --include fhs.make Index: sope-appserver/WOXML/GNUmakefile =================================================================== ---- sope-appserver/WOXML/GNUmakefile (révision 1608) +--- sope-appserver/WOXML/GNUmakefile (rĂ©vision 1632) +++ sope-appserver/WOXML/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -3065,7 +3055,7 @@ Index: sope-appserver/WOXML/GNUmakefile --include fhs.make Index: sope-appserver/WOXML/GNUmakefile.preamble =================================================================== ---- sope-appserver/WOXML/GNUmakefile.preamble (révision 1608) +--- sope-appserver/WOXML/GNUmakefile.preamble (rĂ©vision 1632) +++ sope-appserver/WOXML/GNUmakefile.preamble (copie de travail) @@ -2,7 +2,7 @@ @@ -3078,7 +3068,7 @@ Index: sope-appserver/WOXML/GNUmakefile.preamble libWOXML_INCLUDE_DIRS += -I. -I.. Index: sope-ical/samples/GNUmakefile =================================================================== ---- sope-ical/samples/GNUmakefile (révision 1608) +--- sope-ical/samples/GNUmakefile (rĂ©vision 1632) +++ sope-ical/samples/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -3095,7 +3085,7 @@ Index: sope-ical/samples/GNUmakefile --include fhs.make Index: sope-ical/versitSaxDriver/GNUmakefile =================================================================== ---- sope-ical/versitSaxDriver/GNUmakefile (révision 1608) +--- sope-ical/versitSaxDriver/GNUmakefile (rĂ©vision 1632) +++ sope-ical/versitSaxDriver/GNUmakefile (copie de travail) @@ -1,13 +1,13 @@ # GNUstep makefile @@ -3120,7 +3110,7 @@ Index: sope-ical/versitSaxDriver/GNUmakefile --include fhs.make Index: sope-ical/GNUmakefile =================================================================== ---- sope-ical/GNUmakefile (révision 1608) +--- sope-ical/GNUmakefile (rĂ©vision 1632) +++ sope-ical/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile @@ -3132,7 +3122,7 @@ Index: sope-ical/GNUmakefile PACKAGE_NAME=sope-ical Index: sope-ical/NGiCal/GNUmakefile.postamble =================================================================== ---- sope-ical/NGiCal/GNUmakefile.postamble (révision 1608) +--- sope-ical/NGiCal/GNUmakefile.postamble (rĂ©vision 1632) +++ sope-ical/NGiCal/GNUmakefile.postamble (copie de travail) @@ -1,10 +1,6 @@ # compilation settings @@ -3148,7 +3138,7 @@ Index: sope-ical/NGiCal/GNUmakefile.postamble $(MKDIRS) $(MAPDIR) Index: sope-ical/NGiCal/GNUmakefile =================================================================== ---- sope-ical/NGiCal/GNUmakefile (révision 1608) +--- sope-ical/NGiCal/GNUmakefile (rĂ©vision 1632) +++ sope-ical/NGiCal/GNUmakefile (copie de travail) @@ -1,6 +1,6 @@ # GNUstep makefile diff --git a/SOPE/sope-patchset-r1630.diff b/SOPE/sope-patchset-r1632.diff similarity index 93% rename from SOPE/sope-patchset-r1630.diff rename to SOPE/sope-patchset-r1632.diff index cb8d195b6..56a664ed6 100644 --- a/SOPE/sope-patchset-r1630.diff +++ b/SOPE/sope-patchset-r1632.diff @@ -1,7 +1,7 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m =================================================================== ---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1632) -+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) +--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (rĂ©vision 1632) ++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail) @@ -713,6 +713,39 @@ return ms; } @@ -44,8 +44,8 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m @implementation PostgreSQL72Channel(PrimaryKeyGeneration) Index: sope-gdl1/MySQL/MySQL4Channel.m =================================================================== ---- sope-gdl1/MySQL/MySQL4Channel.m (revision 1632) -+++ sope-gdl1/MySQL/MySQL4Channel.m (working copy) +--- sope-gdl1/MySQL/MySQL4Channel.m (rĂ©vision 1632) ++++ sope-gdl1/MySQL/MySQL4Channel.m (copie de travail) @@ -755,6 +755,39 @@ return pkey; } @@ -88,8 +88,8 @@ Index: sope-gdl1/MySQL/MySQL4Channel.m void __link_MySQL4Channel() { Index: sope-gdl1/GDLAccess/EOAdaptor.m =================================================================== ---- sope-gdl1/GDLAccess/EOAdaptor.m (revision 1632) -+++ sope-gdl1/GDLAccess/EOAdaptor.m (working copy) +--- sope-gdl1/GDLAccess/EOAdaptor.m (rĂ©vision 1632) ++++ sope-gdl1/GDLAccess/EOAdaptor.m (copie de travail) @@ -202,6 +202,7 @@ if ([_scheme isEqualToString:@"sybase"]) return @"Sybase10"; if ([_scheme isEqualToString:@"sqlite"]) return @"SQLite3"; @@ -100,8 +100,8 @@ Index: sope-gdl1/GDLAccess/EOAdaptor.m NSLog(@"WARNING(%s): asked for 'http' URL, " Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m =================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1632) -+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) +--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (rĂ©vision 1632) ++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail) @@ -1,7 +1,7 @@ /* ** OracleAdaptorChannel.m @@ -288,8 +288,8 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m @" c_lastmodified INTEGER NOT NULL,\n" Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m =================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1632) -+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) +--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (rĂ©vision 1632) ++++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail) @@ -31,6 +31,8 @@ #import #import @@ -336,8 +336,8 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m Index: sope-mime/NGImap4/NGImap4Client.h =================================================================== ---- sope-mime/NGImap4/NGImap4Client.h (revision 1632) -+++ sope-mime/NGImap4/NGImap4Client.h (working copy) +--- sope-mime/NGImap4/NGImap4Client.h (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) @@ -62,6 +62,8 @@ NGImap4ResponseNormalizer *normer; NSMutableArray *responseReceiver; @@ -366,8 +366,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 (revision 1632) -+++ sope-mime/NGImap4/NGImap4Client.m (working copy) +--- sope-mime/NGImap4/NGImap4Client.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) @@ -24,6 +24,8 @@ #include "NGImap4Client.h" #include "NGImap4Context.h" @@ -675,8 +675,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m __PRETTY_FUNCTION__, [_exception name], [_exception reason]]; Index: sope-mime/NGImap4/NGSieveClient.m =================================================================== ---- sope-mime/NGImap4/NGSieveClient.m (revision 1632) -+++ sope-mime/NGImap4/NGSieveClient.m (working copy) +--- sope-mime/NGImap4/NGSieveClient.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGSieveClient.m (copie de travail) @@ -294,8 +294,8 @@ return con; } @@ -711,8 +711,8 @@ Index: sope-mime/NGImap4/NGSieveClient.m /* write */ Index: sope-mime/NGImap4/NGImap4Connection.h =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.h (revision 1632) -+++ sope-mime/NGImap4/NGImap4Connection.h (working copy) +--- sope-mime/NGImap4/NGImap4Connection.h (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4Connection.h (copie de travail) @@ -89,6 +89,7 @@ - (NSArray *)subfoldersForURL:(NSURL *)_url; @@ -723,8 +723,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.m =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.m (revision 1632) -+++ sope-mime/NGImap4/NGImap4Connection.m (working copy) +--- sope-mime/NGImap4/NGImap4Connection.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) @@ -381,7 +381,7 @@ if (debugCache) [self logWithFormat:@" no folders cached yet .."]; @@ -771,8 +771,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.m - (id)infoForMailboxAtURL:(NSURL *)_url { Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1632) -+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) +--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) @@ -292,7 +292,7 @@ /* filter for fetch response @@ -820,8 +820,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m if (objs) free(objs); Index: sope-mime/NGImap4/NGImap4ResponseParser.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1632) -+++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) +--- sope-mime/NGImap4/NGImap4ResponseParser.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) @@ -31,6 +31,7 @@ @interface NGImap4ResponseParser(ParsingPrivates) - (BOOL)_parseNumberUntaggedResponse:(NGMutableHashMap *)result_; @@ -1271,8 +1271,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m self->serverResponseDebug = Index: sope-mime/NGImap4/ChangeLog =================================================================== ---- sope-mime/NGImap4/ChangeLog (revision 1632) -+++ sope-mime/NGImap4/ChangeLog (working copy) +--- sope-mime/NGImap4/ChangeLog (rĂ©vision 1632) ++++ sope-mime/NGImap4/ChangeLog (copie de travail) @@ -1,3 +1,29 @@ +2008-10-23 Wolfgang Sourdeau + @@ -1305,8 +1305,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 (revision 1632) -+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) +--- sope-mime/NGImap4/NGImap4ConnectionManager.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail) @@ -38,6 +38,9 @@ debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"]; @@ -1432,8 +1432,8 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m /* client object */ Index: sope-mime/NGImap4/NSString+Imap4.m =================================================================== ---- sope-mime/NGImap4/NSString+Imap4.m (revision 1632) -+++ sope-mime/NGImap4/NSString+Imap4.m (working copy) +--- sope-mime/NGImap4/NSString+Imap4.m (rĂ©vision 1632) ++++ sope-mime/NGImap4/NSString+Imap4.m (copie de travail) @@ -20,11 +20,56 @@ 02111-1307, USA. */ @@ -1954,8 +1954,8 @@ Index: sope-mime/NGImap4/NSString+Imap4.m +@end /* NSString(Imap4) */ Index: sope-mime/NGMail/NGSmtpClient.m =================================================================== ---- sope-mime/NGMail/NGSmtpClient.m (revision 1632) -+++ sope-mime/NGMail/NGSmtpClient.m (working copy) +--- sope-mime/NGMail/NGSmtpClient.m (rĂ©vision 1632) ++++ sope-mime/NGMail/NGSmtpClient.m (copie de travail) @@ -24,6 +24,82 @@ #include "NGSmtpReplyCodes.h" #include "common.h" @@ -2110,8 +2110,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m reply = [self receiveReply]; Index: sope-mime/NGMail/NGMailAddressParser.h =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.h (revision 1632) -+++ sope-mime/NGMail/NGMailAddressParser.h (working copy) +--- sope-mime/NGMail/NGMailAddressParser.h (rĂ©vision 1632) ++++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) @@ -24,7 +24,9 @@ #import @@ -2148,8 +2148,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMimeMessageGenerator.m =================================================================== ---- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1632) -+++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) +--- sope-mime/NGMail/NGMimeMessageGenerator.m (rĂ©vision 1632) ++++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) @@ -86,37 +86,40 @@ char *des = NULL; unsigned int cnt; @@ -2214,8 +2214,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m unsigned isoEndLen = 2; Index: sope-mime/NGMail/NGMailAddressParser.m =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.m (revision 1632) -+++ sope-mime/NGMail/NGMailAddressParser.m (working copy) +--- sope-mime/NGMail/NGMailAddressParser.m (rĂ©vision 1632) ++++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) @@ -52,9 +52,9 @@ StrClass = [NSString class]; } @@ -2359,8 +2359,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m self->dataPos = 0; Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m =================================================================== ---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1632) -+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) +--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) @@ -19,88 +19,45 @@ 02111-1307, USA. */ @@ -2764,8 +2764,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m #if 0 Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1632) -+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) +--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (copie de travail) @@ -428,6 +428,7 @@ NSString *boundary = nil; NSArray *rawBodyParts = nil; @@ -2789,8 +2789,8 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m if (rawBodyParts) { Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m =================================================================== ---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1632) -+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) +--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) @@ -77,6 +77,7 @@ [rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:Fields->from]; @@ -2801,8 +2801,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeType.m =================================================================== ---- sope-mime/NGMime/NGMimeType.m (revision 1632) -+++ sope-mime/NGMime/NGMimeType.m (working copy) +--- sope-mime/NGMime/NGMimeType.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeType.m (copie de travail) @@ -120,28 +120,23 @@ /* some unsupported, but known encoding */ @@ -2899,8 +2899,8 @@ Index: sope-mime/NGMime/NGMimeType.m - (NSString *)stringValue { Index: sope-mime/NGMime/NGMimeBodyPart.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyPart.m (revision 1632) -+++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) +--- sope-mime/NGMime/NGMimeBodyPart.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) @@ -31,18 +31,6 @@ return 2; } @@ -2937,8 +2937,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m - (NSString *)contentId { Index: sope-mime/NGMime/ChangeLog =================================================================== ---- sope-mime/NGMime/ChangeLog (revision 1632) -+++ sope-mime/NGMime/ChangeLog (working copy) +--- sope-mime/NGMime/ChangeLog (rĂ©vision 1632) ++++ sope-mime/NGMime/ChangeLog (copie de travail) @@ -1,3 +1,25 @@ +2008-09-08 Wolfgang Sourdeau + @@ -2967,8 +2967,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 (revision 1632) -+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (copie de travail) @@ -36,8 +36,7 @@ NGMimeType *type = nil; // only one content-type field NSString *tmp = nil; @@ -3107,8 +3107,8 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m } Index: sope-mime/NGMime/NGMimePartGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimePartGenerator.m (revision 1632) -+++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) +--- sope-mime/NGMime/NGMimePartGenerator.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimePartGenerator.m (copie de travail) @@ -155,8 +155,9 @@ BOOL isMultiValue, isFirst; @@ -3132,8 +3132,8 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimeBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyParser.m (revision 1632) -+++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) +--- sope-mime/NGMime/NGMimeBodyParser.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) @@ -67,7 +67,10 @@ if (_data == nil) return nil; @@ -3171,8 +3171,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m } Index: sope-mime/NGMime/NGMimePartParser.h =================================================================== ---- sope-mime/NGMime/NGMimePartParser.h (revision 1632) -+++ sope-mime/NGMime/NGMimePartParser.h (working copy) +--- sope-mime/NGMime/NGMimePartParser.h (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) @@ -117,6 +117,7 @@ BOOL parserParseRawBodyDataOfPart:1; BOOL parserBodyParserForPart:1; @@ -3193,8 +3193,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h @interface NSObject(NGMimePartParser) Index: sope-mime/NGMime/NGMimePartParser.m =================================================================== ---- sope-mime/NGMime/NGMimePartParser.m (revision 1632) -+++ sope-mime/NGMime/NGMimePartParser.m (working copy) +--- sope-mime/NGMime/NGMimePartParser.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) @@ -227,7 +227,7 @@ } @@ -3218,8 +3218,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m : [NGMimeType mimeType:[ctype stringValue]]; Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1632) -+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) @@ -105,10 +105,10 @@ } @@ -3304,8 +3304,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m return data; Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1632) -+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) +--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (rĂ©vision 1632) ++++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) @@ -49,80 +49,70 @@ // TODO: move the stuff below to some NSString or NSData category? @@ -3440,8 +3440,8 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m } Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1632) -+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) +--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (rĂ©vision 1632) ++++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) @@ -30,6 +30,7 @@ @interface NSString(GSAdditions) @@ -3478,8 +3478,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 (revision 1632) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (rĂ©vision 1632) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) @@ -39,18 +39,6 @@ : (NSString *)[[self copy] autorelease]; } @@ -3567,8 +3567,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 (revision 1632) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (rĂ©vision 1632) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) @@ -140,8 +140,12 @@ @@ -3610,8 +3610,8 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m =================================================================== ---- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1632) -+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy) +--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (rĂ©vision 1632) ++++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (copie de travail) @@ -278,7 +278,12 @@ for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) { @@ -3628,8 +3628,8 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m ((c > 31) && (c < 61)) || Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1632) -+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) +--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (rĂ©vision 1632) ++++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) @@ -19,6 +19,7 @@ 02111-1307, USA. */ @@ -3640,8 +3640,8 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (revision 1632) -+++ sope-core/NGStreams/GNUmakefile.preamble (working copy) +--- sope-core/NGStreams/GNUmakefile.preamble (rĂ©vision 1632) ++++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) @@ -1,7 +1,10 @@ # compilation settings @@ -3653,10 +3653,23 @@ Index: sope-core/NGStreams/GNUmakefile.preamble -INGStreams \ -I../NGExtensions \ -I.. +Index: sope-xml/libxmlSAXDriver/ChangeLog +=================================================================== +--- sope-xml/libxmlSAXDriver/ChangeLog (rĂ©vision 1632) ++++ sope-xml/libxmlSAXDriver/ChangeLog (copie de travail) +@@ -1,3 +1,8 @@ ++2009-03-24 Wolfgang Sourdeau ++ ++ * libxmlSAXDriver.m (_startElement): autorelease "nsDict" when its ++ instantiated from a copy of "ns". ++ + 2006-07-03 Helge Hess + + * libXMLSaxDriver.m: fixed last changes for libFoundation (v4.5.24) Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (rĂ©vision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) @@ -19,6 +19,8 @@ 02111-1307, USA. */ @@ -3677,8 +3690,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h id entityResolver; Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (rĂ©vision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) @@ -30,6 +30,12 @@ #include #include @@ -3737,8 +3750,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m - (void)tearDownParser { Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy) +--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (rĂ©vision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail) @@ -614,7 +614,7 @@ xmlParseDocument(ctxt); @@ -3757,10 +3770,18 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m ((xmlParserCtxtPtr)self->ctxt)->sax = NULL; xmlFreeParserCtxt(self->ctxt); +@@ -872,6 +872,7 @@ + } + + nsDict = [ns copy]; ++ [nsDict autorelease]; + [ns release]; + } + Index: sope-appserver/mod_ngobjweb/config.c =================================================================== ---- sope-appserver/mod_ngobjweb/config.c (revision 1632) -+++ sope-appserver/mod_ngobjweb/config.c (working copy) +--- sope-appserver/mod_ngobjweb/config.c (rĂ©vision 1632) ++++ sope-appserver/mod_ngobjweb/config.c (copie de travail) @@ -21,7 +21,7 @@ #include "common.h" @@ -3772,8 +3793,8 @@ Index: sope-appserver/mod_ngobjweb/config.c if (buf == NULL) Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c =================================================================== ---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1632) -+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy) +--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (rĂ©vision 1632) ++++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail) @@ -23,6 +23,7 @@ #include #include @@ -3784,8 +3805,8 @@ Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c // returns the number of bytes which where read from the buffer Index: sope-appserver/mod_ngobjweb/GNUmakefile =================================================================== ---- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1632) -+++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) +--- sope-appserver/mod_ngobjweb/GNUmakefile (rĂ©vision 1632) ++++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) @@ -82,7 +82,7 @@ CFLAGS = -Wall -I. -fPIC \ @@ -3807,8 +3828,8 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1632) -+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) +--- sope-appserver/NGObjWeb/GNUmakefile.postamble (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) @@ -23,14 +23,20 @@ # install makefiles @@ -3839,8 +3860,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make Index: sope-appserver/NGObjWeb/WOContext.m =================================================================== ---- sope-appserver/NGObjWeb/WOContext.m (revision 1632) -+++ sope-appserver/NGObjWeb/WOContext.m (working copy) +--- sope-appserver/NGObjWeb/WOContext.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WOContext.m (copie de travail) @@ -64,11 +64,13 @@ static BOOL testNSURLs = NO; static BOOL newCURLStyle = NO; @@ -3879,10 +3900,19 @@ Index: sope-appserver/NGObjWeb/WOContext.m serverURL = [@"http://" stringByAppendingString:host]; Index: sope-appserver/NGObjWeb/ChangeLog =================================================================== ---- sope-appserver/NGObjWeb/ChangeLog (revision 1632) -+++ sope-appserver/NGObjWeb/ChangeLog (working copy) -@@ -3,6 +3,11 @@ +--- sope-appserver/NGObjWeb/ChangeLog (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/ChangeLog (copie de travail) +@@ -1,3 +1,9 @@ ++2009-03-24 Wolfgang Sourdeau ++ ++ * SoObjects/SoActionInvocation.m ([SoActionInvocation ++ -bindToObject:inContext:]): do not retain methodObject when ++ instantiated since it is not autoreleased. ++ + 2008-12-11 Helge Hess + * WOHttpAdaptor/WOHttpAdaptor.m: properly embed threaded request +@@ -3,4 +9,9 @@ handler in a top-level pool (v4.7.27) +2008-09-01 Ludovic Marcotte @@ -3892,11 +3922,10 @@ Index: sope-appserver/NGObjWeb/ChangeLog + 2008-05-21 Sebastian Reitenbach - * WOHTTPURLHandle.m: add 'query' component of URL to request path Index: sope-appserver/NGObjWeb/DAVPropMap.plist =================================================================== ---- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1632) -+++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) +--- sope-appserver/NGObjWeb/DAVPropMap.plist (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) @@ -24,13 +24,19 @@ "{DAV:}status" = "davStatus"; "{http://apache.org/dav/props/}executable" = "davIsExecutable"; @@ -3979,8 +4008,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{http://groupdav.org/}component-set" = gdavComponentSet; Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail) @@ -655,6 +655,7 @@ if (self->responses == nil) self->responses = [[NSMutableArray alloc] initWithCapacity:64]; @@ -3991,8 +4020,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m case 'n': Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail) @@ -1523,16 +1523,16 @@ - (id)doREPORT:(WOContext *)_ctx { id domDocument; @@ -4079,8 +4108,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m /* DAV access control lists */ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) @@ -277,7 +277,8 @@ ok = [self renderLockToken:_object inContext:_ctx]; break; @@ -4093,8 +4122,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m ok = [self renderStatusResult:_object Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy) +--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail) @@ -62,6 +62,7 @@ properties:(NSDictionary *)_props inContext:(id)_ctx; @@ -4105,8 +4134,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h inContext:(id)_ctx; Index: sope-appserver/NGObjWeb/WODirectAction.m =================================================================== ---- sope-appserver/NGObjWeb/WODirectAction.m (revision 1632) -+++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) +--- sope-appserver/NGObjWeb/WODirectAction.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WODirectAction.m (copie de travail) @@ -46,7 +46,7 @@ } - (id)initWithContext:(WOContext *)_ctx { @@ -4140,8 +4169,8 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) @@ -216,6 +216,12 @@ assocCount++; } @@ -4157,8 +4186,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) @@ -41,6 +41,7 @@ WOAssociation *string; WOAssociation *target; @@ -4190,8 +4219,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m return NO; Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) @@ -41,7 +41,8 @@ WOAssociation *pageName; WOAssociation *actionClass; @@ -4204,8 +4233,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h /* 'ivar' associations */ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1632) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) +--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) @@ -39,22 +39,34 @@ static int debugLookup = -1; static int debugBaseURL = -1; @@ -4353,10 +4382,23 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m } } +Index: sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m +=================================================================== +--- sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (copie de travail) +@@ -338,7 +338,7 @@ + inv->actionName = [self->actionName copy]; + inv->argumentSpecifications = [self->argumentSpecifications copy]; + +- inv->methodObject = [[inv instantiateMethodInContext:_ctx] retain]; ++ inv->methodObject = [inv instantiateMethodInContext:_ctx]; + if (inv->methodObject == nil) { + [self errorWithFormat:@"did not find method '%@'", [self actionClassName]]; + return nil; Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1632) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy) +--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail) @@ -195,7 +195,8 @@ isCreateIfMissingMethod = YES; else if ([m isEqualToString:@"PROPPATCH"]) @@ -4369,8 +4411,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m // TODO: the following are only create-if-missing on the target! Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1632) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) @@ -32,6 +32,7 @@ #include #include @@ -4394,8 +4436,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m @implementation WOCoreApplication(SimpleParserSelection) Index: sope-appserver/NGObjWeb/Defaults.plist =================================================================== ---- sope-appserver/NGObjWeb/Defaults.plist (revision 1632) -+++ sope-appserver/NGObjWeb/Defaults.plist (working copy) +--- sope-appserver/NGObjWeb/Defaults.plist (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail) @@ -216,7 +216,7 @@ SoWebDAVDisableCrossHostMoveCheck = NO; @@ -4415,8 +4457,8 @@ Index: sope-appserver/NGObjWeb/Defaults.plist DELETE, Index: sope-appserver/NGObjWeb/WORequest.m =================================================================== ---- sope-appserver/NGObjWeb/WORequest.m (revision 1632) -+++ sope-appserver/NGObjWeb/WORequest.m (working copy) +--- sope-appserver/NGObjWeb/WORequest.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/WORequest.m (copie de travail) @@ -597,6 +597,8 @@ if (r.length > 0) language = [language substringToIndex:r.location]; @@ -4428,8 +4470,8 @@ Index: sope-appserver/NGObjWeb/WORequest.m if ((tmp = [self languageForBrowserLanguageCode:language])) Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1632) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail) @@ -62,6 +62,10 @@ /* RFC 3253 (DeltaV) */ NGHttpMethod_REPORT, @@ -4443,8 +4485,8 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1632) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (rĂ©vision 1632) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail) @@ -59,6 +59,10 @@ /* RFC 3253 (DeltaV) */ @"REPORT", From 9bc1a1fbe1c1e1969fca51950c11a81e87fe95f0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 13:43:19 +0000 Subject: [PATCH 02/10] Monotone-Parent: 478e5eec344abe2e6946e22b5c853865f80a2b66 Monotone-Revision: 6e583ecae28dc18e9f816d9d06c33fc5b047103a Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T13:43:19 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 11 +++++++++++ SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 1 + SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 1 + UI/Scheduler/UIxCalListingActions.m | 4 +--- sogo.spec | 7 +++++-- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index ed8f6fcdc..09e7074bc 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,14 @@ +2009-03-24 Wolfgang Sourdeau + + * iCalWeeklyRecurrenceCalculator.m + ([iCalWeeklyRecurrenceCalculator + -recurrenceRangesWithinCalendarDateRange:_r]): same as below. + + * iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator + -recurrenceRangesWithinCalendarDateRange:_r]): autorelease + currentStartDate when instantiated from a copy of firDate, to + avoid a leak. + 2009-02-06 Wolfgang Sourdeau * CardElement.m ([CardElement -setParent:aParent]): no longer diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 7cd4d6849..233f531e1 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -80,6 +80,7 @@ } currentStartDate = [firStart copy]; + [currentStartDate autorelease]; ranges = [NSMutableArray array]; i = 1; diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index f5303deaf..6b673464e 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -87,6 +87,7 @@ } currentStartDate = [firStart copy]; + [currentStartDate autorelease]; ranges = [NSMutableArray array]; byDayMask = [rrule byDayMask]; i = 1; diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 85ed4e5d3..82d950c9c 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -90,7 +90,7 @@ static NSArray *tasksFields = nil; endDate = nil; ASSIGN (request, newRequest); user = [[self context] activeUser]; - dateFormatter = [user dateFormatterInContext: context]; + ASSIGN (dateFormatter, [user dateFormatterInContext: context]); ASSIGN (userTimeZone, [user timeZone]); dayBasedView = NO; } @@ -103,8 +103,6 @@ static NSArray *tasksFields = nil; [dateFormatter release]; [request release]; [componentsData release]; - [startDate release]; - [endDate release]; [userTimeZone release]; [super dealloc]; } diff --git a/sogo.spec b/sogo.spec index 044f9af60..315d2141a 100644 --- a/sogo.spec +++ b/sogo.spec @@ -222,8 +222,11 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -/sbin/chkconfig --del sogod -/sbin/service sogod stop > /dev/null 2>&1 +if [ "$1" == "0" ] +then + /sbin/chkconfig --del sogod + /sbin/service sogod stop > /dev/null 2>&1 +fi %postun if test "$1" = "0" From 39cfaae6ec0f30e691e659868d0395095a76d847 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 13:45:32 +0000 Subject: [PATCH 03/10] reversed patch Monotone-Parent: 6e583ecae28dc18e9f816d9d06c33fc5b047103a Monotone-Revision: 3a3837b97a228bb1e5d1e55f692eaaded56ed2f7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T13:45:32 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 11 ----------- SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 1 - SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 1 - UI/Scheduler/UIxCalListingActions.m | 4 +++- sogo.spec | 7 ++----- 5 files changed, 5 insertions(+), 19 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 09e7074bc..ed8f6fcdc 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,14 +1,3 @@ -2009-03-24 Wolfgang Sourdeau - - * iCalWeeklyRecurrenceCalculator.m - ([iCalWeeklyRecurrenceCalculator - -recurrenceRangesWithinCalendarDateRange:_r]): same as below. - - * iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator - -recurrenceRangesWithinCalendarDateRange:_r]): autorelease - currentStartDate when instantiated from a copy of firDate, to - avoid a leak. - 2009-02-06 Wolfgang Sourdeau * CardElement.m ([CardElement -setParent:aParent]): no longer diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 233f531e1..7cd4d6849 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -80,7 +80,6 @@ } currentStartDate = [firStart copy]; - [currentStartDate autorelease]; ranges = [NSMutableArray array]; i = 1; diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index 6b673464e..f5303deaf 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -87,7 +87,6 @@ } currentStartDate = [firStart copy]; - [currentStartDate autorelease]; ranges = [NSMutableArray array]; byDayMask = [rrule byDayMask]; i = 1; diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 82d950c9c..85ed4e5d3 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -90,7 +90,7 @@ static NSArray *tasksFields = nil; endDate = nil; ASSIGN (request, newRequest); user = [[self context] activeUser]; - ASSIGN (dateFormatter, [user dateFormatterInContext: context]); + dateFormatter = [user dateFormatterInContext: context]; ASSIGN (userTimeZone, [user timeZone]); dayBasedView = NO; } @@ -103,6 +103,8 @@ static NSArray *tasksFields = nil; [dateFormatter release]; [request release]; [componentsData release]; + [startDate release]; + [endDate release]; [userTimeZone release]; [super dealloc]; } diff --git a/sogo.spec b/sogo.spec index 315d2141a..044f9af60 100644 --- a/sogo.spec +++ b/sogo.spec @@ -222,11 +222,8 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -if [ "$1" == "0" ] -then - /sbin/chkconfig --del sogod - /sbin/service sogod stop > /dev/null 2>&1 -fi +/sbin/chkconfig --del sogod +/sbin/service sogod stop > /dev/null 2>&1 %postun if test "$1" = "0" From 8aadf63f82baed83273fde6355ab20489b4f8a63 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 13:45:46 +0000 Subject: [PATCH 04/10] Monotone-Parent: 3a3837b97a228bb1e5d1e55f692eaaded56ed2f7 Monotone-Revision: 84ef38aac8dcb308bcabb407f3172c53ac0f05b2 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T13:45:46 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 11 +++++++++++ SOPE/NGCards/iCalDailyRecurrenceCalculator.m | 1 + SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 1 + 3 files changed, 13 insertions(+) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index ed8f6fcdc..09e7074bc 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,14 @@ +2009-03-24 Wolfgang Sourdeau + + * iCalWeeklyRecurrenceCalculator.m + ([iCalWeeklyRecurrenceCalculator + -recurrenceRangesWithinCalendarDateRange:_r]): same as below. + + * iCalDailyRecurrenceCalculator.m ([iCalDailyRecurrenceCalculator + -recurrenceRangesWithinCalendarDateRange:_r]): autorelease + currentStartDate when instantiated from a copy of firDate, to + avoid a leak. + 2009-02-06 Wolfgang Sourdeau * CardElement.m ([CardElement -setParent:aParent]): no longer diff --git a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m index 7cd4d6849..233f531e1 100644 --- a/SOPE/NGCards/iCalDailyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalDailyRecurrenceCalculator.m @@ -80,6 +80,7 @@ } currentStartDate = [firStart copy]; + [currentStartDate autorelease]; ranges = [NSMutableArray array]; i = 1; diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index f5303deaf..6b673464e 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -87,6 +87,7 @@ } currentStartDate = [firStart copy]; + [currentStartDate autorelease]; ranges = [NSMutableArray array]; byDayMask = [rrule byDayMask]; i = 1; From d3f53a5c195512a8f96ad1b043519b66545d29b8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 13:47:11 +0000 Subject: [PATCH 05/10] Monotone-Parent: 84ef38aac8dcb308bcabb407f3172c53ac0f05b2 Monotone-Revision: 43675f1618c28a385375562d6eaf3afabaa316ae Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T13:47:11 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ UI/Scheduler/UIxCalListingActions.m | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfe5f1f99..070de71ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-03-24 Wolfgang Sourdeau + + * UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions + -initWithRequest:newRequest]): retain dateFormatter, since it is + released in -dealloc. + ([UIxCalListingActions -dealloc]): do not release startDate and + endDate since they are not retained. + 2009-03-23 Francis Lachapelle * SoObjects/Appointments/SOGoAppointmentObject.m diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index 85ed4e5d3..82d950c9c 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -90,7 +90,7 @@ static NSArray *tasksFields = nil; endDate = nil; ASSIGN (request, newRequest); user = [[self context] activeUser]; - dateFormatter = [user dateFormatterInContext: context]; + ASSIGN (dateFormatter, [user dateFormatterInContext: context]); ASSIGN (userTimeZone, [user timeZone]); dayBasedView = NO; } @@ -103,8 +103,6 @@ static NSArray *tasksFields = nil; [dateFormatter release]; [request release]; [componentsData release]; - [startDate release]; - [endDate release]; [userTimeZone release]; [super dealloc]; } From f5a98f3571983c61bba004985c1c64bd05b698b2 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 14:05:55 +0000 Subject: [PATCH 06/10] Monotone-Parent: 43675f1618c28a385375562d6eaf3afabaa316ae Monotone-Revision: 261d328a4a30eba63838d32540b23a78ce2a3840 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T14:05:55 Monotone-Branch: ca.inverse.sogo --- UI/WebServerResources/GNUmakefile | 2 +- sogo.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile index b2e166e74..36c2bab6f 100644 --- a/UI/WebServerResources/GNUmakefile +++ b/UI/WebServerResources/GNUmakefile @@ -2,7 +2,7 @@ include ../common.make -WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *.jpg *gif *png *html *txt) +WEBSERVER_RESOURCE_FILES = $(shell ls *css *ico *js *gif *png *html *txt) all :: diff --git a/sogo.spec b/sogo.spec index 044f9af60..315d2141a 100644 --- a/sogo.spec +++ b/sogo.spec @@ -222,8 +222,11 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -/sbin/chkconfig --del sogod -/sbin/service sogod stop > /dev/null 2>&1 +if [ "$1" == "0" ] +then + /sbin/chkconfig --del sogod + /sbin/service sogod stop > /dev/null 2>&1 +fi %postun if test "$1" = "0" From 20adc66b93c3dfb26aed955d11896557aedb450d Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 14:25:09 +0000 Subject: [PATCH 07/10] Monotone-Parent: 261d328a4a30eba63838d32540b23a78ce2a3840 Monotone-Revision: e0570f48ebcd0056aa949c6b4c5df7386238e282 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T14:25:09 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-patchset-r1632.diff | 290 +++++++++++++++++++--------------- 1 file changed, 160 insertions(+), 130 deletions(-) diff --git a/SOPE/sope-patchset-r1632.diff b/SOPE/sope-patchset-r1632.diff index 56a664ed6..d0720199f 100644 --- a/SOPE/sope-patchset-r1632.diff +++ b/SOPE/sope-patchset-r1632.diff @@ -1,7 +1,7 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m =================================================================== ---- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (rĂ©vision 1632) -+++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (copie de travail) +--- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (revision 1632) ++++ sope-gdl1/PostgreSQL/PostgreSQL72Channel.m (working copy) @@ -713,6 +713,39 @@ return ms; } @@ -44,8 +44,8 @@ Index: sope-gdl1/PostgreSQL/PostgreSQL72Channel.m @implementation PostgreSQL72Channel(PrimaryKeyGeneration) Index: sope-gdl1/MySQL/MySQL4Channel.m =================================================================== ---- sope-gdl1/MySQL/MySQL4Channel.m (rĂ©vision 1632) -+++ sope-gdl1/MySQL/MySQL4Channel.m (copie de travail) +--- sope-gdl1/MySQL/MySQL4Channel.m (revision 1632) ++++ sope-gdl1/MySQL/MySQL4Channel.m (working copy) @@ -755,6 +755,39 @@ return pkey; } @@ -88,8 +88,8 @@ Index: sope-gdl1/MySQL/MySQL4Channel.m void __link_MySQL4Channel() { Index: sope-gdl1/GDLAccess/EOAdaptor.m =================================================================== ---- sope-gdl1/GDLAccess/EOAdaptor.m (rĂ©vision 1632) -+++ sope-gdl1/GDLAccess/EOAdaptor.m (copie de travail) +--- sope-gdl1/GDLAccess/EOAdaptor.m (revision 1632) ++++ sope-gdl1/GDLAccess/EOAdaptor.m (working copy) @@ -202,6 +202,7 @@ if ([_scheme isEqualToString:@"sybase"]) return @"Sybase10"; if ([_scheme isEqualToString:@"sqlite"]) return @"SQLite3"; @@ -100,8 +100,8 @@ Index: sope-gdl1/GDLAccess/EOAdaptor.m NSLog(@"WARNING(%s): asked for 'http' URL, " Index: sope-gdl1/Oracle8/OracleAdaptorChannel.m =================================================================== ---- sope-gdl1/Oracle8/OracleAdaptorChannel.m (rĂ©vision 1632) -+++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (copie de travail) +--- sope-gdl1/Oracle8/OracleAdaptorChannel.m (revision 1632) ++++ sope-gdl1/Oracle8/OracleAdaptorChannel.m (working copy) @@ -1,7 +1,7 @@ /* ** OracleAdaptorChannel.m @@ -288,8 +288,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 1632) -+++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (copie de travail) +--- sope-gdl1/Oracle8/OracleAdaptorChannelController.m (revision 1632) ++++ sope-gdl1/Oracle8/OracleAdaptorChannelController.m (working copy) @@ -31,6 +31,8 @@ #import #import @@ -336,8 +336,8 @@ Index: sope-gdl1/Oracle8/OracleAdaptorChannelController.m Index: sope-mime/NGImap4/NGImap4Client.h =================================================================== ---- sope-mime/NGImap4/NGImap4Client.h (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGImap4Client.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.h (revision 1632) ++++ sope-mime/NGImap4/NGImap4Client.h (working copy) @@ -62,6 +62,8 @@ NGImap4ResponseNormalizer *normer; NSMutableArray *responseReceiver; @@ -366,8 +366,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 1632) -+++ sope-mime/NGImap4/NGImap4Client.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Client.m (revision 1632) ++++ sope-mime/NGImap4/NGImap4Client.m (working copy) @@ -24,6 +24,8 @@ #include "NGImap4Client.h" #include "NGImap4Context.h" @@ -675,8 +675,8 @@ Index: sope-mime/NGImap4/NGImap4Client.m __PRETTY_FUNCTION__, [_exception name], [_exception reason]]; Index: sope-mime/NGImap4/NGSieveClient.m =================================================================== ---- sope-mime/NGImap4/NGSieveClient.m (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGSieveClient.m (copie de travail) +--- sope-mime/NGImap4/NGSieveClient.m (revision 1632) ++++ sope-mime/NGImap4/NGSieveClient.m (working copy) @@ -294,8 +294,8 @@ return con; } @@ -711,8 +711,8 @@ Index: sope-mime/NGImap4/NGSieveClient.m /* write */ Index: sope-mime/NGImap4/NGImap4Connection.h =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.h (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGImap4Connection.h (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.h (revision 1632) ++++ sope-mime/NGImap4/NGImap4Connection.h (working copy) @@ -89,6 +89,7 @@ - (NSArray *)subfoldersForURL:(NSURL *)_url; @@ -723,8 +723,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.h Index: sope-mime/NGImap4/NGImap4Connection.m =================================================================== ---- sope-mime/NGImap4/NGImap4Connection.m (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGImap4Connection.m (copie de travail) +--- sope-mime/NGImap4/NGImap4Connection.m (revision 1632) ++++ sope-mime/NGImap4/NGImap4Connection.m (working copy) @@ -381,7 +381,7 @@ if (debugCache) [self logWithFormat:@" no folders cached yet .."]; @@ -771,8 +771,8 @@ Index: sope-mime/NGImap4/NGImap4Connection.m - (id)infoForMailboxAtURL:(NSURL *)_url { Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ResponseNormalizer.m (revision 1632) ++++ sope-mime/NGImap4/NGImap4ResponseNormalizer.m (working copy) @@ -292,7 +292,7 @@ /* filter for fetch response @@ -820,8 +820,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseNormalizer.m if (objs) free(objs); Index: sope-mime/NGImap4/NGImap4ResponseParser.m =================================================================== ---- sope-mime/NGImap4/NGImap4ResponseParser.m (rĂ©vision 1632) -+++ sope-mime/NGImap4/NGImap4ResponseParser.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ResponseParser.m (revision 1632) ++++ sope-mime/NGImap4/NGImap4ResponseParser.m (working copy) @@ -31,6 +31,7 @@ @interface NGImap4ResponseParser(ParsingPrivates) - (BOOL)_parseNumberUntaggedResponse:(NGMutableHashMap *)result_; @@ -1271,8 +1271,8 @@ Index: sope-mime/NGImap4/NGImap4ResponseParser.m self->serverResponseDebug = Index: sope-mime/NGImap4/ChangeLog =================================================================== ---- sope-mime/NGImap4/ChangeLog (rĂ©vision 1632) -+++ sope-mime/NGImap4/ChangeLog (copie de travail) +--- sope-mime/NGImap4/ChangeLog (revision 1632) ++++ sope-mime/NGImap4/ChangeLog (working copy) @@ -1,3 +1,29 @@ +2008-10-23 Wolfgang Sourdeau + @@ -1305,8 +1305,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 1632) -+++ sope-mime/NGImap4/NGImap4ConnectionManager.m (copie de travail) +--- sope-mime/NGImap4/NGImap4ConnectionManager.m (revision 1632) ++++ sope-mime/NGImap4/NGImap4ConnectionManager.m (working copy) @@ -38,6 +38,9 @@ debugCache = [ud boolForKey:@"NGImap4EnableIMAP4CacheDebug"]; poolingOff = [ud boolForKey:@"NGImap4DisableIMAP4Pooling"]; @@ -1432,8 +1432,8 @@ Index: sope-mime/NGImap4/NGImap4ConnectionManager.m /* client object */ Index: sope-mime/NGImap4/NSString+Imap4.m =================================================================== ---- sope-mime/NGImap4/NSString+Imap4.m (rĂ©vision 1632) -+++ sope-mime/NGImap4/NSString+Imap4.m (copie de travail) +--- sope-mime/NGImap4/NSString+Imap4.m (revision 1632) ++++ sope-mime/NGImap4/NSString+Imap4.m (working copy) @@ -20,11 +20,56 @@ 02111-1307, USA. */ @@ -1954,8 +1954,8 @@ Index: sope-mime/NGImap4/NSString+Imap4.m +@end /* NSString(Imap4) */ Index: sope-mime/NGMail/NGSmtpClient.m =================================================================== ---- sope-mime/NGMail/NGSmtpClient.m (rĂ©vision 1632) -+++ sope-mime/NGMail/NGSmtpClient.m (copie de travail) +--- sope-mime/NGMail/NGSmtpClient.m (revision 1632) ++++ sope-mime/NGMail/NGSmtpClient.m (working copy) @@ -24,6 +24,82 @@ #include "NGSmtpReplyCodes.h" #include "common.h" @@ -2110,8 +2110,8 @@ Index: sope-mime/NGMail/NGSmtpClient.m reply = [self receiveReply]; Index: sope-mime/NGMail/NGMailAddressParser.h =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.h (rĂ©vision 1632) -+++ sope-mime/NGMail/NGMailAddressParser.h (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.h (revision 1632) ++++ sope-mime/NGMail/NGMailAddressParser.h (working copy) @@ -24,7 +24,9 @@ #import @@ -2148,8 +2148,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.h Index: sope-mime/NGMail/NGMimeMessageGenerator.m =================================================================== ---- sope-mime/NGMail/NGMimeMessageGenerator.m (rĂ©vision 1632) -+++ sope-mime/NGMail/NGMimeMessageGenerator.m (copie de travail) +--- sope-mime/NGMail/NGMimeMessageGenerator.m (revision 1632) ++++ sope-mime/NGMail/NGMimeMessageGenerator.m (working copy) @@ -86,37 +86,40 @@ char *des = NULL; unsigned int cnt; @@ -2214,8 +2214,8 @@ Index: sope-mime/NGMail/NGMimeMessageGenerator.m unsigned isoEndLen = 2; Index: sope-mime/NGMail/NGMailAddressParser.m =================================================================== ---- sope-mime/NGMail/NGMailAddressParser.m (rĂ©vision 1632) -+++ sope-mime/NGMail/NGMailAddressParser.m (copie de travail) +--- sope-mime/NGMail/NGMailAddressParser.m (revision 1632) ++++ sope-mime/NGMail/NGMailAddressParser.m (working copy) @@ -52,9 +52,9 @@ StrClass = [NSString class]; } @@ -2359,8 +2359,8 @@ Index: sope-mime/NGMail/NGMailAddressParser.m self->dataPos = 0; Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m =================================================================== ---- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (revision 1632) ++++ sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m (working copy) @@ -19,88 +19,45 @@ 02111-1307, USA. */ @@ -2764,8 +2764,8 @@ Index: sope-mime/NGMime/NGMimeRFC822DateHeaderFieldParser.m #if 0 Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeMultipartBodyParser.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeMultipartBodyParser.m (revision 1632) ++++ sope-mime/NGMime/NGMimeMultipartBodyParser.m (working copy) @@ -428,6 +428,7 @@ NSString *boundary = nil; NSArray *rawBodyParts = nil; @@ -2789,8 +2789,8 @@ Index: sope-mime/NGMime/NGMimeMultipartBodyParser.m if (rawBodyParts) { Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m =================================================================== ---- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (copie de travail) +--- sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (revision 1632) ++++ sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m (working copy) @@ -77,6 +77,7 @@ [rfc822Set setGenerator:gen forField:@"bcc"]; [rfc822Set setGenerator:gen forField:Fields->from]; @@ -2801,8 +2801,8 @@ Index: sope-mime/NGMime/NGMimeHeaderFieldGeneratorSet.m Index: sope-mime/NGMime/NGMimeType.m =================================================================== ---- sope-mime/NGMime/NGMimeType.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeType.m (copie de travail) +--- sope-mime/NGMime/NGMimeType.m (revision 1632) ++++ sope-mime/NGMime/NGMimeType.m (working copy) @@ -120,28 +120,23 @@ /* some unsupported, but known encoding */ @@ -2899,8 +2899,8 @@ Index: sope-mime/NGMime/NGMimeType.m - (NSString *)stringValue { Index: sope-mime/NGMime/NGMimeBodyPart.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyPart.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeBodyPart.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyPart.m (revision 1632) ++++ sope-mime/NGMime/NGMimeBodyPart.m (working copy) @@ -31,18 +31,6 @@ return 2; } @@ -2937,8 +2937,8 @@ Index: sope-mime/NGMime/NGMimeBodyPart.m - (NSString *)contentId { Index: sope-mime/NGMime/ChangeLog =================================================================== ---- sope-mime/NGMime/ChangeLog (rĂ©vision 1632) -+++ sope-mime/NGMime/ChangeLog (copie de travail) +--- sope-mime/NGMime/ChangeLog (revision 1632) ++++ sope-mime/NGMime/ChangeLog (working copy) @@ -1,3 +1,25 @@ +2008-09-08 Wolfgang Sourdeau + @@ -2967,8 +2967,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 1632) -+++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (revision 1632) ++++ sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m (working copy) @@ -36,8 +36,7 @@ NGMimeType *type = nil; // only one content-type field NSString *tmp = nil; @@ -3107,8 +3107,8 @@ Index: sope-mime/NGMime/NGMimeContentTypeHeaderFieldGenerator.m } Index: sope-mime/NGMime/NGMimePartGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimePartGenerator.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimePartGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimePartGenerator.m (revision 1632) ++++ sope-mime/NGMime/NGMimePartGenerator.m (working copy) @@ -155,8 +155,9 @@ BOOL isMultiValue, isFirst; @@ -3132,8 +3132,8 @@ Index: sope-mime/NGMime/NGMimePartGenerator.m Index: sope-mime/NGMime/NGMimeBodyParser.m =================================================================== ---- sope-mime/NGMime/NGMimeBodyParser.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeBodyParser.m (copie de travail) +--- sope-mime/NGMime/NGMimeBodyParser.m (revision 1632) ++++ sope-mime/NGMime/NGMimeBodyParser.m (working copy) @@ -67,7 +67,10 @@ if (_data == nil) return nil; @@ -3171,8 +3171,8 @@ Index: sope-mime/NGMime/NGMimeBodyParser.m } Index: sope-mime/NGMime/NGMimePartParser.h =================================================================== ---- sope-mime/NGMime/NGMimePartParser.h (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimePartParser.h (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.h (revision 1632) ++++ sope-mime/NGMime/NGMimePartParser.h (working copy) @@ -117,6 +117,7 @@ BOOL parserParseRawBodyDataOfPart:1; BOOL parserBodyParserForPart:1; @@ -3193,8 +3193,8 @@ Index: sope-mime/NGMime/NGMimePartParser.h @interface NSObject(NGMimePartParser) Index: sope-mime/NGMime/NGMimePartParser.m =================================================================== ---- sope-mime/NGMime/NGMimePartParser.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimePartParser.m (copie de travail) +--- sope-mime/NGMime/NGMimePartParser.m (revision 1632) ++++ sope-mime/NGMime/NGMimePartParser.m (working copy) @@ -227,7 +227,7 @@ } @@ -3218,8 +3218,8 @@ Index: sope-mime/NGMime/NGMimePartParser.m : [NGMimeType mimeType:[ctype stringValue]]; Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (revision 1632) ++++ sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m (working copy) @@ -105,10 +105,10 @@ } @@ -3304,8 +3304,8 @@ Index: sope-mime/NGMime/NGMimeAddressHeaderFieldGenerator.m return data; Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m =================================================================== ---- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (rĂ©vision 1632) -+++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (copie de travail) +--- sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (revision 1632) ++++ sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m (working copy) @@ -49,80 +49,70 @@ // TODO: move the stuff below to some NSString or NSData category? @@ -3440,8 +3440,8 @@ Index: sope-mime/NGMime/NGMimeContentDispositionHeaderFieldGenerator.m } Index: sope-core/NGExtensions/NGExtensions/NSString+Ext.h =================================================================== ---- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (rĂ©vision 1632) -+++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (copie de travail) +--- sope-core/NGExtensions/NGExtensions/NSString+Ext.h (revision 1632) ++++ sope-core/NGExtensions/NGExtensions/NSString+Ext.h (working copy) @@ -30,6 +30,7 @@ @interface NSString(GSAdditions) @@ -3478,8 +3478,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 1632) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (revision 1632) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Ext.m (working copy) @@ -39,18 +39,6 @@ : (NSString *)[[self copy] autorelease]; } @@ -3567,8 +3567,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 1632) -+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (copie de travail) +--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (revision 1632) ++++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m (working copy) @@ -140,8 +140,12 @@ @@ -3608,10 +3608,27 @@ Index: sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m } static char *iconv_wrapper(id self, char *_src, unsigned _srcLen, +Index: sope-core/NGExtensions/NGCalendarDateRange.m +=================================================================== +--- sope-core/NGExtensions/NGCalendarDateRange.m (revision 1632) ++++ sope-core/NGExtensions/NGCalendarDateRange.m (working copy) +@@ -50,6 +50,12 @@ + return self; + } + ++- (void)dealloc { ++ [self->startDate release]; ++ [self->endDate release]; ++ [super dealloc]; ++} ++ + /* NSCopying */ + + - (id)copyWithZone:(NSZone *)zone { Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m =================================================================== ---- sope-core/NGExtensions/NGQuotedPrintableCoding.m (rĂ©vision 1632) -+++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (copie de travail) +--- sope-core/NGExtensions/NGQuotedPrintableCoding.m (revision 1632) ++++ sope-core/NGExtensions/NGQuotedPrintableCoding.m (working copy) @@ -278,7 +278,12 @@ for (cnt = 0; (cnt < _srcLen) && (destCnt < _destLen); cnt++) { @@ -3628,8 +3645,8 @@ Index: sope-core/NGExtensions/NGQuotedPrintableCoding.m ((c > 31) && (c < 61)) || Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m =================================================================== ---- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (rĂ©vision 1632) -+++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (copie de travail) +--- sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (revision 1632) ++++ sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m (working copy) @@ -19,6 +19,7 @@ 02111-1307, USA. */ @@ -3638,10 +3655,23 @@ Index: sope-core/NGExtensions/EOExt.subproj/EOGlobalID+Ext.m #import #import +Index: sope-core/NGExtensions/ChangeLog +=================================================================== +--- sope-core/NGExtensions/ChangeLog (revision 1632) ++++ sope-core/NGExtensions/ChangeLog (working copy) +@@ -1,3 +1,8 @@ ++2009-03-24 Wolfgang Sourdeau ++ ++ * NGCalendarDateRange.m ([NGCalendarDateRange -dealloc]): release ++ endDate and startDate. ++ + 2008-03-11 Helge Hess + + * FdExt.subproj/NSArray+enumerator.m: fixed for MacOS 10.5 (v4.7.201) Index: sope-core/NGStreams/GNUmakefile.preamble =================================================================== ---- sope-core/NGStreams/GNUmakefile.preamble (rĂ©vision 1632) -+++ sope-core/NGStreams/GNUmakefile.preamble (copie de travail) +--- sope-core/NGStreams/GNUmakefile.preamble (revision 1632) ++++ sope-core/NGStreams/GNUmakefile.preamble (working copy) @@ -1,7 +1,10 @@ # compilation settings @@ -3655,8 +3685,8 @@ Index: sope-core/NGStreams/GNUmakefile.preamble -I.. Index: sope-xml/libxmlSAXDriver/ChangeLog =================================================================== ---- sope-xml/libxmlSAXDriver/ChangeLog (rĂ©vision 1632) -+++ sope-xml/libxmlSAXDriver/ChangeLog (copie de travail) +--- sope-xml/libxmlSAXDriver/ChangeLog (revision 1632) ++++ sope-xml/libxmlSAXDriver/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2009-03-24 Wolfgang Sourdeau + @@ -3668,8 +3698,8 @@ Index: sope-xml/libxmlSAXDriver/ChangeLog * libXMLSaxDriver.m: fixed last changes for libFoundation (v4.5.24) Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (rĂ©vision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (revision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h (working copy) @@ -19,6 +19,8 @@ 02111-1307, USA. */ @@ -3690,8 +3720,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.h id entityResolver; Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (rĂ©vision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (revision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m (working copy) @@ -30,6 +30,12 @@ #include #include @@ -3750,8 +3780,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m - (void)tearDownParser { Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m =================================================================== ---- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (rĂ©vision 1632) -+++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (copie de travail) +--- sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (revision 1632) ++++ sope-xml/libxmlSAXDriver/libxmlSAXDriver.m (working copy) @@ -614,7 +614,7 @@ xmlParseDocument(ctxt); @@ -3780,8 +3810,8 @@ Index: sope-xml/libxmlSAXDriver/libxmlSAXDriver.m Index: sope-appserver/mod_ngobjweb/config.c =================================================================== ---- sope-appserver/mod_ngobjweb/config.c (rĂ©vision 1632) -+++ sope-appserver/mod_ngobjweb/config.c (copie de travail) +--- sope-appserver/mod_ngobjweb/config.c (revision 1632) ++++ sope-appserver/mod_ngobjweb/config.c (working copy) @@ -21,7 +21,7 @@ #include "common.h" @@ -3793,8 +3823,8 @@ Index: sope-appserver/mod_ngobjweb/config.c if (buf == NULL) Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c =================================================================== ---- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (rĂ©vision 1632) -+++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (copie de travail) +--- sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (revision 1632) ++++ sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c (working copy) @@ -23,6 +23,7 @@ #include #include @@ -3805,8 +3835,8 @@ Index: sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c // returns the number of bytes which where read from the buffer Index: sope-appserver/mod_ngobjweb/GNUmakefile =================================================================== ---- sope-appserver/mod_ngobjweb/GNUmakefile (rĂ©vision 1632) -+++ sope-appserver/mod_ngobjweb/GNUmakefile (copie de travail) +--- sope-appserver/mod_ngobjweb/GNUmakefile (revision 1632) ++++ sope-appserver/mod_ngobjweb/GNUmakefile (working copy) @@ -82,7 +82,7 @@ CFLAGS = -Wall -I. -fPIC \ @@ -3828,8 +3858,8 @@ Index: sope-appserver/mod_ngobjweb/GNUmakefile $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble =================================================================== ---- sope-appserver/NGObjWeb/GNUmakefile.postamble (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/GNUmakefile.postamble (copie de travail) +--- sope-appserver/NGObjWeb/GNUmakefile.postamble (revision 1632) ++++ sope-appserver/NGObjWeb/GNUmakefile.postamble (working copy) @@ -23,14 +23,20 @@ # install makefiles @@ -3860,8 +3890,8 @@ Index: sope-appserver/NGObjWeb/GNUmakefile.postamble + $(DESTDIR)/$(GNUSTEP_MAKEFILES)/wobundle.make Index: sope-appserver/NGObjWeb/WOContext.m =================================================================== ---- sope-appserver/NGObjWeb/WOContext.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WOContext.m (copie de travail) +--- sope-appserver/NGObjWeb/WOContext.m (revision 1632) ++++ sope-appserver/NGObjWeb/WOContext.m (working copy) @@ -64,11 +64,13 @@ static BOOL testNSURLs = NO; static BOOL newCURLStyle = NO; @@ -3900,8 +3930,8 @@ Index: sope-appserver/NGObjWeb/WOContext.m serverURL = [@"http://" stringByAppendingString:host]; Index: sope-appserver/NGObjWeb/ChangeLog =================================================================== ---- sope-appserver/NGObjWeb/ChangeLog (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/ChangeLog (copie de travail) +--- sope-appserver/NGObjWeb/ChangeLog (revision 1632) ++++ sope-appserver/NGObjWeb/ChangeLog (working copy) @@ -1,3 +1,9 @@ +2009-03-24 Wolfgang Sourdeau + @@ -3924,8 +3954,8 @@ Index: sope-appserver/NGObjWeb/ChangeLog Index: sope-appserver/NGObjWeb/DAVPropMap.plist =================================================================== ---- sope-appserver/NGObjWeb/DAVPropMap.plist (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/DAVPropMap.plist (copie de travail) +--- sope-appserver/NGObjWeb/DAVPropMap.plist (revision 1632) ++++ sope-appserver/NGObjWeb/DAVPropMap.plist (working copy) @@ -24,13 +24,19 @@ "{DAV:}status" = "davStatus"; "{http://apache.org/dav/props/}executable" = "davIsExecutable"; @@ -4008,8 +4038,8 @@ Index: sope-appserver/NGObjWeb/DAVPropMap.plist "{http://groupdav.org/}component-set" = gdavComponentSet; Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (revision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m (working copy) @@ -655,6 +655,7 @@ if (self->responses == nil) self->responses = [[NSMutableArray alloc] initWithCapacity:64]; @@ -4020,8 +4050,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SaxDAVHandler.m case 'n': Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (revision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m (working copy) @@ -1523,16 +1523,16 @@ - (id)doREPORT:(WOContext *)_ctx { id domDocument; @@ -4108,8 +4138,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObjectWebDAVDispatcher.m /* DAV access control lists */ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (revision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m (working copy) @@ -277,7 +277,8 @@ ok = [self renderLockToken:_object inContext:_ctx]; break; @@ -4122,8 +4152,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m ok = [self renderStatusResult:_object Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h =================================================================== ---- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (copie de travail) +--- sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (revision 1632) ++++ sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h (working copy) @@ -62,6 +62,7 @@ properties:(NSDictionary *)_props inContext:(id)_ctx; @@ -4134,8 +4164,8 @@ Index: sope-appserver/NGObjWeb/WebDAV/SoObject+SoDAV.h inContext:(id)_ctx; Index: sope-appserver/NGObjWeb/WODirectAction.m =================================================================== ---- sope-appserver/NGObjWeb/WODirectAction.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WODirectAction.m (copie de travail) +--- sope-appserver/NGObjWeb/WODirectAction.m (revision 1632) ++++ sope-appserver/NGObjWeb/WODirectAction.m (working copy) @@ -46,7 +46,7 @@ } - (id)initWithContext:(WOContext *)_ctx { @@ -4169,8 +4199,8 @@ Index: sope-appserver/NGObjWeb/WODirectAction.m Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (revision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m (working copy) @@ -216,6 +216,12 @@ assocCount++; } @@ -4186,8 +4216,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.m Index: sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m =================================================================== ---- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (revision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/_WOComplexHyperlink.m (working copy) @@ -41,6 +41,7 @@ WOAssociation *string; WOAssociation *target; @@ -4219,8 +4249,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 1632) -+++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (copie de travail) +--- sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (revision 1632) ++++ sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h (working copy) @@ -41,7 +41,8 @@ WOAssociation *pageName; WOAssociation *actionClass; @@ -4233,8 +4263,8 @@ Index: sope-appserver/NGObjWeb/DynamicElements/WOHyperlinkInfo.h /* 'ivar' associations */ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoObject.m (revision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject.m (working copy) @@ -39,22 +39,34 @@ static int debugLookup = -1; static int debugBaseURL = -1; @@ -4384,8 +4414,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject.m Index: sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (revision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m (working copy) @@ -338,7 +338,7 @@ inv->actionName = [self->actionName copy]; inv->argumentSpecifications = [self->argumentSpecifications copy]; @@ -4397,8 +4427,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoActionInvocation.m return nil; Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m =================================================================== ---- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (copie de travail) +--- sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (revision 1632) ++++ sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m (working copy) @@ -195,7 +195,8 @@ isCreateIfMissingMethod = YES; else if ([m isEqualToString:@"PROPPATCH"]) @@ -4411,8 +4441,8 @@ Index: sope-appserver/NGObjWeb/SoObjects/SoObject+Traversal.m // TODO: the following are only create-if-missing on the target! Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m =================================================================== ---- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (copie de travail) +--- sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (revision 1632) ++++ sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m (working copy) @@ -32,6 +32,7 @@ #include #include @@ -4436,8 +4466,8 @@ Index: sope-appserver/NGObjWeb/WOHttpAdaptor/WOHttpTransaction.m @implementation WOCoreApplication(SimpleParserSelection) Index: sope-appserver/NGObjWeb/Defaults.plist =================================================================== ---- sope-appserver/NGObjWeb/Defaults.plist (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/Defaults.plist (copie de travail) +--- sope-appserver/NGObjWeb/Defaults.plist (revision 1632) ++++ sope-appserver/NGObjWeb/Defaults.plist (working copy) @@ -216,7 +216,7 @@ SoWebDAVDisableCrossHostMoveCheck = NO; @@ -4457,8 +4487,8 @@ Index: sope-appserver/NGObjWeb/Defaults.plist DELETE, Index: sope-appserver/NGObjWeb/WORequest.m =================================================================== ---- sope-appserver/NGObjWeb/WORequest.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/WORequest.m (copie de travail) +--- sope-appserver/NGObjWeb/WORequest.m (revision 1632) ++++ sope-appserver/NGObjWeb/WORequest.m (working copy) @@ -597,6 +597,8 @@ if (r.length > 0) language = [language substringToIndex:r.location]; @@ -4470,8 +4500,8 @@ Index: sope-appserver/NGObjWeb/WORequest.m if ((tmp = [self languageForBrowserLanguageCode:language])) Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (copie de travail) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (revision 1632) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h (working copy) @@ -62,6 +62,10 @@ /* RFC 3253 (DeltaV) */ NGHttpMethod_REPORT, @@ -4485,8 +4515,8 @@ Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.h Index: sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m =================================================================== ---- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (rĂ©vision 1632) -+++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (copie de travail) +--- sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (revision 1632) ++++ sope-appserver/NGObjWeb/NGHttp/NGHttpRequest.m (working copy) @@ -59,6 +59,10 @@ /* RFC 3253 (DeltaV) */ @"REPORT", From 927055105054788b1ce802d5394ea4f8302ef78e Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 14:25:44 +0000 Subject: [PATCH 08/10] Monotone-Parent: e0570f48ebcd0056aa949c6b4c5df7386238e282 Monotone-Revision: c899af499a48639ec23979b9d33c7db9843f7110 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T14:25:44 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/SOGo/SOGoUser.m | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 070de71ec..bd1c2c991 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-03-24 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUser.m ([SOGoUser + -_prepareDefaultMailAccounts]): return an autoreleased array to + avoid a leak. + * UI/Scheduler/UIxCalListingActions.m ([UIxCalListingActions -initWithRequest:newRequest]): retain dateFormatter, since it is released in -dealloc. diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m index 3d4a4a9aa..f725e525a 100644 --- a/SoObjects/SOGo/SOGoUser.m +++ b/SoObjects/SOGo/SOGoUser.m @@ -740,7 +740,7 @@ _timeValue (NSString *key) [mailAccount setObject: identities forKey: @"identities"]; - mailAccounts = [NSMutableArray new]; + mailAccounts = [NSMutableArray array]; [mailAccounts addObject: mailAccount]; return mailAccounts; From 946886ed074652255f2525c4479f52c65a189260 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 14:55:10 +0000 Subject: [PATCH 09/10] reversed patch Monotone-Parent: c899af499a48639ec23979b9d33c7db9843f7110 Monotone-Revision: 066415866c34e37d51f2dd40a9e5f8469c495393 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T14:55:10 Monotone-Branch: ca.inverse.sogo --- sogo.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sogo.spec b/sogo.spec index 315d2141a..044f9af60 100644 --- a/sogo.spec +++ b/sogo.spec @@ -222,11 +222,8 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -if [ "$1" == "0" ] -then - /sbin/chkconfig --del sogod - /sbin/service sogod stop > /dev/null 2>&1 -fi +/sbin/chkconfig --del sogod +/sbin/service sogod stop > /dev/null 2>&1 %postun if test "$1" = "0" From 290c4c251713d979cd3855d60096a39c4306f218 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 24 Mar 2009 15:14:20 +0000 Subject: [PATCH 10/10] Monotone-Parent: 066415866c34e37d51f2dd40a9e5f8469c495393 Monotone-Revision: cb528ed9e72c06055c7fde882bedd15f7ef64451 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-24T15:14:20 Monotone-Branch: ca.inverse.sogo --- sogo.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sogo.spec b/sogo.spec index 044f9af60..ef5b7b99b 100644 --- a/sogo.spec +++ b/sogo.spec @@ -97,9 +97,7 @@ rm -fr ${RPM_BUILD_ROOT} # ****************************** build ******************************** %build . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh -./configure \ - --enable-strip \ - --disable-debug +./configure case %{_target_platform} in ppc64-*) @@ -222,8 +220,11 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi /sbin/chkconfig --add sogod %preun -/sbin/chkconfig --del sogod -/sbin/service sogod stop > /dev/null 2>&1 +if [ "$1" == "0" ] +then + /sbin/chkconfig --del sogod + /sbin/service sogod stop > /dev/null 2>&1 +fi %postun if test "$1" = "0"