Update sope to latest release.

OK sthen@
This commit is contained in:
sebastia 2012-08-17 09:57:30 +00:00
parent e7517e8500
commit 8c913c9354
3 changed files with 30 additions and 7 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.21 2012/07/08 14:18:18 sebastia Exp $
# $OpenBSD: Makefile,v 1.22 2012/08/17 09:57:30 sebastia Exp $
COMMENT-main= Skyrix Object Publishing Environment
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
VERSION = 1.3.16
VERSION = 1.3.17
DISTNAME = SOPE-${VERSION}
PKGNAME-main = sope-${VERSION}
PKGNAME-mysql = sope-mysql-${VERSION}

View File

@ -1,5 +1,2 @@
MD5 (SOPE-1.3.16.tar.gz) = sg9k0FgBi6tMjaRFCCTpVg==
RMD160 (SOPE-1.3.16.tar.gz) = zVURCyxaHnolVyy9d9sTqViYdyg=
SHA1 (SOPE-1.3.16.tar.gz) = MrHcTmdpGb8aDuuWA896k3wIEOU=
SHA256 (SOPE-1.3.16.tar.gz) = gsgU9AWHDfv77bOSapHC2NfnHjQOwQ4IQT2EbFzvLnk=
SIZE (SOPE-1.3.16.tar.gz) = 2157287
SHA256 (SOPE-1.3.17.tar.gz) = VvBL08SSHwzmwUkonU5tBxNekchE4VswmLf0u5BJJVY=
SIZE (SOPE-1.3.17.tar.gz) = 2157318

View File

@ -0,0 +1,26 @@
$OpenBSD: patch-sope-gdl1_GDLAccess_EOExpressionArray_m,v 1.1 2012/08/17 09:57:30 sebastia Exp $
Fix crasher in OGo when running OGo with LC_CTYPE='de_DE.UTF-8' and searching
with Umlauts.
--- sope-gdl1/GDLAccess/EOExpressionArray.m.orig Tue Jul 31 17:37:56 2012
+++ sope-gdl1/GDLAccess/EOExpressionArray.m Tue Jul 31 17:38:31 2012
@@ -140,14 +140,16 @@
relationshipPaths:(NSMutableArray *)relationshipPaths
{
EOExpressionArray *exprArray;
- unsigned char buf[[expression cStringLength] + 4]; // TODO: not too good
+ unsigned char buf[[expression lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 4]; // TODO: not too good
const unsigned char *s, *start;
id objectToken;
NSAutoreleasePool *pool;
exprArray = [[EOExpressionArray new] autorelease];
pool = [[NSAutoreleasePool alloc] init];
- [expression getCString:(char *)buf];
+ [expression getCString:(char *)buf
+ maxLength:[expression lengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 4
+ encoding:NSUTF8StringEncoding];
s = buf;
/* Divide the expression string in alternating substrings that obey the