Hi,
attached update of SOPE and SOGo from 2.0.7 to 2.1.1.b, jumping over a few
releases.
For SOGo, I had to re-add the patch to the patch-UI_MailPartViewers_GNUmakefile.
in order to prevent the unknown symbols problem on startup :(
Further, 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?
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.34
diff -u -p -u -r1.34 Makefile
--- Makefile 19 Oct 2013 13:26:21 -0000 1.34
+++ Makefile 15 Dec 2013 12:04:31 -0000
@@ -2,15 +2,14 @@
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
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo 24 Aug 2013 11:16:04 -0000 1.18
+++ distinfo 15 Dec 2013 12:04:31 -0000
@@ -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
Index: patches/patch-SOPE_GDLContentStore_EOQualifier+GCS_m
===================================================================
RCS file: patches/patch-SOPE_GDLContentStore_EOQualifier+GCS_m
diff -N patches/patch-SOPE_GDLContentStore_EOQualifier+GCS_m
--- patches/patch-SOPE_GDLContentStore_EOQualifier+GCS_m 19 Oct 2013 09:49:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
-
Index: patches/patch-SOPE_GDLContentStore_GCSFolder_m
===================================================================
RCS file: patches/patch-SOPE_GDLContentStore_GCSFolder_m
diff -N patches/patch-SOPE_GDLContentStore_GCSFolder_m
--- patches/patch-SOPE_GDLContentStore_GCSFolder_m 19 Oct 2013 09:49:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
-
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===================================================================
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile
diff -N patches/patch-UI_MailPartViewers_GNUmakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-UI_MailPartViewers_GNUmakefile 15 Dec 2013 12:04:31 -0000
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+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 \
Index: patches/patch-UI_MailPartViewers_UIxMailPartViewer_m
===================================================================
RCS file: patches/patch-UI_MailPartViewers_UIxMailPartViewer_m
diff -N patches/patch-UI_MailPartViewers_UIxMailPartViewer_m
--- patches/patch-UI_MailPartViewers_UIxMailPartViewer_m 24 Aug 2013 11:16:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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"],
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -r1.18 PLIST
--- pkg/PLIST 24 Aug 2013 11:16:05 -0000 1.18
+++ pkg/PLIST 15 Dec 2013 12:04:33 -0000
@@ -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/SOGoProxyAuthentic
${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/S
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/cked
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/cked
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/cked
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/cked
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/inpu
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
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
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.9
diff -u -p -u -r1.9 README
--- pkg/README 16 Dec 2012 16:36:26 -0000 1.9
+++ pkg/README 15 Dec 2013 12:04:33 -0000
@@ -233,3 +233,10 @@ will ask you for the database credential
$ 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
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- Makefile 19 Oct 2013 13:26:21 -0000 1.36
+++ Makefile 15 Dec 2013 12:05:47 -0000
@@ -4,17 +4,14 @@ COMMENT-main= Skyrix Object Publishing
COMMENT-mysql= SOPE MySQL adaptor
COMMENT-postgres= SOPE PostgreSQL adaptor
-VERSION = 2.0.7
-DISTNAME = SOPE-${VERSION}
-PKGNAME-main = sope-${VERSION}
-PKGNAME-mysql = sope-mysql-${VERSION}
-PKGNAME-postgres = sope-postgres-${VERSION}
-REVISION-main = 1
-REVISION-mysql = 1
-REVISION-postgres = 1
+VERSION = 2.1.1
+DISTNAME = SOPE-${VERSION}b
+PKGNAME-main = sope-${VERSION}.1
+PKGNAME-mysql = sope-mysql-${VERSION}.1
+PKGNAME-postgres = sope-postgres-${VERSION}.1
SO_MAJOR= 2
-SO_MINOR= 0
+SO_MINOR= 1
.for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
NGObjWeb NGStreams SaxObjC WEExtensions \
WOExtensions XmlRpc SBJson
@@ -45,9 +42,9 @@ LIB_DEPENDS-main= x11/gnustep/base \
databases/openldap \
x11/gnustep/libobjc2 \
${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION} \
+LIB_DEPENDS-mysql = ${BASE_PKGPATH}=${VERSION}.1 \
databases/mysql,-main
-LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION} \
+LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION}.1 \
databases/postgresql,-main
CONFIGURE_STYLE=simple dest
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.20
diff -u -p -u -r1.20 distinfo
--- distinfo 24 Aug 2013 11:09:07 -0000 1.20
+++ distinfo 15 Dec 2013 12:05:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.0.7.tar.gz) = +77CIk/3plTuSbBnAMvaxjnlCVP9zund+JIClkw/v5s=
-SIZE (SOPE-2.0.7.tar.gz) = 2250930
+SHA256 (SOPE-2.1.1b.tar.gz) = ebM2X/gpH147dMeli9K2SjHypztsOV8B4RV4Iv1lTMM=
+SIZE (SOPE-2.1.1b.tar.gz) = 2256252
