Hi,
opengroupware needs some compatibility patches from upstream to
cope with newer versions of www/sope. While touching it, a few minor
bug fixes and enhancements included.
OK?
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/opengroupware/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 22 May 2014 09:50:22 -0000 1.3
+++ Makefile 16 Jul 2014 10:41:07 -0000
@@ -3,7 +3,7 @@
COMMENT = web based groupware server
VERSION = 5.5rc2
-REVISION= 1
+REVISION= 2
DISTNAME = opengroupware-${VERSION}
SHARED_LIBS += LSAddress 0.0 # 5.5
Index: patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
===================================================================
RCS file: patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
diff -N patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-SOPE_mod_ngobjweb_ngobjweb_module_c 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,54 @@
+$OpenBSD$
+
+proposed fix for bug 88
+
+--- SOPE/mod_ngobjweb/ngobjweb_module.c.orig Wed Feb 6 18:38:08 2013
++++ SOPE/mod_ngobjweb/ngobjweb_module.c Tue Jul 23 17:19:20 2013
+@@ -21,6 +21,39 @@
+
+ #include "common.h"
+
++#ifdef APACHE2
++static const command_rec ngobjweb_cmds[] = {
++ AP_INIT_TAKE1(
++ "SetSNSPort",
++ ngobjweb_set_sns_port,
++ NULL,
++ OR_FILEINFO,
++ "the path of the Unix domain address to use (eg /tmp/.snsd)"
++ ),
++ AP_INIT_TAKE1(
++ "SetAppPort",
++ ngobjweb_set_app_port,
++ NULL,
++ OR_FILEINFO,
++ "the path of the Unix domain address to use (eg /tmp/.snsd)"
++ ),
++ AP_INIT_TAKE1(
++ "SetAppPrefix",
++ ngobjweb_set_app_prefix,
++ NULL,
++ OR_FILEINFO,
++ "any prefix that is before the app name (eg /MyDir with /MyDir/MyApp.woa)"
++ ),
++ AP_INIT_TAKE1(
++ "SNSUseHTTP",
++ ngobjweb_set_use_http,
++ NULL,
++ OR_FILEINFO,
++ "use HTTP protocol to query snsd (on,off) ?"
++ ),
++ {NULL}
++};
++#else
+ static command_rec ngobjweb_cmds[] = {
+ {
+ "SetSNSPort",
+@@ -56,6 +89,7 @@ static command_rec ngobjweb_cmds[] = {
+ },
+ { NULL }
+ };
++#endif
+
+ #ifdef AP_VERSION_1
+ static handler_rec ngobjweb_handlers[] = {
Index: patches/patch-WebUI_Common_OGoUIElements_SkyCalendarScript_m
===================================================================
RCS file: patches/patch-WebUI_Common_OGoUIElements_SkyCalendarScript_m
diff -N patches/patch-WebUI_Common_OGoUIElements_SkyCalendarScript_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WebUI_Common_OGoUIElements_SkyCalendarScript_m 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- WebUI/Common/OGoUIElements/SkyCalendarScript.m.orig Sun Jun 15 08:16:00 2014
++++ WebUI/Common/OGoUIElements/SkyCalendarScript.m Sun Jun 15 08:16:28 2014
+@@ -80,7 +80,7 @@ static NSNumber *yesNum = nil;
+ /* generating response */
+
+ - (void)appendToResponse:(WOResponse *)_response inContext:(WOContext *)_ctx {
+- if ([[_ctx valueForKey:@"SkyCalendarScriptIncluded"] boolValue])
++ if ([[_ctx objectForKey:@"SkyCalendarScriptIncluded"] boolValue])
+ return;
+
+ [super appendToResponse:_response inContext:_ctx];
Index: patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentProposal_m
===================================================================
RCS file: patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentProposal_m
diff -N patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentProposal_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentProposal_m 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+fix exception, compatibility with sope-2.2.5
+
+--- WebUI/Scheduler/LSWScheduler/LSWAppointmentProposal.m.orig Wed May 7 19:15:52 2014
++++ WebUI/Scheduler/LSWScheduler/LSWAppointmentProposal.m Wed May 7 19:16:52 2014
+@@ -153,7 +153,7 @@ static inline NSDictionary *_getTimeEntry(LSWAppointme
+ NSTimeZone *tz;
+ NSString *tzA;
+
+- if ((tz = [[self context] valueForKey:@"SkySchedulerTimeZone"]) == nil)
++ if ((tz = [[self context] objectForKey:@"SkySchedulerTimeZone"]) == nil)
+ tz = [[self session] timeZone];
+
+ self->timeZone = [tz retain];
Index: patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentViewer_m
===================================================================
RCS file: patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentViewer_m
diff -N patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentViewer_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WebUI_Scheduler_LSWScheduler_LSWAppointmentViewer_m 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+compatibility fix to sope-2.2.5
+
+--- WebUI/Scheduler/LSWScheduler/LSWAppointmentViewer.m.orig Sun Jun 15 08:21:43 2014
++++ WebUI/Scheduler/LSWScheduler/LSWAppointmentViewer.m Sun Jun 15 08:22:04 2014
+@@ -497,7 +497,7 @@ static NSString *_personName(id self, id _person) {
+ type:_type configuration:_cmdCfg])
+ return NO;
+
+- if ((tz = [[self context] valueForKey:@"SkySchedulerTimeZone"]) == nil)
++ if ((tz = [[self context] objectForKey:@"SkySchedulerTimeZone"]) == nil)
+ tz = [[self session] timeZone];
+
+ self->timeZone = [tz retain];
Index: patches/patch-WebUI_Scheduler_OGoSchedulerViews_SkyMonthRepetition_m
===================================================================
RCS file: patches/patch-WebUI_Scheduler_OGoSchedulerViews_SkyMonthRepetition_m
diff -N patches/patch-WebUI_Scheduler_OGoSchedulerViews_SkyMonthRepetition_m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WebUI_Scheduler_OGoSchedulerViews_SkyMonthRepetition_m 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,69 @@
+$OpenBSD$
+
+fix exception entering calendar month view tab
+
+--- WebUI/Scheduler/OGoSchedulerViews/SkyMonthRepetition.m.orig Wed May 7 15:48:31 2014
++++ WebUI/Scheduler/OGoSchedulerViews/SkyMonthRepetition.m Wed May 7 19:09:33 2014
+@@ -259,7 +259,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ forKey:@"SkyMonthRepetition"];
+ [self->template appendToResponse:_response inContext:_ctx];
+
+- queryE = [[[_ctx valueForKey:@"SkyMonthRepetition"] valueForKey:@"query"]
++ queryE = [[[_ctx objectForKey:@"SkyMonthRepetition"] objectForKey:@"query"]
+ objectEnumerator];
+
+ while ((orient = [queryE nextObject]) != nil) {
+@@ -601,7 +601,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ orient = [self->orientation valueInComponent:[_ctx component]];
+ isEdge = [orient rangeOfString:@"/"].length > 0;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:orient]) == nil)
+ return;
+
+@@ -624,7 +624,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ orient = [self->orientation valueInComponent:[_ctx component]];
+ isEdge = [orient rangeOfString:@"/"].length > 0;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:orient]) == nil)
+ return nil;
+
+@@ -665,7 +665,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ orient = [self->orientation valueInComponent:[_ctx component]];
+ isEdge = [orient rangeOfString:@"/"].length > 0;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:@"query"])) {
+ [tmp addObject:orient];
+ }
+@@ -738,7 +738,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ NSDictionary *op;
+ id tmp;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:@"cell"]) != nil)
+ [self->template takeValuesFromRequest:_req inContext:_ctx];
+ }
+@@ -747,7 +747,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ NSDictionary *op;
+ id tmp;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:@"cell"]) == nil)
+ return nil;
+
+@@ -760,7 +760,7 @@ _takeValuesInCell(SkyMonthRepetition *self, WORequest
+ NSDictionary *op;
+ id tmp;
+
+- op = [_ctx valueForKey:@"SkyMonthRepetition"];
++ op = [_ctx objectForKey:@"SkyMonthRepetition"];
+ if ((tmp = [op objectForKey:@"query"])) {
+ [tmp addObject:@"cell"];
+ return;
Index: patches/patch-WebUI_Templates_OGoSchedulerViews_SkyInlineDayOverview_html
===================================================================
RCS file: patches/patch-WebUI_Templates_OGoSchedulerViews_SkyInlineDayOverview_html
diff -N patches/patch-WebUI_Templates_OGoSchedulerViews_SkyInlineDayOverview_html
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-WebUI_Templates_OGoSchedulerViews_SkyInlineDayOverview_html 16 Jul 2014 10:41:07 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+load printing dialog
+
+--- WebUI/Templates/OGoSchedulerViews/SkyInlineDayOverview.html.orig Wed May 7 19:32:48 2014
++++ WebUI/Templates/OGoSchedulerViews/SkyInlineDayOverview.html Wed May 7 19:33:05 2014
+@@ -2,7 +2,7 @@
+ <html>
+ <head><title><#DayTitle /></title></head>
+
+- <body bgcolor="white" text="black">
++ <body bgcolor="white" text="black" onload="javascript:window.print()">
+ <table border="1" cellpadding="5" width="100%" cellspacing="0">
+ <tr>
+ <td align="center" colspan="2">
