Date: Thu, 16 Apr 2026 21:07:31 +0000 From: Marius Strobl <marius@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 75fdac0efa05 - main - www/sogo: Update to 5.12.7 Message-ID: <69e14f93.2480e.326f30e3@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/ports/commit/?id=75fdac0efa05286f720e51f9e694f40433df75a5 commit 75fdac0efa05286f720e51f9e694f40433df75a5 Author: Marius Strobl <marius@FreeBSD.org> AuthorDate: 2026-04-16 10:11:03 +0000 Commit: Marius Strobl <marius@FreeBSD.org> CommitDate: 2026-04-16 21:00:32 +0000 www/sogo: Update to 5.12.7 5.12.7 is a major release as it fixes 2 major vulnerabilities, 5.12.6 addresses another vulnerability. While at it: o pet portlint, o make the installed configuration file for sysutils/logrotate useable out of the box by replacing sogo:sogo with sogod:sogod, o make the installed sogo-backup.sh useable out of the box by: - correcting the path to sogo-tool, - changing the function definitions to match sh(1) syntax, saving a dependency on shells/bash, and - installing it as executable. Approved by: acm (maintainer) Security: https://www.sogo.nu/news/2026/sogo-v5126-released.html Security: https://www.sogo.nu/news/2026/sogo-v5127-released.html Differential Revision: https://reviews.freebsd.org/D56426 --- www/sogo/Makefile | 18 +++++++++++------- www/sogo/distinfo | 6 +++--- www/sogo/files/patch-Tests_Unit_GNUmakefile | 7 ++++--- www/sogo/files/patch-Tools_GNUmakefile.preamble | 4 ++-- www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m | 6 +++--- www/sogo/files/patch-general.make | 8 ++++---- www/sogo/pkg-plist | 17 +++++++++++++++++ 7 files changed, 44 insertions(+), 22 deletions(-) diff --git a/www/sogo/Makefile b/www/sogo/Makefile index db21be52a2c8..85abe3b7dda3 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -1,6 +1,5 @@ PORTNAME= sogo -PORTVERSION= 5.12.4 -PORTREVISION= 4 +PORTVERSION= 5.12.7 CATEGORIES= www gnustep MASTER_SITES= https://packages.sogo.nu/sources/ PKGNAMESUFFIX= -${FLAVOR} @@ -12,24 +11,22 @@ WWW= https://sogo.nu/ LICENSE= GPLv2 -FLAVORS= mysql mysqlactivesync pgsql pgsqlactivesync -FLAVOR?= ${FLAVORS:[1]} - LIB_DEPENDS= libmemcached.so:databases/libmemcached \ libcurl.so:ftp/curl \ libsodium.so:security/libsodium \ libzip.so:archivers/libzip \ libytnef.so:converters/ytnef - RUN_DEPENDS= zip:archivers/zip +FLAVORS= mysql mysqlactivesync pgsql pgsqlactivesync +FLAVOR?= ${FLAVORS:[1]} + USES= cpe gettext-runtime gnustep objc pkgconfig shebangfix ssl CPE_VENDOR= inverse USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}/sogo USE_RC_SUBR= sogod -SHEBANG_LANG= python SHEBANG_FILES= ${WRKSRC}/SoObjects/SOGo/gen-saml2-exceptions.py CONFIGURE_ARGS+= --disable-debug --disable-strip @@ -101,6 +98,12 @@ post-patch: @${GREP} -rlF '/etc/sogo' ${WRKSRC} \ | ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g' @${REINPLACE_CMD} -e 's|/usr/lib/GNUstep/|${LOCALBASE}/GNUstep/Local/Library|g' ${WRKSRC}/Apache/SOGo.conf + @${REINPLACE_CMD} -E -e 's|(su )sogo sogo|\1${USERS} ${GROUPS}|' \ + ${WRKSRC}/Scripts/logrotate + @${REINPLACE_CMD} -E -e 's|^(#!/bin/)bash|\1sh|; \ + s|^function ([^[:space:]]*)|\1\(\)|; \ + s|^(SOGO_TOOL=).*(sogo-tool)|\1${LOCALBASE}/GNUstep/Local/Tools/Admin/\2|' \ + ${WRKSRC}/Scripts/sogo-backup.sh @${REINPLACE_CMD} -e 's|srcBuffer\[stringLength\]|srcBuffer\[stringLength+1\]|g' \ ${WRKSRC}/SoObjects/SOGo/NSData+Crypto.m @${RM} ${WRKSRC}/Scripts/*.bak @@ -123,5 +126,6 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/cron-ealarms-notify.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/ ${INSTALL_DATA} ${FILESDIR}/cron-expire-autoreply.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/ cd ${WRKSRC}/Scripts && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + @${CHMOD} a+x ${STAGEDIR}${DATADIR}/sogo-backup.sh .include <bsd.port.post.mk> diff --git a/www/sogo/distinfo b/www/sogo/distinfo index 361fa84fc7d6..8beb0dbe1812 100644 --- a/www/sogo/distinfo +++ b/www/sogo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759979894 -SHA256 (SOGo-5.12.4.tar.gz) = d02d99d7f26967baf81b66516e7249658ef69836b1da03a28c5390ff3b6da31b -SIZE (SOGo-5.12.4.tar.gz) = 37846900 +TIMESTAMP = 1776280993 +SHA256 (SOGo-5.12.7.tar.gz) = c5c1efa8e13b52091cf527e2a6da14affb53ec49a07718d437b5e0d5bc4fdb0b +SIZE (SOGo-5.12.7.tar.gz) = 37847103 diff --git a/www/sogo/files/patch-Tests_Unit_GNUmakefile b/www/sogo/files/patch-Tests_Unit_GNUmakefile index 02c2a84baa88..d374cc5557cd 100644 --- a/www/sogo/files/patch-Tests_Unit_GNUmakefile +++ b/www/sogo/files/patch-Tests_Unit_GNUmakefile @@ -1,6 +1,6 @@ ---- Tests/Unit/GNUmakefile.orig 2020-10-07 15:11:26.000000000 +0000 -+++ Tests/Unit/GNUmakefile 2020-11-18 10:55:28.954241000 +0000 -@@ -43,8 +43,11 @@ +--- Tests/Unit/GNUmakefile.orig 2026-03-30 08:52:39 UTC ++++ Tests/Unit/GNUmakefile +@@ -46,8 +46,11 @@ ADDITIONAL_LIB_DIRS += \ -Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/ -I../../OpenChange ADDITIONAL_LIB_DIRS += \ @@ -13,3 +13,4 @@ + -L${LOCALBASE}/lib -lSaxObjC \ -Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj ADDITIONAL_LDFLAGS += -Wl,--no-as-needed + diff --git a/www/sogo/files/patch-Tools_GNUmakefile.preamble b/www/sogo/files/patch-Tools_GNUmakefile.preamble index 65bf13f26828..4aff393873be 100644 --- a/www/sogo/files/patch-Tools_GNUmakefile.preamble +++ b/www/sogo/files/patch-Tools_GNUmakefile.preamble @@ -1,9 +1,9 @@ ---- Tools/GNUmakefile.preamble.orig 2016-07-12 16:56:44 UTC +--- Tools/GNUmakefile.preamble.orig 2026-03-30 08:52:39 UTC +++ Tools/GNUmakefile.preamble @@ -13,4 +13,5 @@ ADDITIONAL_LIB_DIRS += \ -L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \ -L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \ -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \ -- -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb +- -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb -lWEExtensions + -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb \ + -lGDLAccess -lDOM -lSaxObjC -lNGLdap -lSBJson -lWEExtensions diff --git a/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m b/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m index 4669b54f81c6..0a26446b116c 100644 --- a/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m +++ b/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m @@ -1,6 +1,6 @@ ---- Tools/SOGoToolUpdateSecret.m 2024-03-27 16:51:10.990469000 -0500 -+++ Tools/SOGoToolUpdateSecret.m 2024-03-27 16:51:29.082221000 -0500 -@@ -266,8 +266,6 @@ +--- Tools/SOGoToolUpdateSecret.m.orig 2026-03-30 08:52:39 UTC ++++ Tools/SOGoToolUpdateSecret.m +@@ -266,8 +266,6 @@ - (BOOL) updateSecretFromEncryptedData: (NSString*) ne [source synchronize]; } } diff --git a/www/sogo/files/patch-general.make b/www/sogo/files/patch-general.make index d97256eeef86..c75a5cd5bbdf 100644 --- a/www/sogo/files/patch-general.make +++ b/www/sogo/files/patch-general.make @@ -1,6 +1,6 @@ ---- general.make.orig 2020-12-24 01:44:13.874889000 -0500 -+++ general.make 2020-12-24 01:44:34.714359000 -0500 -@@ -16,6 +16,7 @@ +--- general.make.orig 2026-03-30 08:52:40 UTC ++++ general.make +@@ -16,6 +16,7 @@ ADDITIONAL_OBJCFLAGS=-O0 ADDITIONAL_OBJCFLAGS=-O2 ifeq ($(debug),yes) ADDITIONAL_OBJCFLAGS=-O0 @@ -8,7 +8,7 @@ else ADDITIONAL_OBJCFLAGS=-Wuninitialized endif -@@ -23,5 +24,3 @@ +@@ -23,5 +24,3 @@ endif # information plus the compiler flags used; that can # be afterwards read with: # readelf -p .GCC.command.line /path/to/elf_file diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist index c463eef47754..3537d9e1b9c0 100644 --- a/www/sogo/pkg-plist +++ b/www/sogo/pkg-plist @@ -782,6 +782,7 @@ GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Finnish.lproj/Localiz GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/AdministrationUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -832,6 +833,7 @@ GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Finnish.lproj/Localizable GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -885,6 +887,7 @@ GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Finnish.lproj/Localizable.str GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/CommonUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -936,6 +939,7 @@ GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Finnish.lproj/Localizable.str GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Contacts.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -986,6 +990,7 @@ GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Finnish.lproj/Localizable.s GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/ContactsUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1037,6 +1042,7 @@ GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Finnish.lproj/Localiza GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailPartViewers.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1087,6 +1093,7 @@ GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Finnish.lproj/Localizable.strin GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1321,6 +1328,7 @@ GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Finnish.lproj/Localizable.str GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MailerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1389,6 +1397,8 @@ GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Galician.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/German.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Greek.lproj/Locale +GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Hebrew.lproj/Locale GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/MainUI.SOGo/Resources/Hungarian.lproj/Locale @@ -1482,6 +1492,7 @@ GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Finnish.lproj/Localizabl GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/PreferencesUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1532,6 +1543,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Finnish.lproj/Localizable. GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/French.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Galician.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/German.lproj/Localizable.strings +GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Greek.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Hebrew.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings @@ -1667,6 +1679,9 @@ GNUstep/Local/Library/SOGo/Templates/SOGoACLGalicianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLGermanAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLGermanModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLGermanRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLGreekAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLGreekModificationAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoACLGreekRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLHebrewAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLHebrewModificationAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoACLHebrewRemovalAdvisory.wox @@ -1782,6 +1797,8 @@ GNUstep/Local/Library/SOGo/Templates/SOGoFolderGalicianAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderGalicianRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderGermanAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderGermanRemovalAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderGreekAdditionAdvisory.wox +GNUstep/Local/Library/SOGo/Templates/SOGoFolderGreekRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderHebrewAdditionAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderHebrewRemovalAdvisory.wox GNUstep/Local/Library/SOGo/Templates/SOGoFolderHungarianAdditionAdvisory.woxhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e14f93.2480e.326f30e3>