diff --git a/devel/sope/Makefile b/devel/sope/Makefile index 626b55d4d6fc..58bcfb53bab6 100644 --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -1,71 +1,72 @@ PORTNAME= sope -PORTVERSION= 5.9.1 +PORTVERSION= 5.10.0 CATEGORIES= devel gnustep MASTER_SITES= https://packages.sogo.nu/sources/ DISTNAME= SOPE-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= Extensive set of GNUstep web application frameworks WWW= https://sogo.nu/ LICENSE= LGPL20 LIB_DEPENDS= libxml2.so:textproc/libxml2 \ libmemcached.so:databases/libmemcached USES= gmake iconv gnustep USE_GNUSTEP= base build USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES} CONFIGURE_ARGS= --with-gnustep --disable-debug --disable-strip CONFIGURE_ENV+= CC="${CC}" LLD_UNSAFE= yes # PR 230608 CONFLICTS= sope2 SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} WRKSRC= ${WRKDIR}/SOPE OPTIONS_DEFINE= LDAP MYSQL PGSQL MEMCACHED OPTIONS_DEFAULT= LDAP PGSQL MEMCACHED OPTIONS_SUB= yes LDAP_DESC= Build with LDAP support MEMCACHED_DESC= Install memcached MYSQL_DESC= Build with MySQL support PGSQL_DESC= Build with PostgreSQL support LDAP_USES= ldap MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached MYSQL_USES= mysql PGSQL_USES= pgsql .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif 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 post-patch-LDAP-off: @${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure post-patch-MYSQL-off: @${REINPLACE_CMD} -e '/checkLinking "mysqlclient"/d' ${WRKSRC}/configure post-patch-PGSQL-off: @${REINPLACE_CMD} -e '/checkLinking "pq"/d' ${WRKSRC}/configure do-configure: cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS} .include diff --git a/devel/sope/distinfo b/devel/sope/distinfo index f8e28396154d..6a5d2bcf9c8a 100644 --- 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 deleted file mode 100644 index 5a47a3b68f31..000000000000 --- a/devel/sope/files/patch-sope-mime_NGMime_NGMimeType.m +++ /dev/null @@ -1,18 +0,0 @@ ---- sope-mime/NGMime/NGMimeType.m.orig 2023-06-20 10:08:44 UTC -+++ sope-mime/NGMime/NGMimeType.m -@@ -125,13 +125,13 @@ static Class NSStringClass = Nil; - encoding = NSKoreanEUCStringEncoding; - } - else if ([charset isEqualToString:@"big5"]) { -- encoding = NSBIG5StringEncoding; -+ encoding = NSBig5StringEncoding; - } - else if ([charset isEqualToString:@"iso-2022-jp"]) { - encoding = NSISO2022JPStringEncoding; - } - else if ([charset isEqualToString:@"gb2312"]) { -- encoding = NSGB2312StringEncoding; -+ encoding = NSChineseEUCStringEncoding; - } - else if ([charset isEqualToString:@"koi8-r"]) { - encoding = NSKOI8RStringEncoding; diff --git a/www/sogo/Makefile b/www/sogo/Makefile index 87f49ab9826d..2951ddb30318 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -1,94 +1,97 @@ PORTNAME= sogo -PORTVERSION= 5.9.1 +PORTVERSION= 5.10.0 CATEGORIES= www gnustep MASTER_SITES= https://packages.sogo.nu/sources/ DISTNAME= SOGo-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= Groupware server with a focus on scalability and open standards WWW= https://sogo.nu/ LICENSE= GPLv2 LIB_DEPENDS= libmemcached.so:databases/libmemcached \ libcurl.so:ftp/curl \ libsodium.so:security/libsodium \ libzip.so:archivers/libzip \ libDOM.so:devel/sope \ libytnef.so:converters/ytnef RUN_DEPENDS= zip:archivers/zip 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 CONFLICTS?= sogo[2-4]-activesync sogo[2-4] OPTIONS_DEFAULT= MFA OPTIONS_DEFINE= ACTIVESYNC MFA SAML2 OPTIONS_SUB= yes ACTIVESYNC_DESC= Enable support for ActiveSync protocol MFA_DESC= Enable support for multi-factor authentication SAML2_DESC= Enable support for SAML2 authentication ACTIVESYNC_LIB_DEPENDS= libwbxml2.so:textproc/wbxml2 MFA_LIB_DEPENDS= liboath.so:security/oath-toolkit MFA_CONFIGURE_ON= --enable-mfa SAML2_LIB_DEPENDS= liblasso.so:security/lasso SAML2_USES= python:build gnome SAML2_USE= gnome=glib20 SAML2_CONFIGURE_ON= --enable-saml2 USERS= sogod GROUPS= sogod SUB_FILES+= pkg-message SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) CPPFLAGS+= -Wno-error=int-conversion .endif .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CPPFLAGS+= -Wno-error=incompatible-function-pointer-types .endif 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 '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 do-configure: cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS} 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 diff --git a/www/sogo/distinfo b/www/sogo/distinfo index 746ff812ece0..a64bd50f72f1 100644 --- 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 new file mode 100644 index 000000000000..4669b54f81c6 --- /dev/null +++ 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 index 9fe6ca68eedf..3daafeb21839 100644 --- a/www/sogo/files/pkg-message.in +++ b/www/sogo/files/pkg-message.in @@ -1,69 +1,71 @@ [ { type: install message: <