cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix an abort() in sogo, and bump.

Browse Source 
was OK landry@
This commit is contained in:
sebastia 2010-12-11 14:10:32 +00:00
parent 8a39ef78ea
commit c0a2726211
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/sope/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.8 2010/12/02 14:56:11 sebastia Exp $
# $OpenBSD: Makefile,v 1.9 2010/12/11 14:10:32 sebastia Exp $
COMMENT-main= Skyrix Object Publishing Environment
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
VERSION= 1.3.4
REVISION = 0
REVISION = 1
DISTNAME= SOPE-${VERSION}
PKGNAME-main= sope-${VERSION}
PKGNAME-mysql= sope-mysql-${VERSION}

15
www/sope/patches/patch-sope-core_NGExtensions_FdExt_subproj_NSString+Encoding_m Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-sope-core_NGExtensions_FdExt_subproj_NSString+Encoding_m,v 1.1 2010/12/11 14:10:32 sebastia Exp $
fix abort(), when there was an error with iconv_open getting a conversion descriptor
--- sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m.orig Tue Nov 2 15:12:13 2010
+++ sope-core/NGExtensions/FdExt.subproj/NSString+Encoding.m Fri Dec 10 19:58:24 2010
@@ -256,7 +256,7 @@ static char *iconv_wrapper(id self, char *_src, unsign
return outbuf;
CLEAR_AND_RETURN:
- if (type)
+ if (type && (type != (iconv_t)-1))
iconv_close(type);
if (outbuf) {