From nobody Fri Nov 10 01:34:05 2023 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 4SRLvd5rglz50Mdr; Fri, 10 Nov 2023 01:34:05 +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 4SRLvd5Pmpz3KT8; Fri, 10 Nov 2023 01:34:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699580045; 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=vpeN1J0qENIOhMzxQm+MyX1Pt4LconvG3cBiPuxYoyE=; b=iqMn7d/xDUtHp7ZiREtr2BXeQJXT80H2UvBVWXGFLtVDj4H15a0SAkO5BxAj5vrMV/BSIp Wlo08C1iFzQ/0yzvc6Jw3rVpJs+ZeI+KhRR/8TL6218aocmrs990JLwNN6U6+1d5lrHpgk EegIcAf728uqtY83OVhrwH7VXckFXwPJuO8Gl5MZTkW7GqMykLlYrAf2OaM8adNjma5kx+ Vtq8GGsxL/ZWt1PRKKMK0xFHQJ8nPmSucESddbD39FfyGGWUvy4Y2eBUv8EVkWAxvs5L7k EylseTLjaPUgDw3M4pyU1RlC6drhVt1ryGcIOH4RtlpTNzkRuJX4LGEITsOmyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699580045; 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=vpeN1J0qENIOhMzxQm+MyX1Pt4LconvG3cBiPuxYoyE=; b=SAFZSNUz3xNI+5KIRpZ1mDVWb2aF5Xtj/1cqEJTWxLqOFcLPUxqdCf1eJse4WJhtb6du2G ZUFmNDGoXLxdtsck+i1pjrXsR2kKq0keVeapoK3F6BMlnsa5NmTd4OZeYm494ECB/BG8zi e53EUTUDwg/97bYkYWfBh/R7bXVl37KqcbqZHQy7KIgfkgKpkhWVGGeOOG7+i0FbvecYn/ RbKWoaO2U7VFWNx9rO4wpSn75lVfsWiFZB5gfbHzwut9aJhWZ6e2iHOquBhjp0rgDpJ+z4 Z9IdL1NQMmYCBvC8TV+XtRHnIpx0eSzouIXlalU6CGiiWiFWLhRKKRnzToyh0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699580045; a=rsa-sha256; cv=none; b=sXVEsncsb6KdNpUlF/8or5G8jSbSxdSyWEh/xXBAUCdF4wMz9wOq1hVstDiPo96DBJeR/J o4LVpeOOteeITZcB4yaflviJRu758rysumI7+1lc+8jyuTK15pk5/oAq6kRB4RsFnxLqiF LxNkeOogWVZxkkQ3IVLENCcx/+0QTmdrIR5RjLGq7mJ8uNqZR+1qF8GyM0hd6rm1QjhlyX 8GxNtKoo4yMfxXgNrPVk7SLzRSUtIwPCU/wbR3VgkKx/bv2gFrn7IVfBSoMtqD3pKYvvih XySTOy/F18TAQ0jTsZcXGjJIukDV99xMDaGRLUYGEZu033uWHqTt78yZhuPgKg== 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 4SRLvd4VS6zdxw; Fri, 10 Nov 2023 01:34:05 +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 3AA1Y5ZX065907; Fri, 10 Nov 2023 01:34:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AA1Y5YQ065904; Fri, 10 Nov 2023 01:34:05 GMT (envelope-from git) Date: Fri, 10 Nov 2023 01:34:05 GMT Message-Id: <202311100134.3AA1Y5YQ065904@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 12264aff0819 - main - mail/mailman: fix empty group/user name regression in 2.1.39_2 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: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12264aff0819e4e49ab4690c70c01e64c9c496f8 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=12264aff0819e4e49ab4690c70c01e64c9c496f8 commit 12264aff0819e4e49ab4690c70c01e64c9c496f8 Author: Matthias Andree AuthorDate: 2023-11-10 01:31:22 +0000 Commit: Matthias Andree CommitDate: 2023-11-10 01:34:02 +0000 mail/mailman: fix empty group/user name regression in 2.1.39_2 ...and drop files/patch-configure-in, which is no longer needed; neither is autoreconf needed to be reinstated. We can cheat the test -z "$VAR" inside the MM_FIND_{GROUP,USER}... configure[.in] macros by putting the proper contents into the proper environment variables. To fix the regression in... PR: 274991 Reported by: leres@ --- mail/mailman/Makefile | 8 ++++- mail/mailman/files/patch-configure-in | 67 ----------------------------------- 2 files changed, 7 insertions(+), 68 deletions(-) diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index ecf88cdd7569..2da052f7a57c 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,6 +1,6 @@ PORTNAME= mailman DISTVERSION= 2.1.39 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= GNU \ SF/${PORTNAME}/Mailman%202.1%20%28stable%29/${PORTVERSION} \ @@ -34,6 +34,12 @@ CONFIGURE_ARGS+=--with-python=${PYTHON_CMD} \ --with-permcheck=no \ --with-mailhost=localhost \ --with-urlhost=localhost +# setting these defeats the automated check for users in configure[.in], as of 2.1.39, +# implemented in MM_FIND_* macros: +CONFIGURE_ENV+= CGI_GROUP=${CGI_GID} \ + MAIL_GROUP=${MAIL_GID} \ + MAILMAN_USER=${MM_USERNAME} \ + MAILMAN_GROUP=${MM_GROUPNAME} CONFLICTS= ja-mailman-2.1.* mailman*exim* mailman*postfix* diff --git a/mail/mailman/files/patch-configure-in b/mail/mailman/files/patch-configure-in deleted file mode 100644 index e17c6752e558..000000000000 --- a/mail/mailman/files/patch-configure-in +++ /dev/null @@ -1,67 +0,0 @@ -Mailman tests for existence of users during configure -- unfortunately -this creates a problem; we create the users just before install. - -We remove the testing part. - ---- configure.in.bak 2010-09-20 19:18:27.000000000 +0100 -+++ configure.in 2011-06-14 20:20:29.209438957 +0100 -@@ -311,28 +311,7 @@ - # $2 == user id to check for - AC_SUBST($1) - changequote(,) --if test -z "$$1" --then -- cat > conftest.py < conftest.py <