8 files changed, 52 insertions, 42 deletions
diff --git a/office/SOGo/README.SBo b/office/SOGo/README.SBo
index 505492cfcc..4a21b1753f 100644
--- a/office/SOGo/README.SBo
+++ b/office/SOGo/README.SBo
@@ -12,11 +12,7 @@ happen upon just the right forum post that explains the situation.
 
 How do I configure this?
 ========================
-If you set INSTALL_DOCS=yes when you built this package you should have
-some documentation in PDF form in the doc folder for this package.
-
-If you opted out of installing the documentation or you want a more recent
-version of the documentation you can look here
+Documentation for this project can be found at
 https://sogo.nu/support.html#/documentation.
 
 Automatically starting SOGo
diff --git a/office/SOGo/SOGo.SlackBuild b/office/SOGo/SOGo.SlackBuild
index 4866cfa171..e6ec382fbe 100644
--- a/office/SOGo/SOGo.SlackBuild
+++ b/office/SOGo/SOGo.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for SOGo
 
-# Copyright 2018-2020 Chris Walker Kempner, TX
+# Copyright 2018-2022 Chris Walker Kempner, TX
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,16 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# 20220218 bkw: Modified by SlackBuilds.org:
-# - get the docs out of DOWNLOAD in the info file. they were getting
-#   downloaded (or failing to, due to user-agent checking on the
-#   server), but only installed if the user set an environment
-#   variable.
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=SOGo
-VERSION=${VERSION:-5.0.1}
+VERSION=${VERSION:-5.12.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -98,9 +92,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# For some strange reason SOGo is trying to link agains libSOGo.so
+# causing the build to fail; remove the -lSOGo flag from the link
+# options
+patch -p1 <  $CWD/patches/SOGo-libSOGo.patch
+
+# User wants ActiveSync; patch the config file to build ActiveSync
+#
+# WARNING: While you can enable it and it will run, you are supposed
+#          to have a license if you do so.
+ACTIVESYNC=${ACTIVESYNC:-no}
+if [ "$ACTIVESYNC" != "no" ]; then
+  patch -p1 < $CWD/patches/SOGo-ActiveSync.patch
+fi
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --enable-mfa \
   --enable-strip
 
 make
@@ -148,15 +157,6 @@ cp -a \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# 20220218 bkw: install PDF docs, if available.
-for i in \
-  SOGoInstallationGuide \
-  SOGoMozillaThunderbirdConfigurationGuide \
-  SOGoOutlookConnectorConfigurationGuide
-do
-  [ -e $CWD/$i.pdf ] && cat $CWD/$i.pdf > $PKG/usr/doc/$PRGNAM-$VERSION/$i.pdf
-done
-
 # Install backup script
 cat Scripts/sogo-backup.sh > $PKG/usr/doc/$PRGNAM-$VERSION/sogo-backup.sh
 chmod +x $PKG/usr/doc/$PRGNAM-$VERSION/sogo-backup.sh
diff --git a/office/SOGo/SOGo.info b/office/SOGo/SOGo.info
index 9cb4882bb9..db0dbcb03c 100644
--- a/office/SOGo/SOGo.info
+++ b/office/SOGo/SOGo.info
@@ -1,10 +1,10 @@
 PRGNAM="SOGo"
-VERSION="5.0.1"
+VERSION="5.12.1"
 HOMEPAGE="https://sogo.nu/"
-DOWNLOAD="https://packages.sogo.nu/sources/SOGo-5.0.1.tar.gz"
-MD5SUM="f7112b11568d68d58b32fb4ba64a8bbc"
+DOWNLOAD="https://packages.sogo.nu/sources/SOGo-5.12.1.tar.gz"
+MD5SUM="75a0eb739c62a497cf33f55df739c9b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SOPE libmemcached"
+REQUIRES="SOPE libmemcached oath-toolkit libwbxml ytnef"
 MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"
diff --git a/office/SOGo/docs.md5sums b/office/SOGo/docs.md5sums
deleted file mode 100644
index 8d5c113023..0000000000
--- a/office/SOGo/docs.md5sums
+++ /dev/null
@@ -1,3 +0,0 @@
-cf8bd301773b32d63b6efb9363d543f9  SOGoInstallationGuide.pdf
-b15b25c66158d68adc5acdb08355566d  SOGoMozillaThunderbirdConfigurationGuide.pdf
-812601272142416df7e939ccccbf330c  SOGoOutlookConnectorConfigurationGuide.pdf
diff --git a/office/SOGo/getdocs.sh b/office/SOGo/getdocs.sh
deleted file mode 100644
index cdbbc6513c..0000000000
--- a/office/SOGo/getdocs.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# 20220218 bkw: download the PDF docs for SOGo. upstream site does
-# user-agent checking, so we pretend to be an ancient version of
-# firefox.
-
-wget --user-agent 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)' \
-  https://sogo.nu/files/docs/SOGoInstallationGuide.pdf \
-  https://sogo.nu/files/docs/SOGoMozillaThunderbirdConfigurationGuide.pdf \
-  https://sogo.nu/files/docs/SOGoOutlookConnectorConfigurationGuide.pdf
-
-md5sum -c docs.md5sums
-exit $?
diff --git a/office/SOGo/patches/SOGo-ActiveSync.patch b/office/SOGo/patches/SOGo-ActiveSync.patch
new file mode 100644
index 0000000000..26a69e64f7
--- /dev/null
+++ b/office/SOGo/patches/SOGo-ActiveSync.patch
@@ -0,0 +1,11 @@
+diff -ur SOGo-5.1.1-old/GNUmakefile SOGo-5.1.1-new/GNUmakefile
+--- SOGo-5.1.1-old/GNUmakefile	2021-06-02 09:06:14.000000000 -0500
++++ SOGo-5.1.1-new/GNUmakefile	2021-08-18 21:10:49.127002801 -0500
+@@ -11,6 +11,7 @@
+ 	UI		\
+ 	Tools		\
+ 	Tests/Unit	\
++	ActiveSync	\
+ 
+ 
+ include $(GNUSTEP_MAKEFILES)/aggregate.make
diff --git a/office/SOGo/patches/SOGo-libSOGo.patch b/office/SOGo/patches/SOGo-libSOGo.patch
new file mode 100644
index 0000000000..300bc70b1e
--- /dev/null
+++ b/office/SOGo/patches/SOGo-libSOGo.patch
@@ -0,0 +1,12 @@
+diff -ruN SOGo-5.4.0/SoObjects/common.make SOGo-5.4.0-b/SoObjects/common.make
+--- SOGo-5.4.0/SoObjects/common.make	2021-12-16 11:03:37.000000000 -0600
++++ SOGo-5.4.0-b/SoObjects/common.make	2022-01-16 03:04:05.560313315 -0600
+@@ -18,7 +18,7 @@
+         -I../../SOPE
+ 
+ ADDITIONAL_LIB_DIRS += \
+-        -L../SOGo/SOGo.framework/Versions/Current/sogo/ -lSOGo \
++        -L../SOGo/SOGo.framework/Versions/Current/sogo/ \
+ 	-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
+ 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
+         -L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
diff --git a/office/SOGo/rc.sogod b/office/SOGo/rc.sogod
index 55ef759643..8ec1f7588e 100644
--- a/office/SOGo/rc.sogod
+++ b/office/SOGo/rc.sogod
@@ -11,6 +11,7 @@
 # These values are defaults. You can update the USER and PREFORK values
 # by making changes to /etc/sysconfig/sogo.
 USER=sogo
+GROUP=sogo
 PREFORK=3
 
 PIDFILE=/var/run/sogo/sogo.pid
@@ -27,6 +28,12 @@ if [ -z "$GNUSTEP_SYSTEM_ROOT" ]; then
   . ${GNUSTEP_MAKEFILES}/GNUstep.sh
 fi
 
+PIDDIR=$(dirname $PIDFILE)
+if [ ! -d "$PIDDIR" ]; then
+  mkdir -p ${PIDDIR}
+  chown ${USER}:${GROUP} ${PIDDIR}
+fi
+
 sogo_start() {
   pid="$(cat $PIDFILE 2> /dev/null)"
   if [ -n "$pid" ]; then