From nobody Fri Jan 19 18:04:43 2024 X-Original-To: dev-commits-ports-main@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 4TGnZM5P28z573P6; Fri, 19 Jan 2024 18:04:43 +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 4TGnZM4tdsz4YbN; Fri, 19 Jan 2024 18:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705687483; 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=5FrodQzzjEZ/3wM70YmbqZw6KL9wcSiTKjO5OF99xzw=; b=oI5jwXk2RTiEtP5UgvPiKYv0eF2dhIz4/2SfKyWr2+P/QxWw2Dgv1EhgQM01IZcVPriWyo E9M5swnV4hVpBZ8WU6PI5nfZbfaf3UpGQiVruUe/JCzRxNZ26EM3DyD94vu61xq65nVowF VOJfa0m2ZIrMa9F7AQcIGMKuYvOgbN0r/mpUQBbExl5/a6WpDrnufhZzAo/bWoOzaBHS3S IjGrJOaZpkQq8itNHm+4Uj5+p+P5WTN54D/KTKqABgp5OyzSBm6sf8jy9lvjPJ5h5b8EdW GaBwPFooMDXV2o1zQTyTBGs+aZVkp/XCw8qtTKdU7Xsbtdu3FkmmuUrwPRIATQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705687483; 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=5FrodQzzjEZ/3wM70YmbqZw6KL9wcSiTKjO5OF99xzw=; b=XCOCkTAsVWPYxn919YYplneL2INQ25woPOi63IwhtmeYQmfR9WxOb8lyzvBxu+nuNCOdgi tZmmJP+hFgJKqQZts0Afiw1ys9XleoHNK57yj4wIgxLdNWfYqxEwvAdvf2YzmxIzRKnJ0R EMWeVKQ43p9JBryDM1WpCAX505xQB/hGsjZSCI4ZyKa/GujJSyLH8GYdIL0SyXNkChyRl/ mYbI/5YG+gLYEPfsH1nIwWx2uSkuiPPABZG4UJK8eUQrGDqjXI1EwfYZPYQSh90M4jJKf8 8IMOBs25Ap2VZ8IETbMRdz7ZvFk19Ch4KG2vcxhM91aXsiKX+5vrXxe8rtATkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705687483; a=rsa-sha256; cv=none; b=GWEeGrgxuqOSfn/GMoYmF40n7sMb8hLJT24S/l1eLa4YQ2+hJj0hwJItZMU0DxkhXkbDf6 V33UwlSOVnNAO66IrMGz5ct03HxXm8p7GdnDqED1hYL1uQoiu+oOhPo3TLANQECrLHpohn tPukhcKbRXlHSYmuevkRHIFrPnHW2frsyUwI+d9czs0oRkAbFl13DR1tVmJX3sylfr738F ttU5ltAj3s//EaG3cB6Pb4xSfIcFtzxXF1jI4bwDb+qHtY9n7ZbX2NptCX8MwWBKMCsmhy E7vMhnuW3jHpSiMBEeQPFlxhtZM/OSu5bkzMDdGcOT2pBZ6BxEeR4KRXhATT0g== 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 4TGnZM3fYPz11v0; Fri, 19 Jan 2024 18:04:43 +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 40JI4h0s081501; Fri, 19 Jan 2024 18:04:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40JI4hjO081498; Fri, 19 Jan 2024 18:04:43 GMT (envelope-from git) Date: Fri, 19 Jan 2024 18:04:43 GMT Message-Id: <202401191804.40JI4hjO081498@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: 8cd078ded8e3 - main - security/cyrus-sasl2: Add OPIE option for FreeBSD 14 and later. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ume X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cd078ded8e3dd35a53c9499f4f7107b11cceeb0 Auto-Submitted: auto-generated The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cd078ded8e3dd35a53c9499f4f7107b11cceeb0 commit 8cd078ded8e3dd35a53c9499f4f7107b11cceeb0 Author: Hajimu UMEMOTO AuthorDate: 2024-01-19 18:01:50 +0000 Commit: Hajimu UMEMOTO CommitDate: 2024-01-19 18:04:24 +0000 security/cyrus-sasl2: Add OPIE option for FreeBSD 14 and later. Reported by: Jonathan Chen --- security/cyrus-sasl2/Makefile | 6 ++++-- security/cyrus-sasl2/Makefile.common | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index 3cb484f52c9f..f9e59316137c 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 3 +PORTREVISION= 4 COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) WWW= https://www.cyrusimap.org/sasl/ @@ -11,7 +11,8 @@ CYRUS_CONFIGURE_ARGS= --with-saslauthd=${SASLAUTHD_RUNPATH} NO_OPTIONS_SORT= yes OPTIONS_DEFINE= ALWAYSTRUE AUTHDAEMOND DOCS KEEP_DB_OPEN \ OBSOLETE_CRAM_ATTR OBSOLETE_DIGEST_ATTR \ - SASLDB_IN_VAR + OPIE SASLDB_IN_VAR +OPTIONS_EXCLUDE_FreeBSD_13= OPIE OPTIONS_RADIO= SASLDB OPTIONS_RADIO_SASLDB= BDB1 BDB GDBM LMDB OPTIONS_GROUP= PLUGIN @@ -30,6 +31,7 @@ OBSOLETE_CRAM_ATTR_DESC=cmusaslsecretCRAM-MD5 auxprop property OBSOLETE_CRAM_ATTR_CONFIGURE_OFF=--enable-obsolete_cram_attr=no OBSOLETE_DIGEST_ATTR_DESC=cmusaslsecretDIGEST-MD5 auxprop property OBSOLETE_DIGEST_ATTR_CONFIGURE_OFF=--enable-obsolete_digest_attr=no +OPIE_DESC= Use OPIE with OTP SASLDB_DESC= SASLdb auxprop plugin BDB_USES= bdb BDB_CONFIGURE_ON= --with-dblib=berkeley \ diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common index 90f627525f40..604328fd8e03 100644 --- a/security/cyrus-sasl2/Makefile.common +++ b/security/cyrus-sasl2/Makefile.common @@ -102,6 +102,15 @@ SASLDB_NAME= sasldb2 SASLDB= "@comment " .endif +.if ${OPSYS} == FreeBSD && ${OSREL:R} >= 14 +.if ${PORT_OPTIONS:MOPIE} && ${PORT_OPTIONS:MOTP} +CONFIGURE_ARGS+=--with-opie=${LOCALBASE} +LIB_DEPENDS+= libopie.so:security/opie +.else +CONFIGURE_ARGS+=--without-opie +.endif +.endif + SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} \ SASLDB_DIR=${SASLDB_DIR} SASLDB_NAME=${SASLDB_NAME}