www/sogo: Update to 5.8.0

- Fix build on armv7 arm64
- www/sogo-activesync: Fix issues on login time
- Makefile clean up
PR:		267607 267694 268591 268592
Reported by:	Robert Clausecker <fuz at fuz.su>, Martin Waschbüsch <martin at waschbuesch.de>, bugreporter01 at freebox.dk
2023Q2
Martin Waschbüsch 2023-01-12 16:01:06 -05:00 committed by Jose Alonso Cardenas Marquez
parent 088af071eb
commit 8bdd13c7aa
5 changed files with 57 additions and 49 deletions

View File

@ -1,5 +1,5 @@
PORTNAME= sope
PORTVERSION= 5.7.1
PORTVERSION= 5.8.0
CATEGORIES= devel gnustep
MASTER_SITES= https://packages.sogo.nu/sources/
DISTNAME= SOPE-${PORTVERSION}
@ -10,11 +10,23 @@ WWW= https://sogo.nu/
LICENSE= LGPL20
BROKEN_aarch64= fails to build: bundle.make:301: STXSaxDriver.sax/Resources/Info-gnustep.plist] Abort trap (core dumped)
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
@ -22,41 +34,31 @@ 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
MEMCACHED_DESC= Install memcached
USES= gmake iconv gnustep
USE_GNUSTEP= base build
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
LLD_UNSAFE= yes # PR 230608
CONFLICTS= sope2 sope4
SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
CONFIGURE_ARGS= --with-gnustep --disable-debug --disable-strip
CONFIGURE_ENV+= CC="${CC}"
LDAP_USE= OPENLDAP=client
PGSQL_USES= pgsql
MYSQL_USES= mysql
MEMCACHED_RUN_DEPENDS= ${LOCALBASE}/bin/memcached:databases/memcached
MYSQL_USES= mysql
PGSQL_USES= pgsql
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/sope-core/NGStreams/configure
.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-PGSQL-off:
@${REINPLACE_CMD} -e '/checkLinking "pq"/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}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1667194167
SHA256 (SOPE-5.7.1.tar.gz) = 63e04087d572d36be946311c23ecc70b8827d4fda957163c8adb2fd31b77d10e
SIZE (SOPE-5.7.1.tar.gz) = 2282567
TIMESTAMP = 1669945739
SHA256 (SOPE-5.8.0.tar.gz) = 26e311dccd71b743bd223d2e2fcae3572a3124ac76594320d7a951b26b3e96b0
SIZE (SOPE-5.8.0.tar.gz) = 2282661

View File

@ -1,5 +1,5 @@
PORTNAME= sogo
PORTVERSION= 5.7.1
PORTVERSION= 5.8.0
CATEGORIES= www gnustep
MASTER_SITES= https://packages.sogo.nu/sources/
DISTNAME= SOGo-${PORTVERSION}
@ -19,6 +19,19 @@ LIB_DEPENDS= libmemcached.so:databases/libmemcached \
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
@ -27,39 +40,29 @@ 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
ACTIVESYNC_LIB_DEPENDS= libwbxml2.so:textproc/wbxml2
MFA_LIB_DEPENDS= liboath.so:security/oath-toolkit
SAML2_LIB_DEPENDS= liblasso.so:security/lasso
MFA_CONFIGURE_ON= --enable-mfa
SAML2_CONFIGURE_ON= --enable-saml2
USERS= sogod
GROUPS= sogod
USES= cpe gettext-runtime gnustep objc pkgconfig shebangfix ssl
CPE_VENDOR= inverse
USE_GNUSTEP= base build
USE_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}/sogo
SHEBANG_LANG= python
SHEBANG_FILES= ${WRKSRC}/SoObjects/SOGo/gen-saml2-exceptions.py
CONFLICTS?= sogo[2-4]-activesync sogo[2-4]
USE_RC_SUBR= sogod
SUB_FILES+= pkg-message
SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
CONFIGURE_ARGS+= --disable-debug --disable-strip
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
post-patch-ACTIVESYNC-on:
@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1667194214
SHA256 (SOGo-5.7.1.tar.gz) = c58246adf8520f15a3c072603f8e8d0aad057666d66b0f74073f5116de06095e
SIZE (SOGo-5.7.1.tar.gz) = 34880002
TIMESTAMP = 1669946017
SHA256 (SOGo-5.8.0.tar.gz) = 0031e30f48b523ec5c015f5f3fe90184e8a9abdfa3efe3ab08fd980ab7173380
SIZE (SOGo-5.8.0.tar.gz) = 34926380

View File

@ -6,6 +6,7 @@ GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/DOMNode+SOGo.
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/EOBitmaskQualifier.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/EOQualifier+SOGoCacheObject.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/GCSSpecialQueries+SOGoCacheObject.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/JWT.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/LDAPSource.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/LDAPSourceSchema.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/NSArray+DAV.h
@ -38,6 +39,7 @@ GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoDAVAuthen
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoDateFormatter.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoDefaultsSource.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoDomainDefaults.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoEmptyAuthenticator.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoFolder.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoGCSFolder.h
GNUstep/Local/Library/Frameworks/SOGo.framework/Versions/5/Headers/SOGoLDAPDefaults.h
@ -739,8 +741,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.7
GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.7.0
GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.8
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
@ -1954,6 +1956,7 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgPlaceholder.directive.
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgQrCode.directive.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgResetOnDisabled.directive.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgRippleClick.directive.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgRippleClick.service.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgSearch.directive.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgSelectOnly.directive.js
GNUstep/Local/Library/SOGo/WebServerResources/js/Common/sgSubscribe.directive.js