From nobody Thu Nov 30 12:11:49 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 4Sgw6F5qX8z53FQ3; Thu, 30 Nov 2023 12:11:49 +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 4Sgw6F5GKlz3TQx; Thu, 30 Nov 2023 12:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701346309; 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=/2pkVQs+Fijqs95jFUaemG7aaIT5aJyZpeM/1TAdO50=; b=CFtF4fixKvefQjNKp69/8uWekXkZmXrDV3X9355BkAVN+TJ5BrFCZlVtbveKFVQyf58V2z FI7k323EbT2JTD54goRkQSP030R6bzAto+dsww6fyZyhMa0cgK3nFl526JvWsxgBb8EbTK eCgdjd/ochWX9BYUiM9j/i3WEYndwrGlEwqmWIB6hW9VgcGTWoJy8+NbXWZmBvdZHkLGiT qZT4kR5McUaUuiIGpoB+qo1ruY9g7f1jv72RhNX48lvflTVE0dOr54UTQDPTPfhmA4jtGn 8oaD3qilNzwcRg0YC27ANJDsfy+t6sQl7x+s/43RpquHfX4yWIEU84OOsyN74w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701346309; 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=/2pkVQs+Fijqs95jFUaemG7aaIT5aJyZpeM/1TAdO50=; b=AvWi9iqVah56xBUjYJ58YVAg0s6eZTeIbI62CX632ndrN6fPfjuYAPFUOUqqzpGcD/ct5R nLOUqqY8ZBfZ8VHdA39yMw8WLXvNEcyVzxfPtdhGa42Es8bGdEEG1sYp16chReKcN3vg7L l0g64P/Towdz7cEmPP1KMhljrc4CiDJzSFfla1UUsOl2JlxN1rSp6NffDprC8X2hSI60+4 mpGrK45WDiKkSm8KqX+uU6ugb6Y2/ao0t33htuAPNSN2kYb4fjzMZVI0GzXjMzcsRwkiCM c0d77cwNGHHjue2u8blBg7rQ2VNkyfrpt0IZFhP7ranRvJF9Xrb3yOdNbh9iAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701346309; a=rsa-sha256; cv=none; b=AtdyFYSERmfWG8kAk8nkRwY3TjOSP7hFIWuRE1KMQALHUsp0OhYerir0WpkGBrJPrV6zRZ t6beJVBo2id1fwxPnEDvQEwWG2h0JKNVgw0rtOdaYOzXS9CDtGL/+/W+HY6BZaFXTAydjh cnwrgN+iOsT+D5LhAaojwsdHweOUo9luEyGa+mhrCwZXPRzd2BesiXBq6ONRg+J7O7RQ0j ygrOL9v8PQQuyEv43e7gPtOaIgbhfgzDy77sGEya5+l8WkyGR+Pcr/h20Allnti9A1EgiT UmH8ZDNL2tWF/lYheJFLWnXue9vyskU7lTp48VLtLpa3mg1ZIog1fAvWs4eG1w== 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 4Sgw6F4KDfzpXW; Thu, 30 Nov 2023 12:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AUCBnnJ017299; Thu, 30 Nov 2023 12:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AUCBngv017296; Thu, 30 Nov 2023 12:11:49 GMT (envelope-from git) Date: Thu, 30 Nov 2023 12:11:49 GMT Message-Id: <202311301211.3AUCBngv017296@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 43293f045cc5 - main - irc/anope: fix build error with SASL option enabled 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: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43293f045cc51f73af6262e1603f420425dd9644 Auto-Submitted: auto-generated The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=43293f045cc51f73af6262e1603f420425dd9644 commit 43293f045cc51f73af6262e1603f420425dd9644 Author: Rodrigo Osorio AuthorDate: 2023-11-30 10:56:39 +0000 Commit: Rodrigo Osorio CommitDate: 2023-11-30 12:11:25 +0000 irc/anope: fix build error with SASL option enabled Also did some Makefile cleanup and reordering to make linters happy PR: 275399 Reported by: Siva Mahadevan Approved by: Rafael Grether (maintainer) --- irc/anope/Makefile | 25 +++++++++++-------------- irc/anope/files/patch-CMakeLists.txt | 4 ++-- irc/anope/pkg-plist | 2 -- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/irc/anope/Makefile b/irc/anope/Makefile index 76108afc175b..aad0e43fd65a 100644 --- a/irc/anope/Makefile +++ b/irc/anope/Makefile @@ -12,18 +12,19 @@ LICENSE_FILE= ${WRKSRC}/docs/COPYING USES= cmake localbase:ldflags shebangfix USE_GITHUB= yes USE_RC_SUBR= anope +SHEBANG_FILES= ${WRKSRC}/src/tools/*.sh CMAKE_ARGS= -DINSTDIR:STRING="${PREFIX}/anope" -SHEBANG_FILES= ${WRKSRC}/src/tools/*.sh CFLAGS_amd64= -fPIC SUB_FILES= pkg-message -OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL SQLITE STATS TRE +OPTIONS_DEFINE= GNUTLS LDAP MYSQL NLS OPENSSL PCRE POSIX REDIS SASL \ + SQLITE STATS TRE OPTIONS_DEFAULT= MYSQL OPENSSL POSIX -OPTIONS_SUB= yes -POSIX_DESC= POSIX Regex Module -STATS_DESC= Channel Statistics Module -TRE_DESC= Tre Regex Module +OPTIONS_SUB= yes +POSIX_DESC= POSIX Regex Module +STATS_DESC= Channel Statistics Module +TRE_DESC= Tre Regex Module GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls @@ -35,10 +36,10 @@ NLS_USES= gettext OPENSSL_USES= ssl -REDIS_RUN_DEPENDS= redis>=0:databases/redis - PCRE_LIB_DEPENDS= libpcre.so:devel/pcre +REDIS_RUN_DEPENDS= redis>=0:databases/redis + SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite @@ -67,18 +68,14 @@ post-patch-MYSQL-on: post-patch-OPENSSL-on: ${LN} -s ${WRKSRC}/modules/extra/m_ssl_openssl.cpp ${WRKSRC}/modules/ -post-patch-SQLITE-on: - ${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/ - post-patch-PCRE-on: ${LN} -s ${WRKSRC}/modules/extra/m_regex_pcre.cpp ${WRKSRC}/modules/ post-patch-POSIX-on: ${LN} -s ${WRKSRC}/modules/extra/m_regex_posix.cpp ${WRKSRC}/modules/ -post-patch-SASL-on: - ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-aes.cpp ${WRKSRC}/modules/ - ${LN} -s ${WRKSRC}/modules/extra/m_sasl_dh-blowfish.cpp ${WRKSRC}/modules/ +post-patch-SQLITE-on: + ${LN} -s ${WRKSRC}/modules/extra/m_sqlite.cpp ${WRKSRC}/modules/ post-patch-STATS-on: ${LN} -s ${WRKSRC}/modules/extra/stats ${WRKSRC}/modules/ diff --git a/irc/anope/files/patch-CMakeLists.txt b/irc/anope/files/patch-CMakeLists.txt index 9dc5fb37c0b4..dadac3edd3c4 100644 --- a/irc/anope/files/patch-CMakeLists.txt +++ b/irc/anope/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2023-06-02 15:14:06.209032000 +0000 -+++ CMakeLists.txt 2023-06-02 15:15:18.248991000 +0000 +--- CMakeLists.txt.orig 2023-06-02 15:14:06 UTC ++++ CMakeLists.txt @@ -486,16 +486,16 @@ get_filename_component(SERVICES_BINARY ${SERVICES_BINARY} NAME) diff --git a/irc/anope/pkg-plist b/irc/anope/pkg-plist index a8d83b95eee0..ba0abaa06aa3 100644 --- a/irc/anope/pkg-plist +++ b/irc/anope/pkg-plist @@ -126,8 +126,6 @@ anope/lib/modules/m_redis.so %%TRE%%anope/lib/modules/m_regex_tre.so anope/lib/modules/m_rewrite.so anope/lib/modules/m_sasl.so -%%SASL%%anope/lib/modules/m_sasl_dh-aes.so -%%SASL%%anope/lib/modules/m_sasl_dh-blowfish.so %%GNUTLS%%anope/lib/modules/m_ssl_gnutls.so %%OPENSSL%%anope/lib/modules/m_ssl_openssl.so %%MYSQL%%anope/lib/modules/m_sql_authentication.so