From nobody Tue Jun 17 19:51:33 2025 X-Original-To: dev-commits-src-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 4bMHYx5cCjz5pglx; Tue, 17 Jun 2025 19:51:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMHYx4PWmz3Ms4; Tue, 17 Jun 2025 19:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189893; 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=pISh4LjAqqmjxDUf0GHCMaBccThxtgWf6BMbH8g2fdI=; b=izx1Xnq4f+4HC6pITVZlrSTF4updGFudzswLkb0DnW5NJvzR7oLwpWEweek8/AAeFTrmvz oXzhRNyvR1+p7LdrFPQoJFGclntUxucRwKsMaio+pjwLNH3oNfDBnqpHIfOktRyU+8hnL2 Wil8NH2+9IL5JFXr0HAyzLBhp1LHoYxUUhfm3qu4lPlJMGdJAfAtfTwp3GZfcz8UQbzVrP G3jasHpAMFAinisWz1wat37gCLHiORl17vm8nf9fu7H12GrwJXOINvBu6u6BSXIH25AK2J xJ6K68WUtjHeAJ9skaGyediloXWl9qssRQXKr5dJpXFnrrkIzPPgvM5af8QoNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750189893; 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=pISh4LjAqqmjxDUf0GHCMaBccThxtgWf6BMbH8g2fdI=; b=eA4yz4GyCeVrbcrbVu2MxpLcr/t8k0U3Imq4/tsMYIXoxbrFwDMeOw4uO7gMy1ugZvpZd/ iTMmuuMGVqAeoBAT+9OELPisoIA0WnKs8rzbh/Pwd8htOETAnsJpPG+lO1vKiFuXThMrv+ 7gXc0p09AsEnATZolKnLPA2D6H7ynTelPPRNehUaOyM9CsGfJNz0zNsLv15dWW3eeseI8e DLNkWFQxqHZ38LMQXiQALxXX9gBj6TdqRzjElr2Erk5vl+4TE/UeDcsGWWahEKCkHq24he p3cVFeuF9v2l1UBog/KVGl3ZxxiR0DDkpU6jRmRgTs/hPDF7QmrtpL+GfCpfwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750189893; a=rsa-sha256; cv=none; b=kiPKm4USV4Je42A0A0smwNJqsRd1E9JEJVfGFxpntJ+hXciQTHOz4auIZfkkPJHVbk6F5i BGu1Swgalrw7K6ksYGilvQx0shexAXgtcWhDesEHE0LDeAL6J0xQS1LwnyHbzVCaWeu1vg yl1rftEoQHyAnTGpw8TJB0f2tut9F2GpziT/bjVnF6+cDBcLdib51QZU+c8dyzhPlcN6Ns P1mOuIzyXhoZXqMx2FhcsPZpjE4oZiZAEAjzbw6sOKo4haJ8IWhGd8hPqdGK91eZlSJRWv 2jhyYm2WwNHGEBTpjRqHFnDfbiBzNW40d/cHZVUYLe/yeEFR9/62Qc891dZwTg== 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 4bMHYx3qbCzxNC; Tue, 17 Jun 2025 19:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55HJpXnF007160; Tue, 17 Jun 2025 19:51:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55HJpXGq007157; Tue, 17 Jun 2025 19:51:33 GMT (envelope-from git) Date: Tue, 17 Jun 2025 19:51:33 GMT Message-Id: <202506171951.55HJpXGq007157@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fc77abfd1e62 - main - etc: Avoid duplicate gss files installation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 commit fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 Author: Ed Maste AuthorDate: 2025-06-17 19:46:33 +0000 Commit: Ed Maste CommitDate: 2025-06-17 19:50:01 +0000 etc: Avoid duplicate gss files installation From Cirrus-CI su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua \ -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" error: ./etc/gss/mech file repeated with same meta: line 2127,40175 error: ./etc/gss/qop file repeated with same meta: line 2128,40176 Prior to 1b735665f45a the Heimdal versions were installed via distribution: ${_+_}cd ${.CURDIR}/gss; ${MAKE} install 1b735665f45a added a conditional for MK_MITKRB5 but also added gss or gss-krb5 to SUBDIRS, causing these files to be installed twice. Fixes: 1b735665f45a ("etc/gss: Add MIT GSS glue") Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation --- etc/Makefile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index da9288bddaae..ab799b2f6c80 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -15,12 +15,6 @@ SUBDIR+=termcap SUBDIR+=sendmail .endif -.if ${MK_MITKRB5} != "no" -SUBDIR+=gss-krb5 -.else -SUBDIR+=gss -.endif - # NB: keep these sorted by MK_* knobs ETCMAIL=aliases