www/sogo: Update to 5.10.0

- Now sogo installs additional useful script files at /usr/local/share/sogo
freebsd · Mar 27, 2024 · 590b0e0 · 590b0e0
1 parent de2bb07
commit 590b0e0
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 28 deletions.
diff --git a/devel/sope/Makefile b/devel/sope/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		sope
-PORTVERSION=		5.9.1
+PORTVERSION=		5.10.0
 CATEGORIES=		devel gnustep
 MASTER_SITES=		https://packages.sogo.nu/sources/
 DISTNAME=		SOPE-${PORTVERSION}
@@ -52,6 +52,7 @@ CPPFLAGS+=	-Wno-error=incompatible-function-pointer-types
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/sope-core/NGStreams/configure
+	@${REINPLACE_CMD} -e 's|LDAP_OPT_ON|1|g' ${WRKSRC}/sope-ldap/NGLdap/NGLdapConnection.m
 .for f in config.guess config.sub
 	@${CP} ${TEMPLATES}/$f ${WRKSRC}/sope-core/NGStreams/
 .endfor

diff --git a/devel/sope/distinfo b/devel/sope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704488341
-SHA256 (SOPE-5.9.1.tar.gz) = a1533837e9817252d0d2cbbfc3105c9b8e21c1c40fc144bba98a032a02e0ba38
-SIZE (SOPE-5.9.1.tar.gz) = 2300376
+TIMESTAMP = 1711569619
+SHA256 (SOPE-5.10.0.tar.gz) = 3649b418191254849d8e70215f9c72b953f993b936b143882c638add9000bd01
+SIZE (SOPE-5.10.0.tar.gz) = 2302765
diff --git a/devel/sope/files/patch-sope-mime_NGMime_NGMimeType.m b/devel/sope/files/patch-sope-mime_NGMime_NGMimeType.m
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		sogo
-PORTVERSION=		5.9.1
+PORTVERSION=		5.10.0
 CATEGORIES=		www gnustep
 MASTER_SITES=		https://packages.sogo.nu/sources/
 DISTNAME=		SOGo-${PORTVERSION}
@@ -73,6 +73,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/lib/GNUstep/|${LOCALBASE}/GNUstep/Local/Library|g' ${WRKSRC}/Apache/SOGo.conf
 	@${REINPLACE_CMD} -e 's|srcBuffer\[stringLength\]|srcBuffer\[stringLength+1\]|g' \
 		${WRKSRC}/SoObjects/SOGo/NSData+Crypto.m
+	@${RM} ${WRKSRC}/Scripts/*.bak
 
 post-patch-ACTIVESYNC-on:
 	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
@@ -83,12 +84,14 @@ do-configure:
 post-install:
 	${MKDIR} ${STAGEDIR}/var/spool/sogo
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/Scripts/sogo.conf ${STAGEDIR}${ETCDIR}/sogo.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo.conf ${STAGEDIR}${ETCDIR}/SOGo-Apache.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo-apple-ab.conf ${STAGEDIR}${ETCDIR}/SOGo-apple-ab.Apache.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/expire-autoreply.creds.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${FILESDIR}/ealarms-notify.creds.sample ${STAGEDIR}${ETCDIR}/
 	${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}
 
 .include <bsd.port.post.mk>
diff --git a/www/sogo/distinfo b/www/sogo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704488431
-SHA256 (SOGo-5.9.1.tar.gz) = df6ac305a99196ee66d60fda395af81d8da044e7f5c1b1603a51dc4a8edf8ac4
-SIZE (SOGo-5.9.1.tar.gz) = 34831391
+TIMESTAMP = 1711570787
+SHA256 (SOGo-5.10.0.tar.gz) = 4bae86af2fc926fc8718e22b6efecb0884e2529b133cfef8b0e63c68ff00a2c7
+SIZE (SOGo-5.10.0.tar.gz) = 34853173
diff --git a/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m b/www/sogo/files/patch-Tools_SOGoToolUpdateSecret.m
@@ -0,0 +1,11 @@
+--- 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 @@
+       [source synchronize];
+     }
+   }
+-
+-  return rc;
+ }
+
+ - (BOOL) updateToPlainData: (NSString*) oldSecret
diff --git a/www/sogo/files/pkg-message.in b/www/sogo/files/pkg-message.in
@@ -62,6 +62,8 @@ Then add the following lines to the root users' crontab (crontab -e):
 # The credentials file should contain the sieve admin credentials (username:passwd)
 0 0 * * * %%LOCALBASE%%/GNUstep/Local/Tools/Admin/cron-expire-autoreply
 
+Additional useful script files are located at %%DATADIR%%
+
 For more information about using SOGo, visit:
 http://www.sogo.nu/downloads/documentation.html
 EOM

diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
@@ -27,6 +27,7 @@ GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/NSString+DAV.
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/NSString+Utilities.h
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/NSURL+DAV.h
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/RTFHandler.h
+GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoAdmin.h
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoAuthenticator.h
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoBuild.h
 GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoCASSession.h
@@ -88,6 +89,7 @@ GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/Current
 GNUstep/Local/Library/Frameworks/SOGo.framework/sogo/SOGo
 GNUstep/Local/Library/Frameworks/SOGo.framework/sogo/libSOGo.so
 GNUstep/Local/Library/Headers/GDLContentStore/EOAdaptorChannel+GCS.h
+GNUstep/Local/Library/Headers/GDLContentStore/GCSAdminFolder.h
 GNUstep/Local/Library/Headers/GDLContentStore/GCSAlarmsFolder.h
 GNUstep/Local/Library/Headers/GDLContentStore/GCSChannelManager.h
 GNUstep/Local/Library/Headers/GDLContentStore/GCSContext.h
@@ -745,8 +747,8 @@ GNUstep/Local/Library/Libraries/sogo/libSOGo.so
 GNUstep/Local/Library/Libraries/sogo/libSOGo.so.5
 GNUstep/Local/Library/Libraries/sogo/libSOGo.so.%%VERSION%%
 GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.9
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.9.0
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.10
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.%%VERSION%%
 GNUstep/Local/Library/OCSTypeModels/appointment-oracle.ocs
 GNUstep/Local/Library/OCSTypeModels/appointment.ocs
 GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
@@ -1525,6 +1527,7 @@ GNUstep/Local/Library/SOGo/SchedulerUI.SOGo/stamp.make
 GNUstep/Local/Library/SOGo/Templates/AdministrationUI/UIxAdministration.wox
 GNUstep/Local/Library/SOGo/Templates/AdministrationUI/UIxAdministrationAclEditor.wox
 GNUstep/Local/Library/SOGo/Templates/AdministrationUI/UIxAdministrationFilterPanel.wox
+GNUstep/Local/Library/SOGo/Templates/AdministrationUI/UIxAdministrationMotd.wox
 GNUstep/Local/Library/SOGo/Templates/AdministrationUI/UIxThemePreview.wox
 GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailDeletion.wox
 GNUstep/Local/Library/SOGo/Templates/Appointments/SOGoAptMailICalReply.wox
@@ -1941,6 +1944,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/Administration.a
 GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/Administration.service.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/AdministrationAclController.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/AdministrationController.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/AdministrationMotdController.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Administration/ThemePreviewController.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common.js
 GNUstep/Local/Library/SOGo/WebServerResources/js/Common.js.map
@@ -2218,6 +2222,44 @@ GNUstep/Local/Tools/Admin/sogo-ealarms-notify
 GNUstep/Local/Tools/Admin/sogo-slapd-sockd
 GNUstep/Local/Tools/Admin/sogo-tool
 GNUstep/Local/Tools/Admin/sogod
+%%DATADIR%%/cas-proxy-validate.py
+%%DATADIR%%/fail2ban/sogo-filter.conf
+%%DATADIR%%/fail2ban/sogo-jail.local
+%%DATADIR%%/logrotate
+%%DATADIR%%/mysql-utf8mb4.sql
+%%DATADIR%%/sogo-backup.sh
+%%DATADIR%%/sogo-default
+%%DATADIR%%/sogo-init.d-redhat
+%%DATADIR%%/sogo-init.d-sles
+%%DATADIR%%/sogo-systemd-redhat
+%%DATADIR%%/sogo-systemd.conf
+%%DATADIR%%/sogo.conf
+%%DATADIR%%/sogo.cron
+%%DATADIR%%/sql-update-1.2.2_to_1.3.0-mysql.sh
+%%DATADIR%%/sql-update-1.2.2_to_1.3.0.sh
+%%DATADIR%%/sql-update-1.3.11_to_1.3.12-mysql.sh
+%%DATADIR%%/sql-update-1.3.11_to_1.3.12.sh
+%%DATADIR%%/sql-update-1.3.16_to_1.3.17-mysql.sh
+%%DATADIR%%/sql-update-1.3.16_to_1.3.17.sh
+%%DATADIR%%/sql-update-1.3.3_to_1.3.4-mysql.sh
+%%DATADIR%%/sql-update-1.3.3_to_1.3.4.sh
+%%DATADIR%%/sql-update-101_to_102.sh
+%%DATADIR%%/sql-update-2.0.4b_to_2.0.5-mysql.sh
+%%DATADIR%%/sql-update-2.2.17_to_2.3.0-mysql.sh
+%%DATADIR%%/sql-update-2.2.17_to_2.3.0.sh
+%%DATADIR%%/sql-update-20070724.sh
+%%DATADIR%%/sql-update-20070822.sh
+%%DATADIR%%/sql-update-20080303.sh
+%%DATADIR%%/sql-update-3.0.0-to-combined-mysql.sh
+%%DATADIR%%/sql-update-3.0.0-to-combined.sh
+%%DATADIR%%/sql-update-3.2.10_to_4.0.0-mysql.sh
+%%DATADIR%%/sql-update-3.2.10_to_4.0.0.sh
+%%DATADIR%%/sql-update-5.5.1_to_5.6.0.sh
+%%DATADIR%%/sql-update-5.8.4_to_5.9.0.sh
+%%DATADIR%%/standard-version-updater.js
+%%DATADIR%%/tmpwatch
+%%DATADIR%%/updates.php
+%%DATADIR%%/verify_translations.py
 @sample %%ETCDIR%%/sogo.conf.sample
 @dir GNUstep/Local/Library/SOGo/Appointments.SOGo/Resources/WebServer
 @dir GNUstep/Local/Library/SOGo/Mailer.SOGo/Resources/WebServer