summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2014-02-04 10:48:10 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2014-02-04 10:48:10 +0000
commitbe9db5c6e871a750b98b97ea1f64a8454be213e8 (patch)
tree16a182e7a21ba46a1defd837fe7f64de2e2d45a7 /gnustep-libs/sope/files
parentUpdate metadata (diff)
downloadgnustep-be9db5c6e871a750b98b97ea1f64a8454be213e8.tar.gz
gnustep-be9db5c6e871a750b98b97ea1f64a8454be213e8.tar.bz2
gnustep-be9db5c6e871a750b98b97ea1f64a8454be213e8.zip
Finally update sope/sogo
svn path=/overlay/; revision=452
Diffstat (limited to 'gnustep-libs/sope/files')
-rw-r--r--gnustep-libs/sope/files/47_mod_ngobjweb.conf5
-rw-r--r--gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch10
-rw-r--r--gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch34
-rw-r--r--gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch11
-rw-r--r--gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch11
-rw-r--r--gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch112
-rw-r--r--gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch11
-rw-r--r--gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch39
-rw-r--r--gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch61
-rw-r--r--gnustep-libs/sope/files/sope-r1660-SoOFS.patch19
-rw-r--r--gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch11
-rw-r--r--gnustep-libs/sope/files/sope-r1660-use_system_root.patch14
-rw-r--r--gnustep-libs/sope/files/sope.envd2
13 files changed, 0 insertions, 340 deletions
diff --git a/gnustep-libs/sope/files/47_mod_ngobjweb.conf b/gnustep-libs/sope/files/47_mod_ngobjweb.conf
deleted file mode 100644
index 950dbd8..0000000
--- a/gnustep-libs/sope/files/47_mod_ngobjweb.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<IfDefine NGOBJWEB>
-LoadModule ngobjweb_module modules/mod_ngobjweb.so
-</IfDefine>
-
-# vim: ts=4 filetype=apache
diff --git a/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch b/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch
deleted file mode 100644
index ae70279..0000000
--- a/gnustep-libs/sope/files/sope-r1660-LDAP_deprecated.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sope-ldap/NGLdap/common.h 2010-01-08 13:02:02.010900599 +0100
-+++ sope-ldap/NGLdap/common.h.lazyfix 2010-01-08 13:01:50.530900712 +0100
-@@ -22,6 +22,7 @@
- #ifndef __NGLdap_common_H__
- #define __NGLdap_common_H__
-
-+#define LDAP_DEPRECATED 1
- #if USE_OWN_LIBLDAP
- # include <sys/types.h>
- # include <ldap/lber.h>
diff --git a/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch b/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch
deleted file mode 100644
index b7e026c..0000000
--- a/gnustep-libs/sope/files/sope-r1660-MySQL4Channel.m.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- sope-gdl1/MySQL/MySQL4Channel.m 2009-11-28 00:43:27.731467911 +0100
-+++ sope-gdl1/MySQL/MySQL4Channel.m.new 2009-11-28 00:42:10.683968806 +0100
-@@ -634,11 +634,11 @@
-
- if ((merrno = mysql_errno(self->_connection)) != 0) {
- const char *error;
-+ error = mysql_error(self->_connection);
-
- if (isDebuggingEnabled)
- NSLog(@"%@ cannot use result: '%s'", self, error);
-
-- error = mysql_error(self->_connection);
- return [MySQL4Exception exceptionWithName:@"FetchFailed"
- reason:[NSString stringWithUTF8String:error]
- userInfo:nil];
-@@ -763,12 +763,16 @@
- @" c_lastmodified INT NOT NULL,\n"
- @" c_version INT NOT NULL,\n"
- @" c_deleted INT NULL\n"
-- @")");
-+ @")\n"
-+ @" DEFAULT CHARACTER SET latin1\n"
-+ @" DEFAULT COLLATE latin1_general_ci");
- static NSString *sqlFolderACLFormat = (@"CREATE TABLE %@ (\n" \
- @" c_uid VARCHAR (256) NOT NULL,\n"
- @" c_object VARCHAR (256) NOT NULL,\n"
- @" c_role VARCHAR (80) NOT NULL\n"
-- @")");
-+ @")\n"
-+ @" DEFAULT CHARACTER SET latin1\n"
-+ @" DEFAULT COLLATE latin1_general_ci");
-
- - (NSException *) createGCSFolderTableWithName: (NSString *) tableName
- {
diff --git a/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch b/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch
deleted file mode 100644
index 3e69505..0000000
--- a/gnustep-libs/sope/files/sope-r1660-NGHttp+WO.m.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sope-appserver/NGObjWeb/NGHttp+WO.m 2009-11-28 00:17:44.981468734 +0100
-+++ ./sope-appserver/NGObjWeb/NGHttp+WO.m.new 2009-11-28 00:59:31.661468049 +0100
-@@ -383,7 +383,7 @@
- NSString *s;
- unsigned urilen;
- char *uribuf;
-- const char *p = uribuf;
-+ const char *p;
- NGHashMap *map;
-
- if ((s = [self uri]) == nil)
diff --git a/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch b/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch
deleted file mode 100644
index a7f2dc9..0000000
--- a/gnustep-libs/sope/files/sope-r1660-NGLogSyslogAppender.m.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m 2009-11-28 00:55:21.091466955 +0100
-+++ sope-core/NGExtensions/NGLogging.subproj/NGLogSyslogAppender.m.new 2009-11-28 00:54:15.053967324 +0100
-@@ -86,7 +86,7 @@
-
- formattedMsg = [self formattedEvent:_event];
- level = [self syslogLevelForLogLevel:[_event level]];
-- syslog(level, [formattedMsg cString]);
-+ syslog(level, "%s", [formattedMsg cString]);
- }
-
- - (int)syslogLevelForLogLevel:(NGLogLevel)_level {
diff --git a/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch b/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch
deleted file mode 100644
index 55130a5..0000000
--- a/gnustep-libs/sope/files/sope-r1660-NSDictionary+KVC.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- sope-core/NGExtensions/FdExt.subproj/GNUmakefile 2009-11-26 00:58:48.403972479 +0100
-+++ sope-core/NGExtensions/FdExt.subproj/GNUmakefile.new 2009-11-26 01:27:23.983967320 +0100
-@@ -14,6 +14,7 @@
- NSCalendarDate+misc.m \
- NSCalendarDate+matrix.m \
- NSData+gzip.m \
-+ NSDictionary+KVC.m \
- NSData+misc.m \
- NSDictionary+misc.m \
- NSEnumerator+misc.m \
---- sope-core/NGExtensions/FdExt.subproj/NSDictionary+KVC.m 1970-01-01 04:00:00 +0400
-+++ sope-core/NGExtensions/FdExt.subproj/NSDictionary+KVC.m.new 2008-07-04 15:03:58 +0500
-@@ -0,0 +1,57 @@
-+/*
-+ Copyright (C) 2000-2008 SKYRIX Software AG
-+
-+ This file is part of SOPE.
-+
-+ SOPE is free software; you can redistribute it and/or modify it under
-+ the terms of the GNU Lesser General Public License as published by the
-+ Free Software Foundation; either version 2, or (at your option) any
-+ later version.
-+
-+ SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
-+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-+ License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with SOPE; see the file COPYING. If not, write to the
-+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-+ 02111-1307, USA.
-+*/
-+
-+#if GNUSTEP_BASE_LIBRARY
-+
-+#import "common.h"
-+#import "NSDictionary+KVC.h"
-+
-+@implementation NSDictionary(KVC)
-+
-+// TODO: it should be addressed to gnustep-base
-+
-+- (id)valueForUndefinedKey:(NSString *)key
-+{
-+ return nil;
-+}
-+
-+- (id)handleQueryWithUnboundKey:(NSString *)key
-+{
-+ return nil;
-+}
-+
-+- (void)setValue:(id)value forUndefinedKey:(NSString *)key
-+{
-+ return;
-+}
-+
-+- (void)handleTakeValue:(id)value forUnboundKey:(NSString *)key
-+{
-+ return;
-+}
-+
-+@end /* NSDictionary(KVC) */
-+
-+void __link_NSDictionary_KVC() {
-+ __link_NSDictionary_KVC();
-+}
-+
-+#endif
---- sope-core/NGExtensions/NGExtensions/NSDictionary+KVC.h 1970-01-01 04:00:00 +0400
-+++ sope-core/NGExtensions/NGExtensions/NSDictionary+KVC.h.new 2008-07-04 15:05:55 +0500
-@@ -0,0 +1,39 @@
-+/*
-+ Copyright (C) 2000-2008 SKYRIX Software AG
-+
-+ This file is part of SOPE.
-+
-+ SOPE is free software; you can redistribute it and/or modify it under
-+ the terms of the GNU Lesser General Public License as published by the
-+ Free Software Foundation; either version 2, or (at your option) any
-+ later version.
-+
-+ SOPE is distributed in the hope that it will be useful, but WITHOUT ANY
-+ WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-+ License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with SOPE; see the file COPYING. If not, write to the
-+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-+ 02111-1307, USA.
-+*/
-+
-+#ifndef __NGExtensions_NSDictionary_KVC_H__
-+#define __NGExtensions_NSDictionary_KVC_H__
-+
-+#import <Foundation/NSDictionary.h>
-+
-+@interface NSDictionary(KVC)
-+
-+- (id)valueForUndefinedKey:(NSString *)key;
-+
-+- (id)handleQueryWithUnboundKey:(NSString *)key;
-+
-+- (void)setValue:(id)value forUndefinedKey:(NSString *)key;
-+
-+- (void)handleTakeValue:(id)value forUnboundKey:(NSString *)key;
-+
-+@end
-+
-+#endif /* __NGExtensions_NSDictionary_KVC_H__ */
diff --git a/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch b/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch
deleted file mode 100644
index 3c35153..0000000
--- a/gnustep-libs/sope/files/sope-r1660-NSNull+misc.m.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sope-core/NGExtensions/FdExt.subproj/NSNull+misc.m 2009-08-05 11:00:11.000000000 +0200
-+++ sope-core/NGExtensions/FdExt.subproj/NSNull+misc.m.new 2009-11-26 01:35:31.481468118 +0100
-@@ -241,7 +241,7 @@
- // But: a single space should be treated as emtpy, since this is very common
- // in SQL (Sybase in special)
- for (i = 0; i < len; i++) {
-- if (!isspace([self characterAtIndex:i]))
-+ if ([self characterAtIndex:i] != 20) // svg
- return YES;
- }
-
diff --git a/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch b/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch
deleted file mode 100644
index 8c33cc3..0000000
--- a/gnustep-libs/sope/files/sope-r1660-NSZoneMallocAtomic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: sope-core/NGStreams/NGStream+serialization.m
-===================================================================
---- sope-core/NGStreams/NGStream+serialization.m (revision 1632)
-+++ sope-core/NGStreams/NGStream+serialization.m (working copy)
-@@ -282,7 +282,7 @@
- else {
- char *result = NULL;
-
--#if NeXT_Foundation_LIBRARY
-+#if NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY
- result = NSZoneMalloc(NULL, len + 1);
- #else
- result = NSZoneMallocAtomic(NULL, len + 1);
-Index: sope-core/NGStreams/NGGZipStream.m
-===================================================================
---- sope-core/NGStreams/NGGZipStream.m (revision 1632)
-+++ sope-core/NGStreams/NGGZipStream.m (working copy)
-@@ -52,7 +52,7 @@
- @"invalid compression level %i (0-9)", _level);
-
- self->outBufLen = 2048;
--#if GNU_RUNTIME
-+#if GNU_RUNTIME && !GNUSTEP_BASE_LIBRARY
- self->outBuf = NSZoneMallocAtomic([self zone], self->outBufLen);
- self->outp = NSZoneMallocAtomic([self zone], sizeof(z_stream));
- #else
-Index: sope-core/NGStreams/NGCharBuffer.m
-===================================================================
---- sope-core/NGStreams/NGCharBuffer.m (revision 1632)
-+++ sope-core/NGStreams/NGCharBuffer.m (working copy)
-@@ -46,7 +46,7 @@
- // Find first power of 2 >= to requested size
- for (size = 2; size < _la; size *=2);
-
--#if NeXT_Foundation_LIBRARY
-+#if NeXT_Foundation_LIBRARY || GNUSTEP_BASE_LIBRARY
- self->la = NSZoneMalloc([self zone], sizeof(LA_NGCharBuffer) * size);
- #else
- self->la = NSZoneMallocAtomic([self zone],
diff --git a/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch b/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch
deleted file mode 100644
index 77d3fcf..0000000
--- a/gnustep-libs/sope/files/sope-r1660-SOGo-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure 2009-11-28 03:33:54.961467916 +0100
-+++ configure.new 2009-11-28 03:35:48.731467571 +0100
-@@ -330,8 +330,8 @@
- # common.make
- UNAME=`uname`
- if [ "X${UNAME}" = "XLinux" ];then
-- UNAME=`uname -p`
-- if [ ${UNAME} = x86_64 -o ${UNAME} = sparc64 -o ${UNAME} = ppc64 ];then
-+ UNAME=`uname -m`
-+ if [ "X${UNAME}" = "Xx86_64" -o "X${UNAME}" = "Xsparc64" -o "X${UNAME}" = "Xppc64" ];then
- cfgwrite "CGS_LIBDIR_NAME:=lib64"
- else
- cfgwrite "CGS_LIBDIR_NAME:=lib"
-@@ -343,7 +343,8 @@
- cfgwrite "CONFIGURE_FHS_INSTALL_LIBDIR:=\$(FHS_INSTALL_ROOT)/\$(CGS_LIBDIR_NAME)/"
- cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L\$(CONFIGURE_FHS_INSTALL_LIBDIR)"
- cfgwrite "endif"
-- cfgwrite "GNUSTEP_INSTALLATION_DOMAIN:=LOCAL"
-+ cfgwrite "GNUSTEP_INSTALLATION_DOMAIN:=SYSTEM"
-+ cfgwrite "GNUSTEP_WEB_APPS:=\${GNUSTEP_SYSTEM_WEB_APPS}"
- cfgwrite "CONFIGURE_SYSTEM_LIB_DIR += -L/usr/\$(CGS_LIBDIR_NAME)/"
-
-
-@@ -425,6 +426,7 @@
- cd $tmpdir
- cp ../maintenance/dummytool.c .
-
-+ local OLDLIBS="${LIBS}"
- for LIB in $1;do
- LIBS="$LIBS -l${LIB}"
- done
-@@ -447,16 +449,24 @@
- LINK_RESULT=$?
-
- if test $LINK_RESULT = 0; then
-- echo "$2 library found: $1"
-- cfgwrite "HAS_LIBRARY_$1=yes"
-+ for LIB in $1;do
-+ echo "$2 library found: ${LIB}"
-+ cfgwrite "HAS_LIBRARY_${LIB}=yes"
-+ done
- else
- if test "x$2" = "xrequired"; then
-- echo "failed to link $2 library: $1"
-+ for LIB in $1;do
-+ echo "failed to link $2 library: ${LIB}"
-+ cfgwrite "HAS_LIBRARY_${LIB}=no"
-+ done
- rm ../config.make
- exit 1
- else
-- echo "failed to link $2 library: $1"
-- cfgwrite "HAS_LIBRARY_$1=no"
-+ for LIB in $1;do
-+ echo "failed to link $2 library: ${LIB}"
-+ cfgwrite "HAS_LIBRARY_${LIB}=no"
-+ done
-+ LIBS="${OLDLIBS}"
- fi
- fi
-
diff --git a/gnustep-libs/sope/files/sope-r1660-SoOFS.patch b/gnustep-libs/sope/files/sope-r1660-SoOFS.patch
deleted file mode 100644
index 9eb398a..0000000
--- a/gnustep-libs/sope/files/sope-r1660-SoOFS.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- sope-appserver/SoOFS/GNUmakefile.preamble.org 2009-11-24 15:05:35.971466918 +0100
-+++ sope-appserver/SoOFS/GNUmakefile.preamble 2009-11-24 15:04:47.001467300 +0100
-@@ -3,6 +3,7 @@
- # TODO: need to fix COMPILE_FOR_GSTEP_MAKE?
- ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1
- ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol
-+ADDITIONAL_LDFLAGS += "-Wl,--no-as-needed"
-
- SOPE_ROOT=../..
- CORE_ROOT=$(SOPE_ROOT)/sope-core
-@@ -83,6 +83,7 @@
- ifneq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
- # and neither does MacOSX? ...
--sope_TOOL_LIBS += -lcrypt
-+$(SOPED_NAME)_TOOL_LIBS += -lcrypt
-+libSoOFS_LIBRARIES_DEPEND_UPON += -lcrypt
- endif
- endif
-
diff --git a/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch b/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch
deleted file mode 100644
index 53dae7a..0000000
--- a/gnustep-libs/sope/files/sope-r1660-WORepetition.m.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./sope-appserver/NGObjWeb/DynamicElements/WORepetition.m 2009-08-05 11:00:44.000000000 +0200
-+++ ./sope-appserver/NGObjWeb/DynamicElements/WORepetition.m.new 2009-11-26 01:01:30.551467024 +0100
-@@ -805,7 +805,7 @@
-
- for (cnt = 0; cnt < aCount; cnt++) {
- if (self->item) {
-- [self->item setValue:[array objectAtIndex:cnt]
-+ [self->item setValue:[[self->list valueInContext:_ctx] objectAtIndex:cnt]
- inComponent:sComponent];
- }
- else {
diff --git a/gnustep-libs/sope/files/sope-r1660-use_system_root.patch b/gnustep-libs/sope/files/sope-r1660-use_system_root.patch
deleted file mode 100644
index ab7a974..0000000
--- a/gnustep-libs/sope/files/sope-r1660-use_system_root.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig 2008-07-01 16:25:13.000000000 +0200
-+++ configure 2008-07-01 16:25:33.000000000 +0200
-@@ -243,9 +243,9 @@
- "x")
- if test $ARG_WITH_GNUSTEP = 1; then
- DARG_IS_FHS=0;
-- ARG_PREFIX="$GNUSTEP_LOCAL_ROOT"
-+ ARG_PREFIX="$GNUSTEP_SYSTEM_ROOT"
- if test $ARG_BEQUIET != 1; then
-- echo "Note: will install in GNUSTEP_LOCAL_ROOT: $ARG_PREFIX"
-+ echo "Note: will install in GNUSTEP_SYSTEM_ROOT: $ARG_PREFIX"
- echo ""
- fi
- elif test "x$ARG_FRAMEWORK_DIR" != "x"; then
diff --git a/gnustep-libs/sope/files/sope.envd b/gnustep-libs/sope/files/sope.envd
deleted file mode 100644
index ecba857..0000000
--- a/gnustep-libs/sope/files/sope.envd
+++ /dev/null
@@ -1,2 +0,0 @@
-PATH=/usr/GNUstep/System/Tools/Admin
-ROOTPATH=/usr/GNUstep/System/Tools/Admin