From nobody Thu Nov 09 07:05:16 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 4SQtJD5lh8z50LNh; Thu, 9 Nov 2023 07:05:16 +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 4SQtJD49kCz3Cqf; Thu, 9 Nov 2023 07:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699513516; 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=DZD85aRbL/zFJW96jeREP8qgXaHKcB/oH3VdOg2rZPc=; b=PX/98aXP15r1bv8mM9nGrVLVRcipsIzLt2MGRwE9qRG8xuOUJoiQ4JelrbED5jCnUwXE94 KnRgi/WmdsUH7HRBED4uZr8GIzzn0LCadAgf8ghpfuDu7pAtCd92xOf8mXKx+bbbykMRp2 EDHdFb+NEvKHzlpOOCmEJ0j46OTZUEwPneWDE1OQCiu1bp8wJMfTOEus6x/Pv5sUcvvEr8 zj2RrgDoLykgsaDoj7341OyNdV2Syp5MeyYPw5NgIR70xmcDhIBj9jzY5bSGZlbunFQa7x nxeJeXAXEkjpgWHd6zJ07OdENK3XO6tuWLzlvYb739I+Ut7yhaRmlMXj5KxU/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699513516; 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=DZD85aRbL/zFJW96jeREP8qgXaHKcB/oH3VdOg2rZPc=; b=F0DcIICQi8+cW5KbU83WBmQhQjC1YrpaIardSXozP2Jzduyy0zkyUCBEaGvcef7k46c0bg J4NiklFxPgXdDm02OlJRODFQ0AKRFQppNbFodGpk28l659D7plRENg+Uv3Itj1XPB8DJcv nuIWyZZDZ2QmGgKbmOQVoOGos3U0SD7dC1haa7GepQkBnosFUU8RDkfQoWAhIMKuHmN/kE rsvzbtRqswhunW79DmG/N1SBETJBL7jbnufh0Wy5Qhe1fBvPXgfjjDPPjmceelStXiI2ed pXP/s3iGre62K814AOKiFx+NfUZKg4DgQbFK7mrXiP0E51DBcZNhqIV3TdEYQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699513516; a=rsa-sha256; cv=none; b=FiQ+yImejKASH6YoNOVqViW9x6NMzZTHf+FRUuZvKhPzcE3JEfFYIY85Z+GoLpUr9z0NnW B2cWlL6AppqOE5HmLgF/nLiz9R2QXzfi/1Vx4S75zXHM99EB3QLd3xW4F16oRlMGhPuWcS a7wYBg/R3OT+DsprUfKAQCo5GZIF27bFKuZUmDWVF9hqr8JWaHfCFP//RyYAvQM0EXtY/Q KV8y1ec/j74LmLykTZrNZbsRSnORJan3iVfTXHWn/PsWJ+PAdB9rrZBvsk7BFf/U+ZRAdg uBAkZ453NIdjNU9wQvAvc6NYOEG4H8dfK15rm1Hif0zK9wjSIcKfdtREuVhfmQ== 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 4SQtJD3FYYz15Jf; Thu, 9 Nov 2023 07:05:16 +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 3A975Gx6013854; Thu, 9 Nov 2023 07:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A975GH4013851; Thu, 9 Nov 2023 07:05:16 GMT (envelope-from git) Date: Thu, 9 Nov 2023 07:05:16 GMT Message-Id: <202311090705.3A975GH4013851@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kurt Jaeger Subject: git: 2ce476eea4a3 - main - mail/exim: re-add support for Alternative SRS 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: pi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ce476eea4a37b1735316edc26a5d8df2bb3e48e Auto-Submitted: auto-generated The branch main has been updated by pi: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ce476eea4a37b1735316edc26a5d8df2bb3e48e commit 2ce476eea4a37b1735316edc26a5d8df2bb3e48e Author: Chris Collins AuthorDate: 2023-11-09 07:03:17 +0000 Commit: Kurt Jaeger CommitDate: 2023-11-09 07:03:17 +0000 mail/exim: re-add support for Alternative SRS PR: 266465 Approved by: fluffy (maintainer, implicit) Author: Chris Collins --- mail/exim/Makefile | 4 ++++ mail/exim/options | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 6f6cdcdcb702..b0a55786060b 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -497,6 +497,10 @@ SEDLIST+= -e 's,XX_SPF_FLAGS_XX,,' \ .if ${PORT_OPTIONS:MSRS} SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DSUPPORT_SRS,' \ -e 's,XX_SRS_LIBS_XX,,' +.elif ${PORT_OPTIONS:MOLD_SRS} +LIB_DEPENDS+= libsrs_alt.so:mail/libsrs_alt +SEDLIST+= -e 's,XX_SRS_FLAGS_XX,-DEXPERIMENTAL_SRS_ALT,' \ + -e 's,XX_SRS_LIBS_XX,-L${LOCALBASE}/lib -lsrs_alt,' .else SEDLIST+= -e 's,XX_SRS_FLAGS_XX,,' \ -e 's,XX_SRS_LIBS_XX,,' diff --git a/mail/exim/options b/mail/exim/options index d8da470bef74..2b47a03e9135 100644 --- a/mail/exim/options +++ b/mail/exim/options @@ -58,8 +58,9 @@ OPTIONS_RADIO_TLS= TLS GNUTLS TLS_DESC= TLS support OPTIONS_RADIO_LS= SA_EXIM LS_DESC= Local scan patch -OPTIONS_RADIO_SRSR= SRS +OPTIONS_RADIO_SRSR= SRS OLD_SRS SRSR_DESC= Sender Rewriting Scheme +OLD_SRS_DESC= Enable Alternative Sender Rewriting Scheme OPTIONS_RADIO= TLS LS SRSR OPTIONS_GROUP_AUTH= AUTH_CRAM_MD5 AUTH_DOVECOT AUTH_PLAINTEXT AUTH_RADIUS AUTH_SASL AUTH_SPA AUTH_TLS SASLAUTHD PAM PASSWD