From 8c913c9354c3f078b374966924b5e44a090c3f67 Mon Sep 17 00:00:00 2001
From: sebastia <sebastia@openbsd.org>
Date: Fri, 17 Aug 2012 09:57:30 +0000
Subject: [PATCH] Update sope to latest release.

OK sthen@
---
 www/sope/Makefile                             |  4 +--
 www/sope/distinfo                             |  7 ++---
 ...ch-sope-gdl1_GDLAccess_EOExpressionArray_m | 26 +++++++++++++++++++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 www/sope/patches/patch-sope-gdl1_GDLAccess_EOExpressionArray_m

diff --git a/www/sope/Makefile b/www/sope/Makefile
index 2bc66dc51ed..c125ed0b975 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -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}
diff --git a/www/sope/distinfo b/www/sope/distinfo
index 5d52bb8465d..b1c520ed802 100644
--- a/www/sope/distinfo
+++ b/www/sope/distinfo
@@ -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
diff --git a/www/sope/patches/patch-sope-gdl1_GDLAccess_EOExpressionArray_m b/www/sope/patches/patch-sope-gdl1_GDLAccess_EOExpressionArray_m
new file mode 100644
index 00000000000..d7833a147c2
--- /dev/null
+++ b/www/sope/patches/patch-sope-gdl1_GDLAccess_EOExpressionArray_m
@@ -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