Re: update www/sope www/sogo to 4.0.0

[Landry Breuil]

On Fri, May 11, 2018 at 11:43:14AM +0200, Landry Breuil wrote:
> On Fri, May 04, 2018 at 02:16:27PM +0200, Sebastian Reitenbach wrote:
> > Hi,
> > 
> > Am Mittwoch, Mai 02, 2018 23:10 CEST, Landry Breuil  
> > schrieb:
> > 
> > > On Wed, May 02, 2018 at 10:28:57PM +0200, Sebastian Reitenbach wrote:
> > > > Hi,
> > > >
> > > >
> > > >
> > > > Am Montag, April 30, 2018 15:20 CEST, Landry Breuil 
> > > >  schrieb:
> > > >
> > > > > On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> > > > > > >
> > > > > > > Wouldn't it be better to use upstream's standard names? Then a 
> > > > > > > simple
> > > > > > > wildcard works, it matches their usual setup, and you don't have 
> > > > > > > the
> > > > > > > inconsistency you have here where some files are renamed with
> > > > > > > -postgres and others aren't.
> > > > > >
> > > > > >
> > > > > > yeah, with the loop in my updated version, I use the standard 
> > > > > > names, and
> > > > > > I dropped some legacy scripts.
> > > > >
> > > > > Can you resend the updated version ? it seems it never made it to the
> > > > > list, and now that i've upgraded my work server to 6.3 i might give 
> > > > > it a
> > > > > shot..
> > > > >
> > > >
> > > > great, thanks! See below.
> > > >
> > > > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > > > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> > >
> > > Forgotten ? patches not needed ?
> > >
> >  indeed forgotten, sorry, updated patch attached.
> > 
> > Sebastian
> 
> I finally got the time to properly test this, backported to 6.3. The
> patched script upgrading the database fields works fine with our ksh.
> 
> The only annoyance i have is with the scss/angular crap that is all
> voodoo to me.
> 
> It seems the 'source' files arent shipped in the package (ie
> UI/WebServerResources/{scss,angular-material}) and even if i resynced
> /usr/local/lib/GNUstep/SOGo/WebServerResources/ to /var/www/sogo/www,
> the webui is still trying to fetch scss files and generating tons of
> 404s on such urls:
> $baseurl/SOGo.woa/WebServerResources/angular-material/src/core/style/structure.scss
> etc etc etc
> 
> to workaround this issue, i manually copied the scss files from the
> source tarball (ie
> https://github.com/inverse-inc/sogo/tree/master/UI/WebServerResources/scss
> and the source files from angular-material git submodule)
> but that feels *wrong* to me. What makes this crap think it needs to
> 'rebuild' js/css files ?

The 'less ugly' workaroud is to remove the last line of
./UI/WebServerResources/css/styles.css so that it doesnt point at the
sourcemap. The UI works without it, but i dont understand what makes the
browser think it needs to download all those scss files. timestamps on
files ? hash/checksum somewhere ?

Landry

Re: update www/sope www/sogo to 4.0.0

[Landry Breuil]

On Fri, May 04, 2018 at 02:16:27PM +0200, Sebastian Reitenbach wrote:
> Hi,
> 
> Am Mittwoch, Mai 02, 2018 23:10 CEST, Landry Breuil  
> schrieb:
> 
> > On Wed, May 02, 2018 at 10:28:57PM +0200, Sebastian Reitenbach wrote:
> > > Hi,
> > >
> > >
> > >
> > > Am Montag, April 30, 2018 15:20 CEST, Landry Breuil  
> > > schrieb:
> > >
> > > > On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> > > > > >
> > > > > > Wouldn't it be better to use upstream's standard names? Then a 
> > > > > > simple
> > > > > > wildcard works, it matches their usual setup, and you don't have the
> > > > > > inconsistency you have here where some files are renamed with
> > > > > > -postgres and others aren't.
> > > > >
> > > > >
> > > > > yeah, with the loop in my updated version, I use the standard names, 
> > > > > and
> > > > > I dropped some legacy scripts.
> > > >
> > > > Can you resend the updated version ? it seems it never made it to the
> > > > list, and now that i've upgraded my work server to 6.3 i might give it a
> > > > shot..
> > > >
> > >
> > > great, thanks! See below.
> > >
> > > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> >
> > Forgotten ? patches not needed ?
> >
>  indeed forgotten, sorry, updated patch attached.
> 
> Sebastian

I finally got the time to properly test this, backported to 6.3. The
patched script upgrading the database fields works fine with our ksh.

The only annoyance i have is with the scss/angular crap that is all
voodoo to me.

It seems the 'source' files arent shipped in the package (ie
UI/WebServerResources/{scss,angular-material}) and even if i resynced
/usr/local/lib/GNUstep/SOGo/WebServerResources/ to /var/www/sogo/www,
the webui is still trying to fetch scss files and generating tons of
404s on such urls:
$baseurl/SOGo.woa/WebServerResources/angular-material/src/core/style/structure.scss
etc etc etc

to workaround this issue, i manually copied the scss files from the
source tarball (ie
https://github.com/inverse-inc/sogo/tree/master/UI/WebServerResources/scss
and the source files from angular-material git submodule)
but that feels *wrong* to me. What makes this crap think it needs to
'rebuild' js/css files ?

Have you experienced something similar on your instances ?

Landry

Re: update www/sope www/sogo to 4.0.0

[Sebastian Reitenbach]

Hi,

Am Mittwoch, Mai 02, 2018 23:10 CEST, Landry Breuil  
schrieb:

> On Wed, May 02, 2018 at 10:28:57PM +0200, Sebastian Reitenbach wrote:
> > Hi,
> >
> >
> >
> > Am Montag, April 30, 2018 15:20 CEST, Landry Breuil  
> > schrieb:
> >
> > > On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> > > > >
> > > > > Wouldn't it be better to use upstream's standard names? Then a simple
> > > > > wildcard works, it matches their usual setup, and you don't have the
> > > > > inconsistency you have here where some files are renamed with
> > > > > -postgres and others aren't.
> > > >
> > > >
> > > > yeah, with the loop in my updated version, I use the standard names, and
> > > > I dropped some legacy scripts.
> > >
> > > Can you resend the updated version ? it seems it never made it to the
> > > list, and now that i've upgraded my work server to 6.3 i might give it a
> > > shot..
> > >
> >
> > great, thanks! See below.
> >
> > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
>
> Forgotten ? patches not needed ?
>
 indeed forgotten, sorry, updated patch attached.

Sebastian


sope-sogo-4.0.diff
Description: Binary data

Re: update www/sope www/sogo to 4.0.0

[Landry Breuil]

On Wed, May 02, 2018 at 10:28:57PM +0200, Sebastian Reitenbach wrote:
> Hi,
> 
> 
> 
> Am Montag, April 30, 2018 15:20 CEST, Landry Breuil  
> schrieb:
> 
> > On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> > > >
> > > > Wouldn't it be better to use upstream's standard names? Then a simple
> > > > wildcard works, it matches their usual setup, and you don't have the
> > > > inconsistency you have here where some files are renamed with
> > > > -postgres and others aren't.
> > >
> > >
> > > yeah, with the loop in my updated version, I use the standard names, and
> > > I dropped some legacy scripts.
> >
> > Can you resend the updated version ? it seems it never made it to the
> > list, and now that i've upgraded my work server to 6.3 i might give it a
> > shot..
> >
> 
> great, thanks! See below.
> 
> ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> ? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh

Forgotten ? patches not needed ?

Re: update www/sope www/sogo to 4.0.0

[Sebastian Reitenbach]

Hi,



Am Montag, April 30, 2018 15:20 CEST, Landry Breuil  
schrieb:

> On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> > >
> > > Wouldn't it be better to use upstream's standard names? Then a simple
> > > wildcard works, it matches their usual setup, and you don't have the
> > > inconsistency you have here where some files are renamed with
> > > -postgres and others aren't.
> >
> >
> > yeah, with the loop in my updated version, I use the standard names, and
> > I dropped some legacy scripts.
>
> Can you resend the updated version ? it seems it never made it to the
> list, and now that i've upgraded my work server to 6.3 i might give it a
> shot..
>

great, thanks! See below.

? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
? sogo/patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
Index: sope/Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- sope/Makefile   23 Sep 2017 10:27:35 -  1.71
+++ sope/Makefile   2 May 2018 20:27:11 -
@@ -4,16 +4,13 @@
 COMMENT-mysql= SOPE MySQL adaptor
 COMMENT-postgres=  SOPE PostgreSQL adaptor

-VERSION =  3.2.10
+VERSION =  4.0.0
 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

-SO_MAJOR=  4
+SO_MAJOR=  5
 SO_MINOR=  0
 .for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
NGObjWeb NGStreams SaxObjC WEExtensions \
@@ -22,7 +19,7 @@
 .endfor

 CATEGORIES=www
-HOMEPAGE=  http://www.sogo.nu
+HOMEPAGE=  https://sogo.nu
 MASTER_SITES=  ${HOMEPAGE}/files/downloads/SOGo/Sources/
 MAINTAINER=Sebastian Reitenbach 

Index: sope/distinfo
===
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.42
diff -u -r1.42 distinfo
--- sope/distinfo   7 Jul 2017 10:40:13 -   1.42
+++ sope/distinfo   2 May 2018 20:27:11 -
@@ -1,2 +1,2 @@
-SHA256 (SOPE-3.2.10.tar.gz) = eZS/mF7Y4sY7YF5ONJXYvNzOaL/8j+qHJRyZk4LD32Y=
-SIZE (SOPE-3.2.10.tar.gz) = 2282107
+SHA256 (SOPE-4.0.0.tar.gz) = joZwPTf8JK512MqJjm6IKdPFHtIQwMIduPbqEwh7MhY=
+SIZE (SOPE-4.0.0.tar.gz) = 2283869
Index: sogo/Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- sogo/Makefile   11 Jan 2018 19:27:12 -  1.74
+++ sogo/Makefile   2 May 2018 20:27:11 -
@@ -2,18 +2,17 @@

 COMMENT =  web based groupware server

-VERSION =  3.2.10
+VERSION =  4.0.0
 DISTNAME = SOGo-${VERSION}
 PKGNAME =  sogo-${VERSION}
-REVISION = 1

 SHARED_LIBS += GDLContentStore 3.0
-SHARED_LIBS += NGCards 3.0
-SHARED_LIBS += SOGo4.1
-SHARED_LIBS += SOGoUI  2.1
+SHARED_LIBS += NGCards 3.1
+SHARED_LIBS += SOGo5.0
+SHARED_LIBS += SOGoUI  2.2

 CATEGORIES =   www
-HOMEPAGE = http://www.sogo.nu/
+HOMEPAGE = https://sogo.nu/
 MASTER_SITES = ${HOMEPAGE}/files/downloads/SOGo/Sources/
 MAINTAINER =   Sebastian Reitenbach 

@@ -51,38 +50,17 @@
 SOGOLIBDIR =   
lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
 SUBST_VARS +=  SOGOLIBDIR VARBASE

+SCRIPTS =  cas-proxy-validate.py sql-update-2.2.17_to_2.3.0.sh \
+   sql-update-3.2.10_to_4.0.0.sh 
sql-update-2.2.17_to_2.3.0-mysql.sh \
+   sql-update-3.2.10_to_4.0.0-mysql.sh 
sql-update-3.0.0-to-combined.sh \
+   sql-update-3.0.0-to-combined-mysql.sh updates.php
+
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
+.for _s in ${SCRIPTS}
${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-   ${WRKSRC}/Scripts/cas-proxy-validate.py \
-   ${PREFIX}/share/doc/sogo/cas-proxy-validate.py
-   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-   ${WRKSRC}/Scripts/sql-update-1.3.11_to_1.3.12.sh \
-   ${PREFIX}/share/doc/sogo/sql-update-1.3.11_to_1.3.12-postgres.sh
-   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-   ${WRKSRC}/Scripts/sql-update-1.3.11_to_1.3.12-mysql.sh \
-   ${PREFIX}/share/doc/sogo/sql-update-1.3.11_to_1.3.12-mysql.sh
-   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-   ${WRKSRC}/Scripts/sql-update-1.3.16_to_1.3.17.sh \
-   ${PREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-postgres.sh
-   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
-   ${WRKSRC}/Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh \
-   

Re: update www/sope www/sogo to 4.0.0

[Landry Breuil]

On Fri, Mar 09, 2018 at 11:55:48AM +0100, Sebastian Reitenbach wrote:
> >
> > Wouldn't it be better to use upstream's standard names? Then a simple
> > wildcard works, it matches their usual setup, and you don't have the
> > inconsistency you have here where some files are renamed with
> > -postgres and others aren't.
> 
> 
> yeah, with the loop in my updated version, I use the standard names, and
> I dropped some legacy scripts.

Can you resend the updated version ? it seems it never made it to the
list, and now that i've upgraded my work server to 6.3 i might give it a
shot..

thanks!

Re: update www/sope www/sogo to 4.0.0

[Sebastian Reitenbach]

Hi,

Am Freitag, März 09, 2018 10:54 CET, Stuart Henderson  
schrieb:

> On 2018/03/09 01:59, Klemens Nanni wrote:
> > On Thu, Mar 08, 2018 at 11:23:52AM +0100, Sebastian Reitenbach wrote:
> > > Index: Makefile
> > > ===
> > > RCS file: /cvs/ports/www/sogo/Makefile,v
> > > retrieving revision 1.74
> > > diff -u -r1.74 Makefile
> > > --- Makefile  11 Jan 2018 19:27:12 -  1.74
> > > +++ Makefile  8 Mar 2018 09:46:46 -
> > > @@ -2,15 +2,15 @@
> > >
> > >  COMMENT =web based groupware server
> > >
> > > -VERSION =3.2.10
> > > +VERSION =4.0.0
> > >  DISTNAME =   SOGo-${VERSION}
> > >  PKGNAME =sogo-${VERSION}
> > >  REVISION =   1
> > Zap REVISION.
> >
> > >  SHARED_LIBS +=   GDLContentStore 3.0
> > > -SHARED_LIBS +=   NGCards 3.0
> > > -SHARED_LIBS +=   SOGo4.1
> > > -SHARED_LIBS +=   SOGoUI  2.1
> > > +SHARED_LIBS +=   NGCards 3.1
> > > +SHARED_LIBS +=   SOGo5.0
> > > +SHARED_LIBS +=   SOGoUI  2.2
> > >
> > >  CATEGORIES = www
> > >  HOMEPAGE =   http://www.sogo.nu/
> > https://sogo.nu works.
> >
> > > @@ -72,8 +72,14 @@
> > >   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
> > >   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
> > >   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > > + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0.sh \
> > > + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
> > > + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > >   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
> > >   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
> > > + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > > + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh \
> > > + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
> > >   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > >   ${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
> > >   ${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
> > I'd really simplify these into a loop to shorten the target and ease
> > reading:
> >
> > .for _s in ...
> > ${INSTALL_SCRIPT} ... \
> > ${WRKSRC}/Scripts/..${_s}.. \
> > ${PREFIX}/share/doc/sogo/..${_s}..
> > .endfor
>
> Wouldn't it be better to use upstream's standard names? Then a simple
> wildcard works, it matches their usual setup, and you don't have the
> inconsistency you have here where some files are renamed with
> -postgres and others aren't.


yeah, with the loop in my updated version, I use the standard names, and
I dropped some legacy scripts.
>
> > > RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > > diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > > --- /dev/null 1 Jan 1970 00:00:00 -
> > > +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh 8 Mar 
> > > 2018 09:46:46 -
> > > @@ -0,0 +1,68 @@
> > > +$OpenBSD$
> > > +
> > > +Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> > > +--- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
> > >  Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> > > +@@ -1,4 +1,4 @@
> > > +-#!/bin/bash
> > > ++#!/bin/sh
> > Does the script work with our ksh?
>
> I don't think so.
>
> read -p "Username ($defaultusername): " username
> read -p "Hostname ($defaulthostname): " hostname
> read -p "Database ($defaultdatabase): " database
>
> bash:
>
>   -p prompt
>  Display prompt on standard error, without a trailing newline, before
>  attempting to read any input.  The prompt is displayed only if input
>  is coming from a terminal.
>
> ksh:
>
>The -un and -p options cause input to be read from file descriptor 
> n
>(n defaults to 0 if omitted) or the current co-process (see Co-
>processes above for comments on this), respectively.  If the -s
>option is used, input is saved to the history file.
>
> > >  # su _sogo "${TRUEPREFIX}/bin/bash 
> > > ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
> > >  # su _sogo "${TRUEPREFIX}/bin/bash 
> > > ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
> > bash is already missing from RUN_DEPENDS, I wonder if users tried to run
> > that instruction but failed.
>
> I would have a good look at the sed invocations in that file and make sure
> they don't rely on anything from GNU sed.
>

Re: update www/sope www/sogo to 4.0.0

[Stuart Henderson]

On 2018/03/09 01:59, Klemens Nanni wrote:
> On Thu, Mar 08, 2018 at 11:23:52AM +0100, Sebastian Reitenbach wrote:
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/www/sogo/Makefile,v
> > retrieving revision 1.74
> > diff -u -r1.74 Makefile
> > --- Makefile11 Jan 2018 19:27:12 -  1.74
> > +++ Makefile8 Mar 2018 09:46:46 -
> > @@ -2,15 +2,15 @@
> >  
> >  COMMENT =  web based groupware server
> >  
> > -VERSION =  3.2.10
> > +VERSION =  4.0.0
> >  DISTNAME = SOGo-${VERSION}
> >  PKGNAME =  sogo-${VERSION}
> >  REVISION = 1
> Zap REVISION.
> 
> >  SHARED_LIBS += GDLContentStore 3.0
> > -SHARED_LIBS += NGCards 3.0
> > -SHARED_LIBS += SOGo4.1
> > -SHARED_LIBS += SOGoUI  2.1
> > +SHARED_LIBS += NGCards 3.1
> > +SHARED_LIBS += SOGo5.0
> > +SHARED_LIBS += SOGoUI  2.2
> >  
> >  CATEGORIES =   www
> >  HOMEPAGE = http://www.sogo.nu/
> https://sogo.nu works.
> 
> > @@ -72,8 +72,14 @@
> > ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
> > ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
> > ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > +   ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0.sh \
> > +   ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
> > +   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
> > ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
> > +   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > +   ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh \
> > +   ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
> > ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> > ${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
> > ${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
> I'd really simplify these into a loop to shorten the target and ease
> reading:
> 
> .for _s in ...
>   ${INSTALL_SCRIPT} ... \
>   ${WRKSRC}/Scripts/..${_s}.. \
>   ${PREFIX}/share/doc/sogo/..${_s}..
> .endfor

Wouldn't it be better to use upstream's standard names? Then a simple
wildcard works, it matches their usual setup, and you don't have the
inconsistency you have here where some files are renamed with
-postgres and others aren't.

> > RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh   8 Mar 
> > 2018 09:46:46 -
> > @@ -0,0 +1,68 @@
> > +$OpenBSD$
> > +
> > +Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> > +--- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
> >  Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> > +@@ -1,4 +1,4 @@
> > +-#!/bin/bash
> > ++#!/bin/sh
> Does the script work with our ksh?

I don't think so.

read -p "Username ($defaultusername): " username
read -p "Hostname ($defaulthostname): " hostname
read -p "Database ($defaultdatabase): " database

bash:

  -p prompt
 Display prompt on standard error, without a trailing newline, before
 attempting to read any input.  The prompt is displayed only if input
 is coming from a terminal.

ksh:

   The -un and -p options cause input to be read from file descriptor n
   (n defaults to 0 if omitted) or the current co-process (see Co-
   processes above for comments on this), respectively.  If the -s
   option is used, input is saved to the history file.

> >  # su _sogo "${TRUEPREFIX}/bin/bash 
> > ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
> >  # su _sogo "${TRUEPREFIX}/bin/bash 
> > ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
> bash is already missing from RUN_DEPENDS, I wonder if users tried to run
> that instruction but failed.

I would have a good look at the sed invocations in that file and make sure
they don't rely on anything from GNU sed.

Re: update www/sope www/sogo to 4.0.0

[Klemens Nanni]

On Fri, Mar 09, 2018 at 09:34:26AM +0100, Sebastian Reitenbach wrote:
> /bin/sh and /bin/ksh are hardlinks, but I'm not exactly sure if they behave 
> differently
> when called one or the other way. Since I have postgresql backend, I only 
> tested my
> patched version of the postgresql update script.
The question is whether this script works with sh/ksh instead of bash
as you changed it, not whether sh or ksh makes a difference.

> I tried to patch that script to make it work with our /bin/sh but that didn't 
> worked out
> as easy as the other upgrade scripts.
Then why do you keep changing the shebang if it doesn't work?

> This is a real one-time run and I didn't want to make bash RUN_DEPENS for it.
> I updated the description a bit to point out that people might need to 
> install it.
Why not? What about users depending on this script after upgrade? Should
they run into (subtle) issues that might even corrupt their data?
If bash is *required* at runtime, you should add it to RUN_DEPENDS.

Re: update www/sope www/sogo to 4.0.0

[Klemens Nanni]

On Thu, Mar 08, 2018 at 11:23:52AM +0100, Sebastian Reitenbach wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/www/sogo/Makefile,v
> retrieving revision 1.74
> diff -u -r1.74 Makefile
> --- Makefile  11 Jan 2018 19:27:12 -  1.74
> +++ Makefile  8 Mar 2018 09:46:46 -
> @@ -2,15 +2,15 @@
>  
>  COMMENT =web based groupware server
>  
> -VERSION =3.2.10
> +VERSION =4.0.0
>  DISTNAME =   SOGo-${VERSION}
>  PKGNAME =sogo-${VERSION}
>  REVISION =   1
Zap REVISION.

>  SHARED_LIBS +=   GDLContentStore 3.0
> -SHARED_LIBS +=   NGCards 3.0
> -SHARED_LIBS +=   SOGo4.1
> -SHARED_LIBS +=   SOGoUI  2.1
> +SHARED_LIBS +=   NGCards 3.1
> +SHARED_LIBS +=   SOGo5.0
> +SHARED_LIBS +=   SOGoUI  2.2
>  
>  CATEGORIES = www
>  HOMEPAGE =   http://www.sogo.nu/
https://sogo.nu works.

> @@ -72,8 +72,14 @@
>   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
>   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
>   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0.sh \
> + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
> + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
>   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
>   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
> + ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
> + ${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh \
> + ${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
>   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
>   ${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
>   ${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
I'd really simplify these into a loop to shorten the target and ease
reading:

.for _s in ...
${INSTALL_SCRIPT} ... \
${WRKSRC}/Scripts/..${_s}.. \
${PREFIX}/share/doc/sogo/..${_s}..
.endfor

> Index: distinfo
> ===
> RCS file: /cvs/ports/www/sogo/distinfo,v
> retrieving revision 1.40
> diff -u -r1.40 distinfo
> --- distinfo  7 Jul 2017 10:41:05 -   1.40
> +++ distinfo  8 Mar 2018 09:46:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (SOGo-3.2.10.tar.gz) = Y4KKk9FcMMhKeVXUSWI3PUKGl3cOh1zlqaU2c3jK8E4=
> -SIZE (SOGo-3.2.10.tar.gz) = 32644083
> +SHA256 (SOGo-4.0.0.tar.gz) = t/P8diJZ9j8Fs9n8/j7KUSbcChGDE1/Xwp3ezV3Z4lw=
> +SIZE (SOGo-4.0.0.tar.gz) = 34458610
> Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> ===
> RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh 8 Mar 2018 
> 09:46:46 -
> @@ -0,0 +1,68 @@
> +$OpenBSD$
> +
> +Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> +--- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
>  Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
Does the script work with our ksh?

> Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> ===
> RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh   8 Mar 2018 
> 09:46:46 -
> @@ -0,0 +1,59 @@
> +$OpenBSD$
> +
> +Index: Scripts/sql-update-3.2.10_to_4.0.0.sh
> +--- Scripts/sql-update-3.2.10_to_4.0.0.sh.orig
>  Scripts/sql-update-3.2.10_to_4.0.0.sh
> +@@ -1,4 +1,4 @@
> +-#!/bin/bash
> ++#!/bin/sh
Same as above.

> Index: pkg/README
> ===
> RCS file: /cvs/ports/www/sogo/pkg/README,v
> retrieving revision 1.21
> diff -u -r1.21 README
> --- pkg/README5 Jul 2017 21:11:50 -   1.21
> +++ pkg/README8 Mar 2018 09:46:46 -
> @@ -286,3 +286,14 @@
>  
>  # su _sogo "${TRUEPREFIX}/bin/bash 
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
>  # su _sogo "${TRUEPREFIX}/bin/bash 
> ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
bash is already missing from RUN_DEPENDS, I wonder if users tried to run
that instruction but failed.

> +
> +Upgrade SOGo from < 4.0.0
> +=
> +Updating SOGo from version 3.X to 4.X requires an update of the database 
> schema.
> +
> +Run one of the following scripts as the SOGo system user _sogo. Depending on
> +the database you use, choose the postgres or mysql variant. The scripts
> +will 

update www/sope www/sogo to 4.0.0

[Sebastian Reitenbach]

Hi,

released yesterday. it at least fixes the annoying bug that I was unable to 
scroll in mail messages in the webinterface with FF.

besides the normal update procedure, also a db schema update script has to be 
run.

I have postgresql backend, so only ran/tested that script.

testing and feedback welcome.

cheers,
Sebastian


sogo-4.0.0.diff
Description: Binary data


sope-4.0.0.diff
Description: Binary data

Major update: www/sope, www/sogo to 3.2.9

[Sebastian Reitenbach]

Hi,

due to some requests, I finally took the time to see how to update www/sope, 
www/sogo from the 2.x to the 3.x version, and therefore to the modern web 
interface.

It turned out to be easier than initially thought.
However, even if Inverse still supports and likely releases new 2.x versions of 
SOGo, I don't have the time to maintain both, therefore this will be a jump to 
the latest 3.x version.
Some may like the new web interface more, some less than the old one.
Generally under the hood, it's the same.

If there are any concerns about that, then please speak up, or offer to 
maintain the 2.x version yourself ;)

Database doesn't need to be upgraded, however, you can do the optional switch 
to the 9-table datbase model, but you should know what you are doing, and why 
you are doing it, see the README about it ;)

tests, comments, complaints etc. welcome.

Some observations with the new web interface:
 - Generally it seems to behave much better with Chromium than with FF, in FF 
following problems observed, which don't manifest when using Chromium:
 - writing a mail that has a scroll bar because it's too long, the message 
editor window jumps up and down
   on each character typed
 - in the mail folder, when hovering over the mail list, the cursor doesn't 
change as well as when hovering
   over the icons on the left of each message, the icon doesn't change to 
the square
 - there maybe more, don't know ;)
 - mail message body that is too long to fit into the screen, and has a 
scroll bar, cannot be scrolled with
   mouse wheel, you have to grab the scroll bar and move that (however, you 
can scroll the mail folder list as
   well as the mail list in the folder with mouse wheel)

cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.70
diff -u -r1.70 Makefile
--- Makefile	20 Jun 2017 19:28:25 -	1.70
+++ Makefile	27 Jun 2017 17:56:08 -
@@ -1,10 +1,8 @@
 # $OpenBSD: Makefile,v 1.70 2017/06/20 19:28:25 giovanni Exp $
 
-PORTROACH+=	limit:^2
-
 COMMENT = 	web based groupware server
 
-VERSION =	2.3.21
+VERSION =	3.2.9
 DISTNAME =	SOGo-${VERSION}
 PKGNAME =	sogo-${VERSION}
 
@@ -74,6 +72,12 @@
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
 		${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
+	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+		${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
+		${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
+	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+		${WRKSRC}/Scripts/sql-update-3.0.0-to-combined-mysql.sh \
+		${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/updates.php \
 		${PREFIX}/share/doc/sogo/updates.php
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.38
diff -u -r1.38 distinfo
--- distinfo	20 Jun 2017 19:28:25 -	1.38
+++ distinfo	27 Jun 2017 17:56:08 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.3.21.tar.gz) = xysQk73Owiou298pUDMrbM4jVa+liXHJjOa/y4SQoUE=
-SIZE (SOGo-2.3.21.tar.gz) = 12474125
+SHA256 (SOGo-3.2.9.tar.gz) = HwZeWs9QkJWbXjfL9y3EHXzMp2zKLioZYsscHmdO/H0=
+SIZE (SOGo-3.2.9.tar.gz) = 32557925
Index: patches/patch-Scripts_sql-update-3_0_0-to-combined-mysql_sh
===
RCS file: patches/patch-Scripts_sql-update-3_0_0-to-combined-mysql_sh
diff -N patches/patch-Scripts_sql-update-3_0_0-to-combined-mysql_sh
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-Scripts_sql-update-3_0_0-to-combined-mysql_sh	27 Jun 2017 17:56:08 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+use sh instead of bash
+
+Index: Scripts/sql-update-3.0.0-to-combined-mysql.sh
+--- Scripts/sql-update-3.0.0-to-combined-mysql.sh.orig
 Scripts/sql-update-3.0.0-to-combined-mysql.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ echo "
+ 
+@@ -13,7 +13,7 @@ In other words, only run this if you absolutely know w
+ "
+ 
+ while [[ -z "${GO_WITH_INSTALL}" ]]; do
+-read -p "Do you really want to proceed (yes/no)? " GO_WITH_INSTALL
++read GO_WITH_INSTALL?"Do you really want to proceed (yes/no)?  "
+ done
+ 
+ if [[ ${GO_WITH_INSTALL:0:1} != "Y" && ${GO_WITH_INSTALL:0:1} != "y" ]]; then
Index: patches/patch-Scripts_sql-update-3_0_0-to-combined_sh
===
RCS file: patches/patch-Scripts_sql-update-3_0_0-to-combined_sh
diff -N patches/patch-Scripts_sql-update-3_0_0-to-combined_sh
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-Scripts_sql-update-3_0_0-to-combined_sh	27 Jun 2017 17:56:08 

UPDATE: www/sope www/sogo

[Sebastian Reitenbach]

Hi,

this bumps www/sope and www/sogo from 2.3.2 to 2.3.4.
lots of cleanup was done for 2.3.3 in sope, so a lot
of patches are there gone now.

works well for me on amd64. If I don't here objections
I'll update at the end of the week.

Otherwise, test (success/failure) reports, comments
or OKs welcome too ;)

cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile26 Oct 2015 11:55:36 -  1.50
+++ Makefile4 Jan 2016 09:20:57 -
@@ -2,8 +2,7 @@
 
 COMMENT =  web based groupware server
 
-VERSION =  2.3.2
-REVISION = 1
+VERSION =  2.3.4
 DISTNAME = SOGo-${VERSION}
 PKGNAME =  sogo-${VERSION}
 
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- distinfo26 Sep 2015 14:29:22 -  1.24
+++ distinfo4 Jan 2016 09:20:57 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.3.2.tar.gz) = eDDirWhLVMiaRyDt9+cyUKB2iFo+JQUsCT54lCJ5Oaw=
-SIZE (SOGo-2.3.2.tar.gz) = 11781695
+SHA256 (SOGo-2.3.4.tar.gz) = CkEadYV4NDC0m2GG2SjjsPluSY3+8Dz5k7kUdBsB608=
+SIZE (SOGo-2.3.4.tar.gz) = 11875672
Index: patches/patch-Tests_Unit_GNUmakefile
===
RCS file: /cvs/ports/www/sogo/patches/patch-Tests_Unit_GNUmakefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Tests_Unit_GNUmakefile
--- patches/patch-Tests_Unit_GNUmakefile26 Sep 2015 14:29:22 -  
1.3
+++ patches/patch-Tests_Unit_GNUmakefile4 Jan 2016 09:20:57 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-Tests_Unit_GNUmakefile,v 1.3 2015/09/26 14:29:22 sebastia Exp $
 Do not hardcode libobjc library name, ask GNUstep what to use.
 Tests/Unit/GNUmakefile.origFri Sep 25 10:52:19 2015
-+++ Tests/Unit/GNUmakefile Fri Sep 25 10:53:53 2015
-@@ -35,8 +35,8 @@ $(TEST_TOOL)_CPPFLAGS += \
+--- Tests/Unit/GNUmakefile.origWed Dec 16 14:52:58 2015
 Tests/Unit/GNUmakefile Mon Dec 21 22:28:23 2015
+@@ -36,8 +36,8 @@ $(TEST_TOOL)_CPPFLAGS += \
-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/
  
  ADDITIONAL_LIB_DIRS += \
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.23
diff -u -r1.23 PLIST
--- pkg/PLIST   26 Sep 2015 14:29:22 -  1.23
+++ pkg/PLIST   4 Jan 2016 09:20:57 -
@@ -615,12 +615,16 @@
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/
 
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Macedonian.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/
 
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/
 
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/
 
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Portuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/
 
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/
@@ -678,12 +682,16 @@
 
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.html
 
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.wod
 
lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPResponseMap.plist
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Macedonian.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/
 
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/
 
lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Portuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/
 

MAINTAINER UPDATE: www/sope www/sogo

[Sebastian Reitenbach]

Hi,

here an update from 2.2.17a to a current 2.3.2.
Works for me so far on amd64 with postgres db and LDAP authentication.

Besides the usual upgrade procedure, the database shema
has to be updated this time too, see the pkg README.

I'm going to commit it at the end of the week if I don't hear
any complaints back.
Otherwise feedback or OKs welcome ;)


cheers,
Sebastian
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile17 Jul 2015 21:23:08 -  1.47
+++ Makefile21 Sep 2015 11:31:45 -
@@ -2,14 +2,13 @@
 
 COMMENT =  web based groupware server
 
-VERSION =  2.2.17
-DISTNAME = SOGo-${VERSION}a
-PKGNAME =  sogo-${VERSION}.0
-REVISION = 0
+VERSION =  2.3.2
+DISTNAME = SOGo-${VERSION}
+PKGNAME =  sogo-${VERSION}
 
 SHARED_LIBS += GDLContentStore 2.0
 SHARED_LIBS += NGCards 2.0
-SHARED_LIBS += SOGo2.3
+SHARED_LIBS += SOGo3.0
 SHARED_LIBS += SOGoUI  2.0
 
 CATEGORIES =   www
@@ -67,6 +66,12 @@
${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
${WRKSRC}/Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh \
${PREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh
+   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
+   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
+   ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+   ${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
+   ${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
${WRKSRC}/Scripts/updates.php \
${PREFIX}/share/doc/sogo/updates.php
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo10 May 2015 11:41:12 -  1.23
+++ distinfo21 Sep 2015 11:31:45 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.2.17a.tar.gz) = roCv0w1/4mmGfioMFTTOgRrmfOZAU64vx3hCzHspg0M=
-SIZE (SOGo-2.2.17a.tar.gz) = 11605280
+SHA256 (SOGo-2.3.2.tar.gz) = eDDirWhLVMiaRyDt9+cyUKB2iFo+JQUsCT54lCJ5Oaw=
+SIZE (SOGo-2.3.2.tar.gz) = 11781695
Index: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
===
RCS file: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
diff -N patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh   21 Sep 2015 
11:31:45 -
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh.orig   Wed Sep 16 20:41:29 2015
 Scripts/sql-update-2.2.17_to_2.3.0-mysql.shMon Sep 21 13:17:32 2015
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ set -e
+ 
+@@ -11,15 +11,19 @@ set -e
+ defaultusername=$USER
+ defaulthostname=127.0.0.1
+ defaultdatabase=$USER
+-indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ 
OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f /etc/sogo/sogo.conf ];then
++  indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ 
OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++else
++  indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/  
{print $2}' |  awk -F/ '{print $NF}')
++fi
+ if [ -z "$indextable" ]; then
+   echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
+   exit 1
+ fi
+ 
+-read -p "Username ($defaultusername): " username
+-read -p "Hostname ($defaulthostname): " hostname
+-read -p "Database ($defaultdatabase): " database
++read username?"Username ($defaultusername): "
++read hostname?"Hostname ($defaulthostname): "
++read database?"Database ($defaultdatabase): "
+ 
+ if [ -z "$username" ]
+ then
Index: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
===
RCS file: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
diff -N patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh 21 Sep 2015 11:31:45 
-
@@ -0,0 +1,33 @@
+$OpenBSD$
+--- Scripts/sql-update-2.2.17_to_2.3.0.sh.orig Wed Sep 16 20:41:29 2015
 Scripts/sql-update-2.2.17_to_2.3.0.sh  Mon Sep 21 13:17:17 2015
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ set -e 
+ # This script only works with PostgreSQL
+@@ -11,15 +11,19 @@ defaultusername=$USER
+ defaulthostname=localhost
+ defaultdatabase=$USER
+ #indextable=sogo_folder_info
+-indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ 
OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f 

Update www/sope, www/sogo to 2.2.17a

[Sebastian Reitenbach]

Hi,

last update longer time ago, so jumping over a bunch of releases.

The latest version of sogo, or maybe one or two before, doesn't compile
with gnutls again, therefore added patch to configure to allow it to 
correctly

detect openssl, or better speaking libressl, and use that instead.

Lightly tested on my amd64 test installation, so far without issues, 
more will follow.

If I don't see anything bad, I'm going to commit by the end of the week.

cc'ing some usual suspects for tests and feedback ;)

OK?

cheers,
Sebastian

? sogo-2.2.17a
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.45
diff -u -r1.45 Makefile
--- Makefile29 Apr 2015 09:15:28 -  1.45
+++ Makefile4 May 2015 18:15:58 -
@@ -2,10 +2,9 @@
 
 COMMENT =  web based groupware server
 
-VERSION =  2.2.13
-REVISION = 0
-DISTNAME = SOGo-${VERSION}
-PKGNAME =  sogo-${VERSION}
+VERSION =  2.2.17
+DISTNAME = SOGo-${VERSION}a
+PKGNAME =  sogo-${VERSION}.0
 
 SHARED_LIBS += GDLContentStore 2.0
 SHARED_LIBS += NGCards 2.0
@@ -26,7 +25,7 @@
 WANTLIB += c m pthread crypto memcached SBJson
 WANTLIB += DOM EOControl GDLAccess NGExtensions NGLdap
 WANTLIB += NGMime NGObjWeb NGStreams SaxObjC WEExtensions
-WANTLIB += objc2 gnustep-base curl gnutls
+WANTLIB += objc2 gnustep-base curl
 
 LIB_DEPENDS += devel/libmemcached \
net/curl \
@@ -40,7 +39,7 @@
 
 CONFIGURE_STYLE =  simple dest
 CONFIGURE_ARGS +=  --gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
-   --with-ssl=gnutls
+   --with-ssl=ssl
 MAKE_FLAGS +=  
libGDLContentStore_INTERFACE_VERSION=${LIBGDLContentStore_VERSION} \
libNGCards_INTERFACE_VERSION=${LIBNGCards_VERSION} \

libOGoContentStore_INTERFACE_VERSION=${LIBOGoContentStore_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.22
diff -u -r1.22 distinfo
--- distinfo16 Jan 2015 09:51:18 -  1.22
+++ distinfo4 May 2015 18:15:58 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.2.13.tar.gz) = cItyKjI6GnWcYdQsh3TfVoVNVcPzOT5MgtUyMmUnkEU=
-SIZE (SOGo-2.2.13.tar.gz) = 11579472
+SHA256 (SOGo-2.2.17a.tar.gz) = roCv0w1/4mmGfioMFTTOgRrmfOZAU64vx3hCzHspg0M=
+SIZE (SOGo-2.2.17a.tar.gz) = 11605280
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-configure 4 May 2015 18:15:58 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Thu Mar 26 19:14:26 2015
 configure  Mon Apr 13 18:52:02 2015
+@@ -342,7 +342,7 @@ EOF
+   echo $tmpmake CTOOL_NAME   := linktest
+   echo $tmpmake linktest_C_FILES := dummytool.c
+   echo $tmpmake ifeq (\$(findstring openbsd, \$(GNUSTEP_HOST_OS)), 
openbsd)
+-  echo $tmpmake linktest_TOOL_LIBS  += $LIBS -liconv
++  echo $tmpmake linktest_TOOL_LIBS  += $LIBS -liconv -lcrypto
+   echo $tmpmake else
+   echo $tmpmake linktest_TOOL_LIBS  += $LIBS
+   echo $tmpmake endif
Index: Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.47
diff -u -r1.47 Makefile
--- Makefile16 Jan 2015 09:50:30 -  1.47
+++ Makefile4 May 2015 18:15:26 -
@@ -4,14 +4,14 @@
 COMMENT-mysql= SOPE MySQL adaptor
 COMMENT-postgres=  SOPE PostgreSQL adaptor
 
-VERSION =  2.2.13
-DISTNAME = SOPE-${VERSION}
-PKGNAME-main = sope-${VERSION}
-PKGNAME-mysql =sope-mysql-${VERSION}
-PKGNAME-postgres = sope-postgres-${VERSION}
+VERSION =  2.2.17
+DISTNAME = SOPE-${VERSION}a
+PKGNAME-main = sope-${VERSION}.0
+PKGNAME-mysql =sope-mysql-${VERSION}.0
+PKGNAME-postgres = sope-postgres-${VERSION}.0
 
-SO_MAJOR=  2
-SO_MINOR=  3
+SO_MAJOR=  3
+SO_MINOR=  0
 .for _lib in DOM EOControl GDLAccess NGExtensions NGLdap NGMime \
NGObjWeb NGStreams SaxObjC WEExtensions \
WOExtensions XmlRpc SBJson
@@ -42,9 +42,9 @@
databases/openldap \
x11/gnustep/libobjc2 \
${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql =${BASE_PKGPATH}=${VERSION} \
+LIB_DEPENDS-mysql =${BASE_PKGPATH}=${VERSION}.0 \
databases/mariadb,-main
-LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION} \
+LIB_DEPENDS-postgres = ${BASE_PKGPATH}=${VERSION}.0 \
databases/postgresql,-main
 
 CONFIGURE_STYLE=simple dest
Index: distinfo

Re: MAINTAINER UPDATE: www/sope www/sogo to 2.2.9

[Sebastian Reitenbach]

Ping!

running it on amd64 without having seen any regression since I sent that mail 
beginning of the month.
 
On Saturday, October 4, 2014 13:34 CEST, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote: 
 
 Hi,
 
 attached updates to sope/sogo 2.2.9a, just containing a minor bugfix to the
 previsously sent versions, see below.
 
 OK?
 
 Sebastian
 
  
 On Tuesday, September 30, 2014 19:29 CEST, Sebastian Reitenbach 
 sebas...@l00-bugdead-prods.de wrote: 
  
  Hi,
  
  long overdue an update. The update to 2.2.6 was too short to make it into 
  the 
  release for 5.6. Meanwhile we're at 2.2.9.
  
  Attached patches update to that newer version, I have running since a few
  days without issues so far.
  
  With the change of 2.2.8 - 2.2.9, the documentation is not provided aspdf 
  anymore. It would need Apache FOP java thingie to build the documentation.
  I think that is just too much, and those are documents not included anymore.
  
  as with the 2.2.6 update I sent in July, www/opengroupware needs a patch to
  since the changes in www/sope.
  
  This version does not yet include a SUBPACKAGE for activesync, but hopeto 
  get it added with next release 2.2.10, which is supposed to be released 
  in not too far future.
  
  OK?
  
  Sebastian 
  
  
  
 
 
 
 

Re: MAINTAINER UPDATE: www/sope www/sogo to 2.2.9

[Sebastian Reitenbach]

Hi,

attached updates to sope/sogo 2.2.9a, just containing a minor bugfix to the
previsously sent versions, see below.

OK?

Sebastian


On Tuesday, September 30, 2014 19:29 CEST, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote:

 Hi,

 long overdue an update. The update to 2.2.6 was too short to make it into the
 release for 5.6. Meanwhile we're at 2.2.9.

 Attached patches update to that newer version, I have running since a few
 days without issues so far.

 With the change of 2.2.8 - 2.2.9, the documentation is not provided aspdf 
 anymore. It would need Apache FOP java thingie to build the documentation.
 I think that is just too much, and those are documents not included anymore.

 as with the 2.2.6 update I sent in July, www/opengroupware needs a patch to
 since the changes in www/sope.

 This version does not yet include a SUBPACKAGE for activesync, but hopeto get 
 it added with next release 2.2.10, which is supposed to be released
 in not too far future.

 OK?

 Sebastian



? sogo-2.2.9.diff
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	12 Jun 2014 06:16:35 -	1.40
+++ Makefile	4 Oct 2014 11:32:16 -
@@ -2,15 +2,13 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.1.1
-DISTNAME =	SOGo-${VERSION}b
-PKGNAME =	sogo-${VERSION}.1
-REVISION =	3
+VERSION =	2.2.9
+DISTNAME =	SOGo-${VERSION}a
+PKGNAME =	sogo-${VERSION}.0
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
-SHARED_LIBS +=	OGoContentStore	2.0
-SHARED_LIBS +=	SOGo		2.1
+SHARED_LIBS +=	SOGo		2.2
 SHARED_LIBS +=	SOGoUI		2.0
 
 CATEGORIES =	www
@@ -51,15 +49,8 @@
 SOGOLIBDIR =	lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
 SUBST_VARS +=	SOGOLIBDIR VARBASE
 
-pre-configure:
-.for f in SOGo_Installation_Guide SOGo_Mobile_Devices_Configuration \
-SOGo_Mozilla_Thunderbird_Configuration SOGo_Native_Microsoft_Outlook_Configuration
-	cd ${WRKSRC}/Documentation; mv ${f:S/_/ /g}.odt $f.odt
-.endfor
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
-	${INSTALL_DATA} ${WRKSRC}/Documentation/* ${PREFIX}/share/doc/sogo
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/cas-proxy-validate.py \
 		${PREFIX}/share/doc/sogo/cas-proxy-validate.py
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo	3 Jan 2014 18:39:51 -	1.19
+++ distinfo	4 Oct 2014 11:32:16 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.1.1b.tar.gz) = 7JCs4kogu8K6BJ/fsiT6ntSeRhVZuHA1YJMFqUUbs94=
-SIZE (SOGo-2.1.1b.tar.gz) = 5846822
+SHA256 (SOGo-2.2.9a.tar.gz) = Av8C/wtQmYEEnhT0/C8tTZ5ctipT5lFF/UGrZT0mLkY=
+SIZE (SOGo-2.2.9a.tar.gz) = 11535574
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- pkg/PLIST	3 Jan 2014 18:39:51 -	1.19
+++ pkg/PLIST	4 Oct 2014 11:32:17 -
@@ -6,7 +6,6 @@
 include/GDLContentStore/GCSAlarmsFolder.h
 include/GDLContentStore/GCSChannelManager.h
 include/GDLContentStore/GCSContext.h
-include/GDLContentStore/GCSFieldExtractor.h
 include/GDLContentStore/GCSFieldInfo.h
 include/GDLContentStore/GCSFolder.h
 include/GDLContentStore/GCSFolderManager.h
@@ -64,7 +63,11 @@
 lib/GNUstep/Frameworks/SOGo.framework/Versions/
 ${SOGOLIBDIR}/
 ${SOGOLIBDIR}/Headers/
+${SOGOLIBDIR}/Headers/BSONCodec.h
 ${SOGOLIBDIR}/Headers/DOMNode+SOGo.h
+${SOGOLIBDIR}/Headers/EOBitmaskQualifier.h
+${SOGOLIBDIR}/Headers/EOQualifier+SOGoCacheObject.h
+${SOGOLIBDIR}/Headers/GCSSpecialQueries+SOGoCacheObject.h
 ${SOGOLIBDIR}/Headers/LDAPSource.h
 ${SOGOLIBDIR}/Headers/LDAPSourceSchema.h
 ${SOGOLIBDIR}/Headers/NSArray+DAV.h
@@ -86,6 +89,9 @@
 ${SOGOLIBDIR}/Headers/SOGoBuild.h
 ${SOGOLIBDIR}/Headers/SOGoCASSession.h
 ${SOGOLIBDIR}/Headers/SOGoCache.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSFolder.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSObject.h
+${SOGOLIBDIR}/Headers/SOGoCacheObject.h
 ${SOGOLIBDIR}/Headers/SOGoConstants.h
 ${SOGOLIBDIR}/Headers/SOGoContentObject.h
 ${SOGOLIBDIR}/Headers/SOGoCredentialsFile.h
@@ -890,7 +896,41 @@
 lib/GNUstep/SOGo/Mailer.SOGo/
 @bin lib/GNUstep/SOGo/Mailer.SOGo/Mailer
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Danish.lproj/

MAINTAINER UPDATE: www/sope www/sogo to 2.2.9

[Sebastian Reitenbach]

Hi,

long overdue an update. The update to 2.2.6 was too short to make it into the
release for 5.6. Meanwhile we're at 2.2.9.

Attached patches update to that newer version, I have running since a few
days without issues so far.

With the change of 2.2.8 - 2.2.9, the documentation is not provided as
pdf anymore. It would need Apache FOP java thingie to build the documentation.
I think that is just too much, and those are documents not included anymore.

as with the 2.2.6 update I sent in July, www/opengroupware needs a patch to
since the changes in www/sope.

This version does not yet include a SUBPACKAGE for activesync, but hope
to get it added with next release 2.2.10, which is supposed to be released
in not too far future.

OK?

Sebastian? sogo-2.2.9.diff
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile	12 Jun 2014 06:16:35 -	1.40
+++ Makefile	30 Sep 2014 16:59:00 -
@@ -2,15 +2,13 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.1.1
-DISTNAME =	SOGo-${VERSION}b
-PKGNAME =	sogo-${VERSION}.1
-REVISION =	3
+VERSION =	2.2.9
+DISTNAME =	SOGo-${VERSION}
+PKGNAME =	sogo-${VERSION}
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
-SHARED_LIBS +=	OGoContentStore	2.0
-SHARED_LIBS +=	SOGo		2.1
+SHARED_LIBS +=	SOGo		2.2
 SHARED_LIBS +=	SOGoUI		2.0
 
 CATEGORIES =	www
@@ -51,15 +49,8 @@
 SOGOLIBDIR =	lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
 SUBST_VARS +=	SOGOLIBDIR VARBASE
 
-pre-configure:
-.for f in SOGo_Installation_Guide SOGo_Mobile_Devices_Configuration \
-SOGo_Mozilla_Thunderbird_Configuration SOGo_Native_Microsoft_Outlook_Configuration
-	cd ${WRKSRC}/Documentation; mv ${f:S/_/ /g}.odt $f.odt
-.endfor
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
-	${INSTALL_DATA} ${WRKSRC}/Documentation/* ${PREFIX}/share/doc/sogo
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/cas-proxy-validate.py \
 		${PREFIX}/share/doc/sogo/cas-proxy-validate.py
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo	3 Jan 2014 18:39:51 -	1.19
+++ distinfo	30 Sep 2014 16:59:00 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.1.1b.tar.gz) = 7JCs4kogu8K6BJ/fsiT6ntSeRhVZuHA1YJMFqUUbs94=
-SIZE (SOGo-2.1.1b.tar.gz) = 5846822
+SHA256 (SOGo-2.2.9.tar.gz) = qXA1vF8MfObZBpojySMGJJKY8/RF89JFJtGp7AByZcU=
+SIZE (SOGo-2.2.9.tar.gz) = 11535599
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.19
diff -u -r1.19 PLIST
--- pkg/PLIST	3 Jan 2014 18:39:51 -	1.19
+++ pkg/PLIST	30 Sep 2014 16:59:01 -
@@ -6,7 +6,6 @@
 include/GDLContentStore/GCSAlarmsFolder.h
 include/GDLContentStore/GCSChannelManager.h
 include/GDLContentStore/GCSContext.h
-include/GDLContentStore/GCSFieldExtractor.h
 include/GDLContentStore/GCSFieldInfo.h
 include/GDLContentStore/GCSFolder.h
 include/GDLContentStore/GCSFolderManager.h
@@ -64,7 +63,11 @@
 lib/GNUstep/Frameworks/SOGo.framework/Versions/
 ${SOGOLIBDIR}/
 ${SOGOLIBDIR}/Headers/
+${SOGOLIBDIR}/Headers/BSONCodec.h
 ${SOGOLIBDIR}/Headers/DOMNode+SOGo.h
+${SOGOLIBDIR}/Headers/EOBitmaskQualifier.h
+${SOGOLIBDIR}/Headers/EOQualifier+SOGoCacheObject.h
+${SOGOLIBDIR}/Headers/GCSSpecialQueries+SOGoCacheObject.h
 ${SOGOLIBDIR}/Headers/LDAPSource.h
 ${SOGOLIBDIR}/Headers/LDAPSourceSchema.h
 ${SOGOLIBDIR}/Headers/NSArray+DAV.h
@@ -86,6 +89,9 @@
 ${SOGOLIBDIR}/Headers/SOGoBuild.h
 ${SOGOLIBDIR}/Headers/SOGoCASSession.h
 ${SOGOLIBDIR}/Headers/SOGoCache.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSFolder.h
+${SOGOLIBDIR}/Headers/SOGoCacheGCSObject.h
+${SOGOLIBDIR}/Headers/SOGoCacheObject.h
 ${SOGOLIBDIR}/Headers/SOGoConstants.h
 ${SOGOLIBDIR}/Headers/SOGoContentObject.h
 ${SOGOLIBDIR}/Headers/SOGoCredentialsFile.h
@@ -890,7 +896,41 @@
 lib/GNUstep/SOGo/Mailer.SOGo/
 @bin lib/GNUstep/SOGo/Mailer.SOGo/Mailer
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Arabic.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Danish.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Danish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Dutch.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/Dutch.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/English.lproj/

Re: UPDATE www/sope www/sogo to 2.1.1b

[Giovanni Bechis]

On 12/15/13 13:11, Sebastian Reitenbach wrote:
 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:2
 If needed, to get back the old behaviour listening on *:2 follow 
 instructions in the
 pkg README.
 
 OK?
 
Finally I found some time to test this, works like a charm, ok giovanni@
 Cheers  Thanks
  Giovanni

Re: UPDATE www/sope www/sogo to 2.1.1b

[Sebastian Reitenbach]

ping 
On Sunday, December 15, 2013 13:11 CET, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote: 
 
 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:2
 If needed, to get back the old behaviour listening on *:2 follow 
 instructions in the
 pkg README.
 
 OK?
 
 
 
 
 
 
 
 

UPDATE www/sope www/sogo to 2.1.1b

[Sebastian Reitenbach]

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:2
If needed, to get back the old behaviour listening on *:2 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 -	1.34
+++ Makefile	15 Dec 2013 12:04:31 -
@@ -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 -	1.18
+++ distinfo	15 Dec 2013 12:04:31 -
@@ -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 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -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 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -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 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile	15 Dec 2013 12:04:31 -
@@ -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 \
++	

Re: update www/sope www/sogo to 2.0.7

[Giovanni Bechis]

On 08/13/13 18:51, Sebastian Reitenbach wrote:
 Hi,
 
 attached patches update sope/sogo to 2.0.7. The XSS patches
 are now not needed anymore, but SOGo contains now an additional patch
 to fix an exception I've seen in the WebUI.
 
 Only tested on my amd64 notebook via ssh tunnels to my server.
 
 OK?
 
 Sebastian
 
There is a stale REVISION-mysql in sope, other than that ok for me.
 Cheers  Thanks
  Giovanni

update www/sope www/sogo to 2.0.7

[Sebastian Reitenbach]

Hi,

attached patches update sope/sogo to 2.0.7. The XSS patches
are now not needed anymore, but SOGo contains now an additional patch
to fix an exception I've seen in the WebUI.

Only tested on my amd64 notebook via ssh tunnels to my server.

OK?

SebastianIndex: Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.33
diff -u -p -u -r1.33 Makefile
--- Makefile	12 Jun 2013 20:36:34 -	1.33
+++ Makefile	13 Aug 2013 16:45:42 -
@@ -4,11 +4,11 @@ COMMENT-main=		Skyrix Object Publishing 
 COMMENT-mysql=		SOPE MySQL adaptor
 COMMENT-postgres=	SOPE PostgreSQL adaptor
 
-VERSION =		2.0.5
-DISTNAME =		SOPE-${VERSION}a
-PKGNAME-main =		sope-${VERSION}.0
-PKGNAME-mysql =		sope-mysql-${VERSION}.0
-PKGNAME-postgres =	sope-postgres-${VERSION}.0
+VERSION =		2.0.7
+DISTNAME =		SOPE-${VERSION}
+PKGNAME-main =		sope-${VERSION}
+PKGNAME-mysql =		sope-mysql-${VERSION}
+PKGNAME-postgres =	sope-postgres-${VERSION}
 
 REVISION-mysql =	1
 
@@ -44,9 +44,9 @@ LIB_DEPENDS-main=	x11/gnustep/base \
 			databases/openldap \
 			x11/gnustep/libobjc2 \
 			${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.0 \
+LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION} \
 			databases/mysql,-main
-LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.0 \
+LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION} \
 			databases/postgresql,-main
 
 CONFIGURE_STYLE=simple dest
Index: distinfo
===
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.19
diff -u -p -u -r1.19 distinfo
--- distinfo	25 Apr 2013 16:41:50 -	1.19
+++ distinfo	13 Aug 2013 16:45:42 -
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.0.5a.tar.gz) = av0r1EL4QMEYRvtLNdsBHeNSP9TlIwWjmJb5ran9iJw=
-SIZE (SOPE-2.0.5a.tar.gz) = 2249592
+SHA256 (SOPE-2.0.7.tar.gz) = +77CIk/3plTuSbBnAMvaxjnlCVP9zund+JIClkw/v5s=
+SIZE (SOPE-2.0.7.tar.gz) = 2250930
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile	20 Jul 2013 17:39:17 -	1.31
+++ Makefile	13 Aug 2013 16:46:20 -
@@ -2,10 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.5
-REVISION =	0
-DISTNAME =	SOGo-${VERSION}a
-PKGNAME =	sogo-${VERSION}.0
+VERSION =	2.0.7
+DISTNAME =	SOGo-${VERSION}
+PKGNAME =	sogo-${VERSION}
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
@@ -36,7 +35,8 @@ RUN_DEPENDS +=		sope-postgres-*|sope-mys
 			archivers/zip
 
 CONFIGURE_STYLE =	simple dest
-CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES`
+CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
+			--with-ssl=gnutls
 MAKE_FLAGS +=		libGDLContentStore_INTERFACE_VERSION=${LIBGDLContentStore_VERSION} \
 			libNGCards_INTERFACE_VERSION=${LIBNGCards_VERSION} \
 			libOGoContentStore_INTERFACE_VERSION=${LIBOGoContentStore_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo	25 Apr 2013 16:43:05 -	1.17
+++ distinfo	13 Aug 2013 16:46:21 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
-SIZE (SOGo-2.0.5a.tar.gz) = 5640595
+SHA256 (SOGo-2.0.7.tar.gz) = EZe72hblp+lMcO/iFCizShgwvgC/YF2mM6jugq30vl8=
+SIZE (SOGo-2.0.7.tar.gz) = 5694507
Index: patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
===
RCS file: patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
diff -N patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
--- patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m	20 Jul 2013 17:39:17 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-SoObjects_Appointments_SOGoAptMailNotification_m,v 1.1 2013/07/20 17:39:17 sebastia Exp $
-
-fix XSS reported in bugs:
-http://www.sogo.nu/bugs/view.php?id=2368
-http://www.sogo.nu/bugs/view.php?id=2369
-
 SoObjects/Appointments/SOGoAptMailNotification.m.orig	Thu Jun 27 17:50:25 2013
-+++ SoObjects/Appointments/SOGoAptMailNotification.m	Fri Jul 19 11:17:47 2013
-@@ -140,9 +140,14 @@
-   return newEndDate;
- }
- 
-+- (NSString *) location
-+{
-+  return [[apt location] stringByEscapingHTMLString];
-+}
-+
- - (NSString *) summary
- {
--  return [apt summary];
-+  return [[apt summary] stringByEscapingHTMLString];
- }
- 
- - (void) setOrganizerName: (NSString *) theString
Index: patches/patch-SoObjects_SOGo_GNUmakefile_preamble
===
RCS file: /cvs/ports/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-SoObjects_SOGo_GNUmakefile_preamble
--- 

Re: update www/sope www/sogo to 2.0.7

[Jean-Gérard Pailloncy]

Le 13 août 2013 à 18:51, Sebastian Reitenbach sebas...@l00-bugdead-prods.de 
a écrit :
 attached patches update sope/sogo to 2.0.7. The XSS patches
 are now not needed anymore, but SOGo contains now an additional patch
 to fix an exception I've seen in the WebUI.
 
 Only tested on my amd64 notebook via ssh tunnels to my server.

OK.

Thank you Sebastian.
JG

Re: UPDATE: www/sope www/sogo to 2.0.6b

[Sebastian Reitenbach]

Hi,

here is a new updated port, same version, but some 
changes, see below.

  
  attached diffs will updated SOPE/SOGo to 2.0.6b.
  The new patches to SOGo are necessary to get it
  actually start up. But its now warning about classes
  loaded twice. Don't know about a better solution yet,
  but problem with my fix is reported upstream.
 
 The patch i'm talking about above was just commited 
 upstream, see
 http://sogo.nu/bugs/view.php?id=2360

And now even includes two fixes against XSS vulnerabilities
reported and fixed in bugs 2368 and 2369.

Further as suggested by giovanni@ NO_TEST=Yes for SOGo too.

Sebastian
 
  So far, its only lightly tested on my notebook
  via ssh tunnels to my server to the ldap, db, imap,...
  My server is not really running a current snapshot.
  
  test reports from people who use it are welcome.
 
 Are there some test reports from people using SOGo
 or even OKs?
 
 reattached patches for ease of review.
 
 cheers,
 Sebastian
 
  
  Sebastian
  
  
  
  
  
 
 
 
 
Index: Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.33
diff -u -p -u -r1.33 Makefile
--- Makefile	12 Jun 2013 20:36:34 -	1.33
+++ Makefile	2 Jul 2013 04:32:34 -
@@ -4,13 +4,11 @@ COMMENT-main=		Skyrix Object Publishing 
 COMMENT-mysql=		SOPE MySQL adaptor
 COMMENT-postgres=	SOPE PostgreSQL adaptor
 
-VERSION =		2.0.5
-DISTNAME =		SOPE-${VERSION}a
-PKGNAME-main =		sope-${VERSION}.0
-PKGNAME-mysql =		sope-mysql-${VERSION}.0
-PKGNAME-postgres =	sope-postgres-${VERSION}.0
-
-REVISION-mysql =	1
+VERSION =		2.0.6
+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
@@ -44,9 +42,9 @@ LIB_DEPENDS-main=	x11/gnustep/base \
 			databases/openldap \
 			x11/gnustep/libobjc2 \
 			${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.0 \
+LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.1 \
 			databases/mysql,-main
-LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.0 \
+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.19
diff -u -p -u -r1.19 distinfo
--- distinfo	25 Apr 2013 16:41:50 -	1.19
+++ distinfo	2 Jul 2013 04:32:34 -
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.0.5a.tar.gz) = av0r1EL4QMEYRvtLNdsBHeNSP9TlIwWjmJb5ran9iJw=
-SIZE (SOPE-2.0.5a.tar.gz) = 2249592
+SHA256 (SOPE-2.0.6b.tar.gz) = hOP8aO7kW6h1zP/Tg/I8GALnRy020QZhLWEYSzZVNYE=
+SIZE (SOPE-2.0.6b.tar.gz) = 2250249
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile	25 Apr 2013 16:43:05 -	1.30
+++ Makefile	19 Jul 2013 10:26:50 -
@@ -2,9 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.5
-DISTNAME =	SOGo-${VERSION}a
-PKGNAME =	sogo-${VERSION}.0
+VERSION =	2.0.6
+DISTNAME =	SOGo-${VERSION}b
+PKGNAME =	sogo-${VERSION}.1
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
@@ -35,12 +35,14 @@ RUN_DEPENDS +=		sope-postgres-*|sope-mys
 			archivers/zip
 
 CONFIGURE_STYLE =	simple dest
-CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES`
+CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
+			--with-ssl=gnutls
 MAKE_FLAGS +=		libGDLContentStore_INTERFACE_VERSION=${LIBGDLContentStore_VERSION} \
 			libNGCards_INTERFACE_VERSION=${LIBNGCards_VERSION} \
 			libOGoContentStore_INTERFACE_VERSION=${LIBOGoContentStore_VERSION} \
 			libSOGoUI_INTERFACE_VERSION=${LIBSOGoUI_VERSION} \
 			SOGo_INTERFACE_VERSION=${LIBSOGo_VERSION}
+NO_TEST =	Yes
 
 SOGOLIBDIR =	lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
 SUBST_VARS +=	SOGOLIBDIR
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo	25 Apr 2013 16:43:05 -	1.17
+++ distinfo	19 Jul 2013 10:26:50 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
-SIZE (SOGo-2.0.5a.tar.gz) = 5640595
+SHA256 (SOGo-2.0.6b.tar.gz) = Jcx79hiYPTdLlv6dozOdU6jgln+bv//eLXDw/BsAImM=
+SIZE (SOGo-2.0.6b.tar.gz) = 5687253
Index: patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
===
RCS file: patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
diff -N patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-SoObjects_Appointments_SOGoAptMailNotification_m	19 Jul 2013 10:26:50 -
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+fix XSS reported in 

Re: UPDATE: www/sope www/sogo to 2.0.6b

[Sebastian Reitenbach]

 
On Wednesday, July 3, 2013 09:30 CEST, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote: 
 
 Hi,
 
 attached diffs will updated SOPE/SOGo to 2.0.6b.
 The new patches to SOGo are necessary to get it
 actually start up. But its now warning about classes
 loaded twice. Don't know about a better solution yet,
 but problem with my fix is reported upstream.

The patch i'm talking about above was just commited 
upstream, see
http://sogo.nu/bugs/view.php?id=2360

 So far, its only lightly tested on my notebook
 via ssh tunnels to my server to the ldap, db, imap,...
 My server is not really running a current snapshot.
 
 test reports from people who use it are welcome.

Are there some test reports from people using SOGo
or even OKs?

reattached patches for ease of review.

cheers,
Sebastian

 
 Sebastian
 
 
 
 
 
? output
? patches-libobjc2-1.7
? sogo-2.0.6.b.diff
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile	25 Apr 2013 16:43:05 -	1.30
+++ Makefile	2 Jul 2013 04:33:48 -
@@ -2,9 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.5
-DISTNAME =	SOGo-${VERSION}a
-PKGNAME =	sogo-${VERSION}.0
+VERSION =	2.0.6
+DISTNAME =	SOGo-${VERSION}b
+PKGNAME =	sogo-${VERSION}.1
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
@@ -35,7 +35,8 @@ RUN_DEPENDS +=		sope-postgres-*|sope-mys
 			archivers/zip
 
 CONFIGURE_STYLE =	simple dest
-CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES`
+CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
+			--with-ssl=gnutls
 MAKE_FLAGS +=		libGDLContentStore_INTERFACE_VERSION=${LIBGDLContentStore_VERSION} \
 			libNGCards_INTERFACE_VERSION=${LIBNGCards_VERSION} \
 			libOGoContentStore_INTERFACE_VERSION=${LIBOGoContentStore_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo	25 Apr 2013 16:43:05 -	1.17
+++ distinfo	2 Jul 2013 04:33:48 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
-SIZE (SOGo-2.0.5a.tar.gz) = 5640595
+SHA256 (SOGo-2.0.6b.tar.gz) = Jcx79hiYPTdLlv6dozOdU6jgln+bv//eLXDw/BsAImM=
+SIZE (SOGo-2.0.6b.tar.gz) = 5687253
Index: patches/patch-SoObjects_SOGo_GNUmakefile_preamble
===
RCS file: /cvs/ports/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-SoObjects_SOGo_GNUmakefile_preamble
--- patches/patch-SoObjects_SOGo_GNUmakefile_preamble	16 Dec 2012 16:36:26 -	1.6
+++ patches/patch-SoObjects_SOGo_GNUmakefile_preamble	2 Jul 2013 04:33:48 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-SoObjects_SOGo_GNUmakefile_preamble,v 1.6 2012/12/16 16:36:26 sebastia Exp $
 SoObjects/SOGo/GNUmakefile.preamble.orig	Thu Dec  6 19:12:22 2012
-+++ SoObjects/SOGo/GNUmakefile.preamble	Fri Dec  7 15:22:41 2012
-@@ -45,7 +45,7 @@ endif
+--- SoObjects/SOGo/GNUmakefile.preamble.orig	Thu Jun 27 17:50:25 2013
 SoObjects/SOGo/GNUmakefile.preamble	Sat Jun 29 15:53:48 2013
+@@ -46,7 +46,7 @@ endif
  ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
  SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
  else
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 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile	2 Jul 2013 04:33:48 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.orig	Thu Jun 27 17:50:25 2013
 UI/MailPartViewers/GNUmakefile	Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+ 	UIxMailPartICalViewer.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 += \
+ 	

UPDATE: www/sope www/sogo to 2.0.6b

[Sebastian Reitenbach]

Hi,

attached diffs will updated SOPE/SOGo to 2.0.6b.
The new patches to SOGo are necessary to get it
actually start up. But its now warning about classes
loaded twice. Don't know about a better solution yet,
but problem with my fix is reported upstream.
So far, its only lightly tested on my notebook
via ssh tunnels to my server to the ldap, db, imap,...
My server is not really running a current snapshot.

test reports from people who use it are welcome.

Sebastian

? output
? patches-libobjc2-1.7
? sogo-2.0.6.b.diff
Index: Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile	25 Apr 2013 16:43:05 -	1.30
+++ Makefile	2 Jul 2013 04:33:48 -
@@ -2,9 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.5
-DISTNAME =	SOGo-${VERSION}a
-PKGNAME =	sogo-${VERSION}.0
+VERSION =	2.0.6
+DISTNAME =	SOGo-${VERSION}b
+PKGNAME =	sogo-${VERSION}.1
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
@@ -35,7 +35,8 @@ RUN_DEPENDS +=		sope-postgres-*|sope-mys
 			archivers/zip
 
 CONFIGURE_STYLE =	simple dest
-CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES`
+CONFIGURE_ARGS +=	--gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
+			--with-ssl=gnutls
 MAKE_FLAGS +=		libGDLContentStore_INTERFACE_VERSION=${LIBGDLContentStore_VERSION} \
 			libNGCards_INTERFACE_VERSION=${LIBNGCards_VERSION} \
 			libOGoContentStore_INTERFACE_VERSION=${LIBOGoContentStore_VERSION} \
Index: distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.17
diff -u -p -u -r1.17 distinfo
--- distinfo	25 Apr 2013 16:43:05 -	1.17
+++ distinfo	2 Jul 2013 04:33:48 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
-SIZE (SOGo-2.0.5a.tar.gz) = 5640595
+SHA256 (SOGo-2.0.6b.tar.gz) = Jcx79hiYPTdLlv6dozOdU6jgln+bv//eLXDw/BsAImM=
+SIZE (SOGo-2.0.6b.tar.gz) = 5687253
Index: patches/patch-SoObjects_SOGo_GNUmakefile_preamble
===
RCS file: /cvs/ports/www/sogo/patches/patch-SoObjects_SOGo_GNUmakefile_preamble,v
retrieving revision 1.6
diff -u -p -u -r1.6 patch-SoObjects_SOGo_GNUmakefile_preamble
--- patches/patch-SoObjects_SOGo_GNUmakefile_preamble	16 Dec 2012 16:36:26 -	1.6
+++ patches/patch-SoObjects_SOGo_GNUmakefile_preamble	2 Jul 2013 04:33:48 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-SoObjects_SOGo_GNUmakefile_preamble,v 1.6 2012/12/16 16:36:26 sebastia Exp $
 SoObjects/SOGo/GNUmakefile.preamble.orig	Thu Dec  6 19:12:22 2012
-+++ SoObjects/SOGo/GNUmakefile.preamble	Fri Dec  7 15:22:41 2012
-@@ -45,7 +45,7 @@ endif
+--- SoObjects/SOGo/GNUmakefile.preamble.orig	Thu Jun 27 17:50:25 2013
 SoObjects/SOGo/GNUmakefile.preamble	Sat Jun 29 15:53:48 2013
+@@ -46,7 +46,7 @@ endif
  ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
  SOGo_LIBRARIES_DEPEND_UPON += -lcrypto
  else
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 -
+++ patches/patch-UI_MailPartViewers_GNUmakefile	2 Jul 2013 04:33:48 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- UI/MailPartViewers/GNUmakefile.orig	Thu Jun 27 17:50:25 2013
 UI/MailPartViewers/GNUmakefile	Sat Jun 29 16:39:10 2013
+@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
+ 	UIxMailPartICalViewer.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_GNUmakefile_preamble
===
RCS file: patches/patch-UI_MailPartViewers_GNUmakefile_preamble
diff -N patches/patch-UI_MailPartViewers_GNUmakefile_preamble
--- /dev/null	1 Jan 1970 00:00:00 -
+++ 

UPDATE: www/sope www/sogo

[Sebastian Reitenbach]

Hi,

attached patches update www/sope, www/sogo to the last release: 2.0.5a.

Patches should come after the GNUstep updates I just sent in a different mail,
but its supposed to work with the current version too. So, when this may
enter the ports tree before, would need a bump.

OK?

SebastianIndex: www/sogo/Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile
--- www/sogo/Makefile	11 Mar 2013 11:44:49 -	1.29
+++ www/sogo/Makefile	23 Apr 2013 17:11:06 -
@@ -2,9 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.4
-DISTNAME =	SOGo-${VERSION}b
-PKGNAME =	sogo-${VERSION}.1
+VERSION =	2.0.5
+DISTNAME =	SOGo-${VERSION}a
+PKGNAME =	sogo-${VERSION}.0
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
Index: www/sogo/distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.16
diff -u -p -u -r1.16 distinfo
--- www/sogo/distinfo	6 Feb 2013 17:36:11 -	1.16
+++ www/sogo/distinfo	23 Apr 2013 17:11:06 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.4b.tar.gz) = 79bcerjwSPX/bIeVeKdIe0YKz20vIo9adOoWhmku1/8=
-SIZE (SOGo-2.0.4b.tar.gz) = 6276765
+SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
+SIZE (SOGo-2.0.5a.tar.gz) = 5640595
Index: www/sope//Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- www/sope//Makefile	11 Mar 2013 11:44:49 -	1.30
+++ www/sope//Makefile	23 Apr 2013 17:10:40 -
@@ -4,11 +4,11 @@ COMMENT-main=		Skyrix Object Publishing 
 COMMENT-mysql=		SOPE MySQL adaptor
 COMMENT-postgres=	SOPE PostgreSQL adaptor
 
-VERSION =		2.0.4
-DISTNAME =		SOPE-${VERSION}b
-PKGNAME-main =		sope-${VERSION}.1
-PKGNAME-mysql =		sope-mysql-${VERSION}.1
-PKGNAME-postgres =	sope-postgres-${VERSION}.1
+VERSION =		2.0.5
+DISTNAME =		SOPE-${VERSION}a
+PKGNAME-main =		sope-${VERSION}.0
+PKGNAME-mysql =		sope-mysql-${VERSION}.0
+PKGNAME-postgres =	sope-postgres-${VERSION}.0
 
 SO_MAJOR=	2
 SO_MINOR=	0
@@ -42,9 +42,9 @@ LIB_DEPENDS-main=	x11/gnustep/base \
 			databases/openldap \
 			x11/gnustep/libobjc2 \
 			${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.0 \
 			databases/mysql,-main
-LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.0 \
 			databases/postgresql,-main
 
 CONFIGURE_STYLE=simple dest
Index: www/sope//distinfo
===
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- www/sope//distinfo	6 Feb 2013 17:35:51 -	1.18
+++ www/sope//distinfo	23 Apr 2013 17:10:40 -
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.0.4b.tar.gz) = 2M5PaTJrB4ljLz9vVVB++FB9EPwlvZSSrjYnN4qLOuw=
-SIZE (SOPE-2.0.4b.tar.gz) = 2248548
+SHA256 (SOPE-2.0.5a.tar.gz) = av0r1EL4QMEYRvtLNdsBHeNSP9TlIwWjmJb5ran9iJw=
+SIZE (SOPE-2.0.5a.tar.gz) = 2249592

Re: MAINTAINER UPDATE: www/sope www/sogo

[Giovanni Bechis]

On 01/27/13 13:23, Sebastian Reitenbach wrote:
 Hi,
 
 attached are updates to SOPE/SOGo to 2.0.4.
 
 A list of bugfixes and changes can be found from the 
 annoucement mail here:
 https://inverse.ca/sogo/lists/arc/users/2013-01/msg00275.html
 
Imho this should be mentioned in commit message and in upgrade.html.

* sogo user is now a system user. For new installs, this means that 'su -
sogo' won't work anymore. Please use 'sudo -u sogo cmd' instead. If used in
scripts from cronjobs, 'requiretty' must be disabled in sudoers.

 so far lightly tested on amd64.
 
I will test it soon.
 Cheers
  Giovanni

Re: update www/sope www/sogo to 1.3.11

[Sebastian Reitenbach]

 
On Thursday, December 15, 2011 13:07 CET, Sebastian Reitenbach 
sebas...@l00-bugdead-prods.de wrote: 
 
 Hi,
 
 attached patches update www/sope and www/sogo from 1.3.9 to 1.3.11. 
 
 Here are the annoucements for the skipped 1.3.10 release and 1.3.11:
 http://www.sogo.nu/english/buzz/2011/article/sogo-1310-released.html
 http://www.sogo.nu/english/buzz/2011/article/sogo-1311-released.html
 
 www/sope now makes use of the new MSG_NOSIGNAL, therefore needs a recent 
 snapshot.
 So getting rid of this, and some other now unneeded patches.
 
 tested on i386.
 
 comments, or OK?
 
 btw, it could make use of the misc/memcached and devel/libmemcached I just 
 resent again to ports@ too.

this time, to ease review, both patches inlined, since libmemcached had a major 
bump, I'd like to add it at the same time together with libmemcached. sogo is 
the only dependant of libmemcached.

are they OK?

first www/sope:
=

Index: Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile18 Nov 2011 11:12:44 -  1.19
+++ Makefile15 Dec 2011 10:58:09 -
@@ -4,7 +4,7 @@
 COMMENT-mysql= SOPE MySQL adaptor
 COMMENT-postgres=  SOPE PostgreSQL adaptor
 
-VERSION =  1.3.9
+VERSION =  1.3.11
 DISTNAME = SOPE-${VERSION}
 PKGNAME-main = sope-${VERSION}
 PKGNAME-mysql =sope-mysql-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo18 Nov 2011 11:12:44 -  1.9
+++ distinfo15 Dec 2011 10:58:09 -
@@ -1,5 +1,5 @@
-MD5 (SOPE-1.3.9.tar.gz) = lypAxpyvC6/6aFNhQtAm3g==
-RMD160 (SOPE-1.3.9.tar.gz) = RptHBeoD5k3azDKu2FeFq6Zudyg=
-SHA1 (SOPE-1.3.9.tar.gz) = WmjnldTpZHmTk0Eiz2JFO7o/9dM=
-SHA256 (SOPE-1.3.9.tar.gz) = Xaq1MGAono7dmk7vAGME1DFpD15tX7xrSVlI69cviIM=
-SIZE (SOPE-1.3.9.tar.gz) = 2163269
+MD5 (SOPE-1.3.11.tar.gz) = Sb+DdUKSNRtfKHMLE/k66g==
+RMD160 (SOPE-1.3.11.tar.gz) = GJ8gnn+QrBlx/NvddFmUsAmwSfU=
+SHA1 (SOPE-1.3.11.tar.gz) = aTaHc9tY2HHEIWucUAv8GXlZbNk=
+SHA256 (SOPE-1.3.11.tar.gz) = v3SKw84umBf9qW+KtG5orWh2psdD3S8DgUpOgGQpLKA=
+SIZE (SOPE-1.3.11.tar.gz) = 2165236
Index: patches/patch-sope-core_NGStreams_NGActiveSocket_m
===
RCS file: patches/patch-sope-core_NGStreams_NGActiveSocket_m
diff -N patches/patch-sope-core_NGStreams_NGActiveSocket_m
--- patches/patch-sope-core_NGStreams_NGActiveSocket_m  18 Nov 2011 11:12:44 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sope-core_NGStreams_NGActiveSocket_m,v 1.1 2011/11/18 11:12:44 
sebastia Exp $
-
-MSG_NOSIGNAL is not POSIX, OpenBSD doesn't have it, so ignore it
-
 sope-core/NGStreams/NGActiveSocket.m.orig  Thu Oct  6 09:15:44 2011
-+++ sope-core/NGStreams/NGActiveSocket.m   Thu Oct  6 10:04:09 2011
-@@ -73,6 +73,10 @@
- #  define POLLRDNORM POLLIN
- #endif
- 
-+#ifndef MSG_NOSIGNAL
-+#define MSG_NOSIGNAL 0
-+#endif
-+
- @interface NGActiveSocket(PrivateMethods)
- 
- - (id)_initWithDescriptor:(int)_fd
Index: patches/patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m
===
RCS file: 
/cvs/ports/www/sope/patches/patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m,v
retrieving revision 1.1
diff -u -r1.1 patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m
--- patches/patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m  18 Nov 2011 11:12:44 
-  1.1
+++ patches/patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m  15 Dec 2011 10:58:09 
-
@@ -1,31 +0,0 @@
-$OpenBSD: patch-sope-gdl1_MySQL_NSNumber+MySQL4Val_m,v 1.1 2011/11/18 11:12:44 
sebastia Exp $
-
-fix bug when completing tasks with mysql backend, taken from
-http://mtn.inverse.ca/revision/diff/6eaf4a45ce4e94507a541be4594b94f2adc500a6/with/251b4565fb618249a9be38b2f6e86da9f39d8945
-
 sope-gdl1/MySQL/NSNumber+MySQL4Val.m.orig  Tue Nov  2 15:12:14 2010
-+++ sope-gdl1/MySQL/NSNumber+MySQL4Val.m   Sun Nov 13 21:26:22 2011
-@@ -77,7 +77,22 @@
-   if ((len = [_type length]) == 0)
- return [self stringValue];
-   if (len  4)
--return [self stringValue];
-+{
-+#if GNUSTEP_BASE_LIBRARY
-+/*
-+   on gstep-base -stringValue of bool's return YES or NO, which seems to
-+   be different on Cocoa and liBFoundation.
-+*/
-+{
-+  Class BoolClass = Nil;
-+  
-+  if (BoolClass == Nil) BoolClass = NSClassFromString(@NSBoolNumber);
-+  if ([self isKindOfClass:BoolClass])
-+  return [self boolValue] ? @1 : @0;
-+}
-+#endif
-+  return [self stringValue];
-+}
- 
-   c1 = [_type characterAtIndex:0];
-   switch (c1) {

And here is www/sogo:
==

Index: Makefile

UPDATE: www/sope www/sogo to 1.3.9

[Sebastian Reitenbach]

Hi,

I have this running since some time, and works well for me. Also tested with 
updated memcached/libmemcached just sent before. 
Some libraries of SOPE not needed by SOGo are gone. For the changes see the 
excerpt of the announce mail below. 
There is an additional patch on SOPE from upstream which fixes a bug with the 
MySQL backend, when marking tasks as done.

is it OK?

Sebastian


here an excerpt from the Announce mail:

=== Changes from the previous release ===

New Features

* possibility to specify which calendar is used when creating an event or a 
task (selected, personal, first enabled)
* possibility to specify if off-hours should be automatically added to the 
free-busy information
* new indicator in the link banner when a vacation message (auto-reply) is 
active
* new snooze function for events alarms in Web interface
* new Remember login checkbox on the login page
* authentication with SQL sources can now be performed on any database column

Enhancements

* added support for the CalDAV move operation
* phone numbers in the contacts web module are now links (tel:)
* revamp of the modules link banner (15-pixel taller)
* updated CKEditor to version 3.6.2
* updated unread and flagged icons in Webmail module
* new dependency on GNUstep 1.23

Bug Fixes

* fixed support for Apple iOS 5
* fixed handling of untagged IMAP responses
* fixed handling of commas in email addresses when composing a message
* fixed creation of clickable links for URLs surrounded by square brackets
* fixed behaviour of combo box for contacts categories
* fixed Swedish translation classes
* fixed bug when setting no ACL on a calendar



sogo-1.3.9.diff
Description: Binary data


sope-1.3.9.diff
Description: Binary data