update SOGo to 2.1.1b

the default changed where the SOGo daemon listens on: now on 127.0.0.1:20000
If needed, to get back the old behaviour listening on *:20000 follow instructions in the
pkg README.

OK giovanni@
This commit is contained in:
sebastia 2014-01-03 18:39:51 +00:00
parent 0294c795c0
commit 24346b88f8
8 changed files with 82 additions and 52 deletions

View File

@ -1,16 +1,15 @@
# $OpenBSD: Makefile,v 1.34 2013/10/19 13:26:21 sebastia Exp $
# $OpenBSD: Makefile,v 1.35 2014/01/03 18:39:51 sebastia Exp $
COMMENT = web based groupware server
VERSION = 2.0.7
REVISION = 1
DISTNAME = SOGo-${VERSION}
PKGNAME = sogo-${VERSION}
VERSION = 2.1.1
DISTNAME = SOGo-${VERSION}b
PKGNAME = sogo-${VERSION}.1
SHARED_LIBS += GDLContentStore 2.0
SHARED_LIBS += NGCards 2.0
SHARED_LIBS += OGoContentStore 2.0
SHARED_LIBS += SOGo 2.0
SHARED_LIBS += SOGo 2.1
SHARED_LIBS += SOGoUI 2.0
CATEGORIES = www

View File

@ -1,2 +1,2 @@
SHA256 (SOGo-2.0.7.tar.gz) = EZe72hblp+lMcO/iFCizShgwvgC/YF2mM6jugq30vl8=
SIZE (SOGo-2.0.7.tar.gz) = 5694507
SHA256 (SOGo-2.1.1b.tar.gz) = 7JCs4kogu8K6BJ/fsiT6ntSeRhVZuHA1YJMFqUUbs94=
SIZE (SOGo-2.1.1b.tar.gz) = 5846822

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-SOPE_GDLContentStore_EOQualifier+GCS_m,v 1.1 2013/10/19 09:49:16 sebastia Exp $
--- SOPE/GDLContentStore/EOQualifier+GCS.m.orig Sun Oct 13 18:35:24 2013
+++ SOPE/GDLContentStore/EOQualifier+GCS.m Sun Oct 13 18:35:46 2013
@@ -27,7 +27,7 @@
#import "EOQualifier+GCS.h"
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
#endif

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-SOPE_GDLContentStore_GCSFolder_m,v 1.1 2013/10/19 09:49:16 sebastia Exp $
--- SOPE/GDLContentStore/GCSFolder.m.orig Sun Oct 13 18:35:05 2013
+++ SOPE/GDLContentStore/GCSFolder.m Sun Oct 13 18:35:16 2013
@@ -44,7 +44,7 @@
#import "EOQualifier+GCS.h"
#import "GCSStringFormatter.h"
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
#endif

View File

@ -0,0 +1,33 @@
$OpenBSD: patch-UI_MailPartViewers_GNUmakefile,v 1.2 2014/01/03 18:39:51 sebastia Exp $
prevent unknown symbols on startup errors
--- UI/MailPartViewers/GNUmakefile.orig Wed Dec 4 17:53:43 2013
+++ UI/MailPartViewers/GNUmakefile Sun Dec 15 12:47:14 2013
@@ -25,7 +25,25 @@ MailPartViewers_OBJC_FILES += \
UIxMailPartMessageViewer.m \
UIxMailPartICalViewer.m \
\
- UIxMailPartICalActions.m
+ UIxMailPartICalActions.m \
+ ../../SoObjects/Mailer/SOGoMailBodyPart.m \
+ ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
+ ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
+ ../../SoObjects/Mailer/SOGoMailAccounts.m \
+ ../../SoObjects/Mailer/SOGoMailBaseObject.m \
+ ../../SoObjects/Mailer/SOGoMailAccount.m \
+ ../../SoObjects/Mailer/SOGoMailNamespace.m \
+ ../../SoObjects/Mailer/SOGoDraftsFolder.m \
+ ../../SoObjects/Mailer/SOGoSentFolder.m \
+ ../../SoObjects/Mailer/SOGoTrashFolder.m \
+ ../../SoObjects/Mailer/SOGoMailFolder.m \
+ ../../SoObjects/Mailer/SOGoDraftObject.m \
+ ../../SoObjects/Mailer/SOGoMailObject.m \
+ ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
+ ../../SoObjects/Appointments/SOGoAppointmentObject.m \
+ ../../SoObjects/Appointments/SOGoComponentOccurence.m \
+ ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
+ ../../SoObjects/Appointments/SOGoCalendarComponent.m
MailPartViewers_RESOURCE_FILES += \
product.plist \

View File

@ -1,16 +0,0 @@
$OpenBSD: patch-UI_MailPartViewers_UIxMailPartViewer_m,v 1.1 2013/08/24 11:16:05 sebastia Exp $
patch from upstream to fix exception in webmailer, see:
http://www.sogo.nu/bugs/view.php?id=2385
--- UI/MailPartViewers/UIxMailPartViewer.m.orig Mon Aug 12 13:59:34 2013
+++ UI/MailPartViewers/UIxMailPartViewer.m Mon Aug 12 13:59:57 2013
@@ -266,7 +266,7 @@
NSMutableString *filename;
NSString *extension;
- filename = [self filename];
+ filename = [NSMutableString stringWithString: [self filename]];
if (![filename length])
[filename appendFormat: @"%@-%@",
[self labelForKey: @"Untitled"],

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2013/08/24 11:16:05 sebastia Exp $
@comment $OpenBSD: PLIST,v 1.19 2014/01/03 18:39:51 sebastia Exp $
@newgroup _sogo:659
@newuser _sogo:659:_sogo:daemon:SOGo user:/var/sogo:/bin/sh
include/GDLContentStore/
@ -88,6 +88,7 @@ ${SOGOLIBDIR}/Headers/SOGoCASSession.h
${SOGOLIBDIR}/Headers/SOGoCache.h
${SOGOLIBDIR}/Headers/SOGoConstants.h
${SOGOLIBDIR}/Headers/SOGoContentObject.h
${SOGOLIBDIR}/Headers/SOGoCredentialsFile.h
${SOGOLIBDIR}/Headers/SOGoDAVAuthenticator.h
${SOGOLIBDIR}/Headers/SOGoDateFormatter.h
${SOGOLIBDIR}/Headers/SOGoFolder.h
@ -102,6 +103,7 @@ ${SOGOLIBDIR}/Headers/SOGoProxyAuthenticator.h
${SOGOLIBDIR}/Headers/SOGoSession.h
${SOGOLIBDIR}/Headers/SOGoSieveManager.h
${SOGOLIBDIR}/Headers/SOGoStartupLogger.h
${SOGOLIBDIR}/Headers/SOGoStaticAuthenticator.h
${SOGOLIBDIR}/Headers/SOGoUser.h
${SOGOLIBDIR}/Headers/SOGoUserFolder.h
${SOGOLIBDIR}/Headers/SOGoUserManager.h
@ -931,6 +933,12 @@ lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailEnglishForward.wo/SOGoMailEnglish
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailEnglishReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishForward.wo/SOGoMailFinnishForward.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishReply.wo/SOGoMailFinnishReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFinnishReply.wo/SOGoMailFinnishReply.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFrenchForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.wod
@ -1613,6 +1621,8 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/about.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/hidpi/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/hidpi/logo_ckeditor.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/logo_ckeditor.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/clipboard/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/clipboard/dialogs/
@ -1622,10 +1632,14 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/colordialog/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/colordialog/dialogs/colordialog.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/dialog/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/dialog/dialogDefinition.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/div.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/spacer.gif
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons_hidpi.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/dialogs/image.js
@ -1637,13 +1651,22 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/anchor.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/link.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/anchor.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/hidpi/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/hidpi/anchor.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/toolbar.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/dialogs/table.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/tableCell.js
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/ciframe.html
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmp.html
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js
@ -1663,10 +1686,18 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie7.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie8.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_iequirks.css
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/icons.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/icons_hidpi.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/arrow.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/close.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/mini.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/hidpi/
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/hidpi/close.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/hidpi/lock-open.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/hidpi/lock.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/hidpi/refresh.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/lock-open.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/lock.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/refresh.png
lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/readme.md
lib/GNUstep/SOGo/WebServerResources/ckeditor/styles.js
lib/GNUstep/SOGo/WebServerResources/collapse.png
@ -1708,7 +1739,6 @@ lib/GNUstep/SOGo/WebServerResources/input_bg.gif
lib/GNUstep/SOGo/WebServerResources/inverse.png
lib/GNUstep/SOGo/WebServerResources/jquery-ui.js
lib/GNUstep/SOGo/WebServerResources/jquery.js
lib/GNUstep/SOGo/WebServerResources/js_color_picker_v2.css
lib/GNUstep/SOGo/WebServerResources/js_color_picker_v2.js
lib/GNUstep/SOGo/WebServerResources/last.gif
lib/GNUstep/SOGo/WebServerResources/layout2or3_xlib.js
@ -1817,6 +1847,7 @@ lib/GNUstep/SOGo/WebServerResources/mime-gnome-fs-regular.png
lib/GNUstep/SOGo/WebServerResources/mime-gnome-package.png
lib/GNUstep/SOGo/WebServerResources/mime-gtk-file.png
lib/GNUstep/SOGo/WebServerResources/mime-html.png
lib/GNUstep/SOGo/WebServerResources/mime-image-pdf.png
lib/GNUstep/SOGo/WebServerResources/mime-image-x-generic.png
lib/GNUstep/SOGo/WebServerResources/mime-image.png
lib/GNUstep/SOGo/WebServerResources/mime-kpresenter_kpr.png

View File

@ -1,4 +1,4 @@
# $OpenBSD: README,v 1.9 2012/12/16 16:36:26 sebastia Exp $
# $OpenBSD: README,v 1.10 2014/01/03 18:39:51 sebastia Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -233,3 +233,10 @@ will ask you for the database credentials.
$ sudo -u _sogo ${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-postgres.sh
$ sudo -u _sogo ${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh
Upgrade SOGo from < 2.1.1
=======================================
With version 2.1.0, the WOPort default changed from listening on *:20000
to 127.0.0.1:20000. To get back the old behaviour, run the following
command:
$ sudo -u _sogo defaults write sogod WOPort *:20000