Hi,
Am Montag, April 30, 2018 15:20 CEST, Landry Breuil <lan...@openbsd.org>
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 -0000 1.71
+++ sope/Makefile 2 May 2018 20:27:11 -0000
@@ -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 <sebas...@openbsd.org>
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 -0000 1.42
+++ sope/distinfo 2 May 2018 20:27:11 -0000
@@ -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 -0000 1.74
+++ sogo/Makefile 2 May 2018 20:27:11 -0000
@@ -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 += SOGo 4.1
-SHARED_LIBS += SOGoUI 2.1
+SHARED_LIBS += NGCards 3.1
+SHARED_LIBS += SOGo 5.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 <sebas...@openbsd.org>
@@ -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 \
- ${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/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
+ ${WRKSRC}/Scripts/${_s} ${PREFIX}/share/doc/sogo/${_s}
+.endfor
do-test:
cd ${WRKSRC}/Tests/Integration && ${MAKE_PROGRAM} && ./teststrings.sh
Index: sogo/distinfo
===================================================================
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.40
diff -u -r1.40 distinfo
--- sogo/distinfo 7 Jul 2017 10:41:05 -0000 1.40
+++ sogo/distinfo 2 May 2018 20:27:11 -0000
@@ -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: sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh
===================================================================
RCS file:
/cvs/ports/www/sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh,v
retrieving revision 1.1
diff -u -r1.1 patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh
--- sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh 31 Mar
2012 17:02:23 -0000 1.1
+++ sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh 2 May
2018 20:27:11 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-Scripts_sql-update-1_3_11_to_1_3_12-mysql_sh,v 1.1 2012/03/31
17:02:23 sebastia Exp $
-
-make script sh compatible
-
---- Scripts/sql-update-1.3.11_to_1.3.12-mysql.sh.orig Wed Feb 15 09:06:10 2012
-+++ Scripts/sql-update-1.3.11_to_1.3.12-mysql.sh Wed Feb 15 09:07:53 2012
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- # converting c_content to text is not needed on mysql as it is already big
enough (mediumtext)
-
- # this script only works with MySQL
-@@ -7,9 +7,9 @@ defaultusername=$USER
- defaulthostname=localhost
- defaultdatabase=$USER
-
--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
-@@ -26,7 +26,7 @@ then
- database=$defaultdatabase
- fi
-
--SESSIONTBL=$(su - sogo -c "defaults read sogod OCSSessionsFolderURL" | awk
-F/ '{print $NF}')
-+SESSIONTBL=$(defaults read sogod OCSSessionsFolderURL | awk -F/ '{print $NF}')
- if [ -z "$SESSIONTBL" ]; then
- echo "Failed to obtain session table name" >&2
- exit 1
Index: sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12_sh
===================================================================
RCS file:
/cvs/ports/www/sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12_sh,v
retrieving revision 1.1
diff -u -r1.1 patch-Scripts_sql-update-1_3_11_to_1_3_12_sh
--- sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12_sh 31 Mar 2012
17:02:23 -0000 1.1
+++ sogo/patches/patch-Scripts_sql-update-1_3_11_to_1_3_12_sh 2 May 2018
20:27:11 -0000
@@ -1,43 +0,0 @@
-$OpenBSD: patch-Scripts_sql-update-1_3_11_to_1_3_12_sh,v 1.1 2012/03/31
17:02:23 sebastia Exp $
-
-make script sh compatible
-
---- Scripts/sql-update-1.3.11_to_1.3.12.sh.orig Wed Feb 15 08:50:28 2012
-+++ Scripts/sql-update-1.3.11_to_1.3.12.sh Wed Feb 15 09:04:20 2012
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- # This script only works with PostgreSQL
-
-@@ -7,9 +7,9 @@ defaulthostname=localhost
- defaultdatabase=$USER
- indextable=sogo_folder_info
-
--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
-@@ -26,7 +26,7 @@ fi
-
- sqlscript=""
-
--function convVCtoText() {
-+convVCtoText() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table ALTER COLUMN c_content TYPE
TEXT;\\n\"`";
-@@ -45,7 +45,7 @@ done
- echo "$sqlscript" | psql -q -e -U $username -h $hostname $database
-
- echo "Step 2 - Fix primary key for the sogo_sessions table" >&2
--SESSIONTBL=$(su - sogo -c "defaults read sogod OCSSessionsFolderURL" | awk
-F/ '{print $NF}')
-+SESSIONTBL=$(defaults read sogod OCSSessionsFolderURL | awk -F/ '{print $NF}')
- if [ -z "$SESSIONTBL" ]; then
- echo "Failed to obtain session table name" >&2
- exit 1
Index: sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh
===================================================================
RCS file:
/cvs/ports/www/sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh,v
retrieving revision 1.1
diff -u -r1.1 patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh
--- sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh 17 Aug
2012 09:59:08 -0000 1.1
+++ sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh 2 May
2018 20:27:11 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-Scripts_sql-update-1_3_16_to_1_3_17-mysql_sh,v 1.1 2012/08/17
09:59:08 sebastia Exp $
---- Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh.orig Thu Jul 26 19:47:19 2012
-+++ Scripts/sql-update-1.3.16_to_1.3.17-mysql.sh Thu Jul 26 19:49:35 2012
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
-
-@@ -13,15 +13,15 @@ set -e
- defaultusername=$USER
- defaulthostname=127.0.0.1
- defaultdatabase=$USER
--indextable=$(su - sogo -c "defaults read sogod OCSFolderInfoURL" | awk -F/
'{print $NF}')
-+indextable=$(defaults read sogod OCSFolderInfoURL | awk -F/ '{print $NF}')
- 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
-@@ -40,7 +40,7 @@ then
-
- sqlscript=""
-
--function growVC() {
-+growVC() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table MODIFY c_cycleinfo mediumtext;\\n\"`";
Index: sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17_sh
===================================================================
RCS file:
/cvs/ports/www/sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17_sh,v
retrieving revision 1.1
diff -u -r1.1 patch-Scripts_sql-update-1_3_16_to_1_3_17_sh
--- sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17_sh 17 Aug 2012
09:59:08 -0000 1.1
+++ sogo/patches/patch-Scripts_sql-update-1_3_16_to_1_3_17_sh 2 May 2018
20:27:11 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-Scripts_sql-update-1_3_16_to_1_3_17_sh,v 1.1 2012/08/17
09:59:08 sebastia Exp $
---- Scripts/sql-update-1.3.16_to_1.3.17.sh.orig Thu Jul 26 19:45:02 2012
-+++ Scripts/sql-update-1.3.16_to_1.3.17.sh Thu Jul 26 19:46:21 2012
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
- # This script only works with PostgreSQL
-@@ -11,15 +11,15 @@ defaultusername=$USER
- defaulthostname=localhost
- defaultdatabase=$USER
- #indextable=sogo_folder_info
--indextable=$(su - sogo -c "defaults read sogod OCSFolderInfoURL" | awk -F/
'{print $NF}')
-+indextable=$(defaults read sogod OCSFolderInfoURL | awk -F/ '{print $NF}')
- 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
-@@ -36,7 +36,7 @@ fi
-
- sqlscript=""
-
--function growVC() {
-+growVC() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table ALTER COLUMN c_cycleinfo TYPE
VARCHAR(1000000);\\n\"`";
Index: sogo/patches/patch-Tests_Unit_GNUmakefile
===================================================================
RCS file: /cvs/ports/www/sogo/patches/patch-Tests_Unit_GNUmakefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Tests_Unit_GNUmakefile
--- sogo/patches/patch-Tests_Unit_GNUmakefile 15 Jun 2016 14:03:20 -0000
1.6
+++ sogo/patches/patch-Tests_Unit_GNUmakefile 2 May 2018 20:27:11 -0000
@@ -1,8 +1,9 @@
$OpenBSD: patch-Tests_Unit_GNUmakefile,v 1.6 2016/06/15 14:03:20 sebastia Exp $
Do not hardcode libobjc library name, ask GNUstep what to use.
---- Tests/Unit/GNUmakefile.orig Fri Jun 10 16:03:21 2016
-+++ Tests/Unit/GNUmakefile Wed Jun 15 15:47:00 2016
-@@ -43,8 +43,8 @@ $(TEST_TOOL)_CPPFLAGS += \
+Index: Tests/Unit/GNUmakefile
+--- Tests/Unit/GNUmakefile.orig
++++ Tests/Unit/GNUmakefile
+@@ -41,8 +41,8 @@ $(TEST_TOOL)_CPPFLAGS += \
-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/
-I../../OpenChange
ADDITIONAL_LIB_DIRS += \
Index: sogo/patches/patch-UI_MailPartViewers_GNUmakefile
===================================================================
RCS file: /cvs/ports/www/sogo/patches/patch-UI_MailPartViewers_GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 patch-UI_MailPartViewers_GNUmakefile
--- sogo/patches/patch-UI_MailPartViewers_GNUmakefile 3 Jan 2014 18:39:51
-0000 1.2
+++ sogo/patches/patch-UI_MailPartViewers_GNUmakefile 2 May 2018 20:27:11
-0000
@@ -2,9 +2,10 @@
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 += \
+Index: UI/MailPartViewers/GNUmakefile
+--- UI/MailPartViewers/GNUmakefile.orig
++++ UI/MailPartViewers/GNUmakefile
+@@ -26,7 +26,25 @@ MailPartViewers_OBJC_FILES += \
UIxMailPartMessageViewer.m \
UIxMailPartICalViewer.m \
\
Index: sogo/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.36
diff -u -r1.36 PLIST
--- sogo/pkg/PLIST 7 Jul 2017 10:41:05 -0000 1.36
+++ sogo/pkg/PLIST 2 May 2018 20:27:11 -0000
@@ -610,6 +610,8 @@
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Croatian.lproj/
@@ -685,6 +687,8 @@
lib/GNUstep/SOGo/Appointments.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/Appointments.SOGo/Resources/Croatian.lproj/
@@ -764,6 +768,8 @@
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Croatian.lproj/
@@ -839,6 +845,8 @@
lib/GNUstep/SOGo/Contacts.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/Contacts.SOGo/Resources/Croatian.lproj/
@@ -913,6 +921,8 @@
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Croatian.lproj/
@@ -989,6 +999,8 @@
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Croatian.lproj/
@@ -1063,6 +1075,8 @@
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/ChineseChina.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/Mailer.SOGo/Resources/Croatian.lproj/
@@ -1124,6 +1138,12 @@
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.wod
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html
lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod
@@ -1336,6 +1356,8 @@
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Croatian.lproj/
@@ -1418,6 +1440,9 @@
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/Locale
lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
@@ -1532,6 +1557,8 @@
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Croatian.lproj/
@@ -1606,6 +1633,8 @@
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseTaiwan.lproj/
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Croatian.lproj/
@@ -1705,6 +1734,7 @@
lib/GNUstep/SOGo/Templates/ContactsUI/UIxListView.wox
lib/GNUstep/SOGo/Templates/MailPartViewers/
lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartAlternativeViewer.wox
+lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartEncryptedViewer.wox
lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartExternalHTMLViewer.wox
lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox
lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -1754,6 +1784,9 @@
lib/GNUstep/SOGo/Templates/SOGoACLCatalanAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLCatalanModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLCatalanRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanModificationAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanRemovalAdvisory.wox
@@ -1849,6 +1882,8 @@
lib/GNUstep/SOGo/Templates/SOGoFolderBrazilianPortugueseRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderCatalanAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderCatalanRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderChineseChinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderChineseChinaRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderChineseTaiwanAdditionAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderChineseTaiwanRemovalAdvisory.wox
lib/GNUstep/SOGo/Templates/SOGoFolderCroatianAdditionAdvisory.wox
@@ -2069,6 +2104,8 @@
lib/GNUstep/SOGo/WebServerResources/fonts/MaterialIcons-Regular.woff2
lib/GNUstep/SOGo/WebServerResources/img/
lib/GNUstep/SOGo/WebServerResources/img/cardboard-transp.png
+lib/GNUstep/SOGo/WebServerResources/img/certificate-off.svg
+lib/GNUstep/SOGo/WebServerResources/img/certificate.svg
lib/GNUstep/SOGo/WebServerResources/img/felt-transp.png
lib/GNUstep/SOGo/WebServerResources/img/ic_person_grey_24px.svg
lib/GNUstep/SOGo/WebServerResources/img/inverse.png
@@ -2107,6 +2144,7 @@
lib/GNUstep/SOGo/WebServerResources/js/Common/navController.js
lib/GNUstep/SOGo/WebServerResources/js/Common/range.filter.js
lib/GNUstep/SOGo/WebServerResources/js/Common/sgAvatarImage.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Common/sgBlockToggle.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Common/sgCheckmark.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Common/sgColorPicker.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Common/sgCompile.directive.js
@@ -2196,12 +2234,15 @@
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarScrollView.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCategoryStylesheet.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgNowLine.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/theme.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/
lib/GNUstep/SOGo/WebServerResources/js/vendor/FileSaver.min.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/FileSaver.min.js.map
@@ -2252,11 +2293,13 @@
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/eu.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/fi.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/fr.js
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/he.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/hr.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/hu.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/is.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/it.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/lt.js
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/lv.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/mk.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/nb.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/nl.js
@@ -2287,6 +2330,7 @@
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/base64image/dialogs/base64image.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/colordialog.css
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/colordialog.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/dialog/
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -2314,6 +2358,7 @@
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/LICENSE.md
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/dialog.css
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/options.js
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/toolbar.css
lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/table/
@@ -2391,14 +2436,12 @@
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/sogo/
share/doc/sogo/cas-proxy-validate.py
-share/doc/sogo/sql-update-1.3.11_to_1.3.12-mysql.sh
-share/doc/sogo/sql-update-1.3.11_to_1.3.12-postgres.sh
-share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh
-share/doc/sogo/sql-update-1.3.16_to_1.3.17-postgres.sh
share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
-share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
+share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh
share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh
share/doc/sogo/sql-update-3.0.0-to-combined.sh
+share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
+share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh
share/doc/sogo/updates.php
@mode 750
@owner _sogo
@@ -2410,3 +2453,4 @@
@owner
@group
@rcscript ${RCDIR}/sogod
+
Index: sogo/pkg/README
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.21
diff -u -r1.21 README
--- sogo/pkg/README 5 Jul 2017 21:11:50 -0000 1.21
+++ sogo/pkg/README 2 May 2018 20:27:11 -0000
@@ -218,45 +218,6 @@
# mkdir -p ${VARBASE}/www/lib/sogo
# cp -R ${TRUEPREFIX}/lib/GNUstep/SOGo/WebServerResources
${VARBASE}/www/lib/sogo/www
-Upgrade SOGo from < 1.3.5
-=========================
-Since version 1.3.5, SOGo requires to have a OCSSessionsFolderURL default set,
-which you need to create. For example run the following command as user _sogo:
-
-$ defaults write sogod OCSSessionsFolderURL \
-postgresql://_sogo:sogo@localhost:5432/sogo/sogo_sessions_folder
-
-Upgrade SOGo from < 1.3.12
-==========================
-With version 1.3.12, the database schema got some enhancements, for example
-to permit syncs of cards with big photos in them.
-
-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 ask you for the database credentials.
-
-# su _sogo -c
"${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.11_to_1.3.12-postgres.sh"
-# su _sogo -c
"${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.11_to_1.3.12-mysql.sh"
-
-Upgrade SOGo from < 1.3.16
-==========================
-New password schemes were introduced. You may want to set the
-userPasswordAlgorithm default, i.e.:
-
-# su _sogo "defaults write sogod userPasswordAlgorithm ssha"
-
-Upgrade SOGo from < 1.3.17
-==========================
-With version 1.3.17, the "cycle info" field of the calendar tables
-was enlarged.
-
-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 ask you for the database credentials.
-
-# su _sogo
"${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-postgres.sh"
-# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh"
-
Upgrade SOGo from < 2.1.1
=========================
With version 2.1.0, the WOPort default changed from listening on *:20000
@@ -269,11 +230,10 @@
==========================
With version 2.3.0, the database schema needs to be extended.
-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 ask you for the database credentials.
+Run one of the following scripts as the SOGo system user _sogo. Choose the
+script based on your database backend. The scripts will ask you for the
database credentials.
-# su _sogo
"${TRUEPREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh"
+# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh"
# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh"
Upgrade SOGo from < 3.0.0
@@ -282,7 +242,18 @@
9-table model. The conversion is not required, and you should only do it
when you are sure you know what you are doing.
The scripts require you have configured sogo via /etc/sogo/sogo.conf,
-as well as they have to run with bash. Use at your own risk.
+as well as they have to run with bash. You might install bash manually.
+Use at your own risk.
# 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"
+
+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. Choose the
+based on your database backend. The scripts will ask you for the database
credentials.
+
+# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh"
+# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh"
> thanks!
>
