From nobody Sun Jun 9 22:01:57 2024 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 4Vy86Y6PZ4z5N31S; Sun, 09 Jun 2024 22:01:57 +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 4Vy86Y5vK3z4DQ5; Sun, 9 Jun 2024 22:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717970517; 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=LXkYbBYzUTA/Ve+0+3MeWDXKENxiRm/+jpKxxyG5Zr4=; b=clkXd9vhKNtfbvdfe8YwIHiwfPKJMXgi18tNVpFPouzBNcRjtQg+9diwQtMGVtOw+/JF9W fSJLKTnpHWjMgF5zWoqQjKC6a2JMHLVUvSyKgYganrNGI4FoTbg01jiqHbrjLRn5VDJDhB jRV8SsINTs7bPspkLUiUzMrT6sS88dPhra3oCIMs0j2M5znjKaSYgaSIXtn+ovUwoS9kLw s3EYQl10Vh3psD4SRRT5R2Hw4NreCoeJyi6r878JVjhrx9ESpmTrC0G/RShXbFtT4b17rE yVsqfEaxfoHAJ+gwiYFZ7FTL39PLwn/fD5MiJFGii0zg26gh6qsTkVyJ9K6dqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717970517; a=rsa-sha256; cv=none; b=JP4QOZrWOtfncSFmHlZE2kvzA916pVj4Y9WPlui5ZVAryLO2lThGsdnqIZLlrR2s0orYmP WDmj9kzwLLJkRUUyGLwmUxwcPotyZVTWSDAQEEW4lgi24z+bti7i5BA9M1E44W0KMSEEO1 D+sfL0oFsCRAumNnDF/aGuqvHyDXk6mkxKETRcOid/FUP+GOhSzI0SBqQX5AqOn5F4PQl1 yfVOKxExzOCkj4YZWGptWdnHlaCrNyLt/VGWb8FEeuzUH26DOAhlpOvHY/HnhXtINqpHeV wzLCXqM/oyZ2sjrM90uR6Hhy1tZF4ZXvaszOHyXYV7q4nZRHS0nR3S2qirNw9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717970517; 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=LXkYbBYzUTA/Ve+0+3MeWDXKENxiRm/+jpKxxyG5Zr4=; b=k4D0+lN1Or4WzhBGsbldxz3gdPn8FgAPaUD+aiSLSPwtAwP+nikOH5ss8WCq817NBZ8yLq ZWOOooXl+i3nHMpzk4IDhWq45LmVV3YZQEQ0pBo6zo+NjIttwF/Fljb1fh+64KmTbZvDmA gizTveyLjzVxOX2akbQi4gmHfbLNZ/2JNFEI8Cm6XVuj/JBX96JHpW2ZNAQRmYrjYvefBg tCO/1ADRmqFe8XzHWqUITOZ3jLqhJioU1eOAfXZfX7+WTcAq4jYirDX+SgnitOAAWmPbpp LgIZ+39unLdAM+us/U+WYYNHNhv5E+Lm+KiQm5GlvdKZ7hCas4eQt9JRvYOwcg== 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 4Vy86Y5CgFz10PN; Sun, 9 Jun 2024 22:01:57 +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 459M1vqo081032; Sun, 9 Jun 2024 22:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 459M1vbe081029; Sun, 9 Jun 2024 22:01:57 GMT (envelope-from git) Date: Sun, 9 Jun 2024 22:01:57 GMT Message-Id: <202406092201.459M1vbe081029@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 1acc62c56236 - main - security/{open,}doas: add CONFLICTS to each other 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1acc62c56236fee8b9d5c10350a78f3c36489933 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1acc62c56236fee8b9d5c10350a78f3c36489933 commit 1acc62c56236fee8b9d5c10350a78f3c36489933 Author: Vladimir Druzenko AuthorDate: 2024-06-09 21:55:42 +0000 Commit: Vladimir Druzenko CommitDate: 2024-06-09 21:55:42 +0000 security/{open,}doas: add CONFLICTS to each other They install files with the same names. PR: 279598 Reported by: fluffy (via email) Fixes: 2820df617d13 (new port: portable version of OpenBSD's doas) --- security/doas/Makefile | 2 ++ security/opendoas/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/security/doas/Makefile b/security/doas/Makefile index 7180fd0237fc..58c1aa4b15fe 100644 --- a/security/doas/Makefile +++ b/security/doas/Makefile @@ -20,6 +20,8 @@ GH_ACCOUNT= slicer69 MAKE_ENV+= TARGETPATH=-DGLOBAL_PATH='\"${_GLOBAL_PATH}\"' +CONFLICTS= opendoas + BINMODE= 4755 SUB_FILES= pkg-message diff --git a/security/opendoas/Makefile b/security/opendoas/Makefile index 6e30ec1a2734..7b821302a87b 100644 --- a/security/opendoas/Makefile +++ b/security/opendoas/Makefile @@ -32,6 +32,8 @@ CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc \ MAKEFILE= GNUmakefile +CONFLICTS= doas + post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/doas