From nobody Thu Jan 12 21:07:08 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NtHDX5PpQz2qxKm; Thu, 12 Jan 2023 21:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NtHDX4xkpz4Y9s; Thu, 12 Jan 2023 21:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673557628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MaB4HU5q3wlMK5R75KTEcBf7ksl82GM5t2uoexuv18=; b=KIMtGuXMVFvmBfLY0AvCxm5DaOLepBGlIb6O7xWD61wZ+jYx0gCEikZqhVQ52q1Gnsc8QH +T9cKGqb6n/BBkhI1X1IHew6Ioy04J6nQyBC4f8bxMcwymxBoVr+6tLvxCsSATNQDTAOKn PDvZoXerF/JK3EjPrXiWKgDFx/Ep3p+2vPjROWiFGKCXD+AnaDQzf6WZJh2L0Ove2H0QIv 0p4RmOKdgsjoTb/CpAHI/ixpXuGQnJ2NSMrB4FaP6RbsAE9zbGqOCLAi6g96ui6jWNmi+S pi+krHkowx9PZJaa/Jx3+f7ec/SWsJBvY4YdFbz2PsBcQC1dnfLqD7xiqDkY+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673557628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1MaB4HU5q3wlMK5R75KTEcBf7ksl82GM5t2uoexuv18=; b=JfsrGIvGPwTUjeE0IX9IB3yrmaD4PmrvwE4pSXNvuvXkg3O67131fIJs7NnS9g2+iO0jAo mHRHhOoqh3pQcp64CfLKcZ61nQWtddsF1YzGipA8sGPnjrOgOaqSWLT+j4ilszEHT9GuuD MkNBQIBYFPQ9vcM71FD4MgyMYEEj5kBaZLf0/y/Td5f1C7OefcqgUnUcFlvvhHWvJJVATQ T/wFJ5xH+VT6/0sDpSo4b5ilGJ7TFyyCE0VPVxjLu5S/wKTmkietTCca4Ey+GFOSTSa38D wMiAHeBipIi76w4BIflmflWUD23yrVyT3lchwl8a/Q4fwSdFuclEMN23JGkRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673557628; a=rsa-sha256; cv=none; b=QqYTTjJE1lEKaZ30cPd1pVw0PFA90yvsXSwcy9aqU1++9mKxt+9qFPU9ejLWOBExJos7PF ZemqxJ/6siDZzXw+1ivhA71w4qyW702Vc7qFNfx0Zy+i7V5oTznX7D7MMc9k/Z+YXAB7+D JEyBDDd8aWbjeL6Ou4MRU79GpL4kppruq8/nbVYvF1+5yR19PSqgKyfEanMIXeT8LKvkdZ 2hva/KnpvgYYiDz6toP5e9dJhs/6M8ZUXJh75SprCSy9F4fZG1lJ7HXMkGctWw4p9vAplE CllDMHswrYiTvREa4/t3yF0rS/W2huOhKfIDGYPv++HXi6VttNV6uW8WaL6wAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NtHDX40BLzjFB; Thu, 12 Jan 2023 21:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30CL78lR051783; Thu, 12 Jan 2023 21:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30CL78j8051782; Thu, 12 Jan 2023 21:07:08 GMT (envelope-from git) Date: Thu, 12 Jan 2023 21:07:08 GMT Message-Id: <202301122107.30CL78j8051782@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 8bdd13c7aae0 - main - www/sogo: Update to 5.8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8bdd13c7aae095b1710dd0d95c1f6dec71528665 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=8bdd13c7aae095b1710dd0d95c1f6dec71528665 commit 8bdd13c7aae095b1710dd0d95c1f6dec71528665 Author: Martin Waschbüsch AuthorDate: 2023-01-12 21:01:06 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-01-12 21:01:06 +0000 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 , Martin Waschbüsch , bugreporter01 at freebox.dk --- devel/sope/Makefile | 46 ++++++++++++++++++++++++---------------------- devel/sope/distinfo | 6 +++--- www/sogo/Makefile | 39 +++++++++++++++++++++------------------ www/sogo/distinfo | 6 +++--- www/sogo/pkg-plist | 7 +++++-- 5 files changed, 56 insertions(+), 48 deletions(-) diff --git a/devel/sope/Makefile b/devel/sope/Makefile index 3edc489c237b..78ee0b05b7ee 100644 --- a/devel/sope/Makefile +++ b/devel/sope/Makefile @@ -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,53 +10,55 @@ 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 -WRKSRC= ${WRKDIR}/SOPE - -OPTIONS_DEFINE= LDAP MYSQL PGSQL MEMCACHED -OPTIONS_DEFAULT= LDAP PGSQL MEMCACHED -OPTIONS_SUB= yes - -LDAP_DESC= Build with LDAP support -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} + +CONFIGURE_ARGS= --with-gnustep --disable-debug --disable-strip +CONFIGURE_ENV+= CC="${CC}" + LLD_UNSAFE= yes # PR 230608 -CONFLICTS= sope2 sope4 +CONFLICTS= sope2 SUB_LIST+= GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \ GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES} -CONFIGURE_ARGS= --with-gnustep --disable-debug --disable-strip -CONFIGURE_ENV+= CC="${CC}" +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_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} diff --git a/devel/sope/distinfo b/devel/sope/distinfo index 63afe57cefe0..4fff16fbcc45 100644 --- a/devel/sope/distinfo +++ b/devel/sope/distinfo @@ -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 diff --git a/www/sogo/Makefile b/www/sogo/Makefile index d3d577be7b1d..5ce407f9f295 100644 --- a/www/sogo/Makefile +++ b/www/sogo/Makefile @@ -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 -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_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 -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 diff --git a/www/sogo/distinfo b/www/sogo/distinfo index 7b45826a4b72..93963ad1bdb3 100644 --- a/www/sogo/distinfo +++ b/www/sogo/distinfo @@ -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 diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist index 0067f374bac6..ed5c9bd82c75 100644 --- a/www/sogo/pkg-plist +++ b/www/sogo/pkg-plist @@ -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