From nobody Tue Jun 17 20:01:35 2025 X-Original-To: dev-commits-src-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 4bMHnZ5PWWz5phR8; Tue, 17 Jun 2025 20:01:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta003.cacentral1.a.cloudfilter.net (omta001.cacentral1.a.cloudfilter.net [3.97.99.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bMHnZ1BZhz3Tvn; Tue, 17 Jun 2025 20:01:38 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4004a.ext.cloudfilter.net ([10.228.9.227]) by cmsmtp with ESMTPS id RSjCuojEl9JM2RcUzuw0bP; Tue, 17 Jun 2025 20:01:37 +0000 Received: from spqr.komquats.com ([70.66.136.217]) by cmsmtp with ESMTPSA id RcUxuEiRVJhBPRcUyun28j; Tue, 17 Jun 2025 20:01:37 +0000 X-Auth-User: cschuber X-Authority-Analysis: v=2.4 cv=QY3Fvdbv c=1 sm=1 tr=0 ts=6851c9a1 a=h7br+8Ma+Xn9xscxy5znUg==:117 a=h7br+8Ma+Xn9xscxy5znUg==:17 a=kj9zAlcOel0A:10 a=6IFa9wvqVegA:10 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=YxBL1-UpAAAA:8 a=JDuXeeMnMLsuX0sUteMA:9 a=CjuIK1q_8ugA:10 a=LK5xJRSDVpKd5WXXoEvA:22 a=Ia-lj3WSrqcvXOmTRaiG:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 31C837C3; Tue, 17 Jun 2025 13:01:35 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 2BB8B268; Tue, 17 Jun 2025 13:01:35 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Ed Maste cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: fc77abfd1e62 - main - etc: Avoid duplicate gss files installation In-reply-to: <202506171951.55HJpXGq007157@gitrepo.freebsd.org> References: <202506171951.55HJpXGq007157@gitrepo.freebsd.org> Comments: In-reply-to Ed Maste message dated "Tue, 17 Jun 2025 19:51:33 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Tue, 17 Jun 2025 13:01:35 -0700 Message-Id: <20250617200135.2BB8B268@slippy.cwsent.com> X-CMAE-Envelope: MS4xfDk2sVfBAtcRqaeQGzAl6WEsEpc4rQjDLsB9ycaiDXv1vjbAtB7Agn7Qm4W90sD4AtnfQD9d4+xXOhfi0yhU8YPxUbdtTkRBUQjXEbmu6IsLINvgMyzm I9Q6wKXWovXM6AM1fFoP5aaMKV6acqCALODb8y8rQiorwS9NoacOKxPGmDOYKQU0IHN6pmCxvHKaopjk/aUI2EAneUToquFeRJq3oM1ZoUskgVj7DdQz+RLI KTv8nkB32hOKOeq73ANrzJEN7cHINrQnqM/J07ikvCRWk7RSA76ebclZPPW/vtTzPfB1nPT6oNq5wg6At4URz3jWuVupdpbDXNAZw2rf8f0= X-Rspamd-Queue-Id: 4bMHnZ1BZhz3Tvn X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] In message <202506171951.55HJpXGq007157@gitrepo.freebsd.org>, Ed Maste writes: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fc77abfd1e62751b0c76cd5d8ef3299b > 8ca398c6 > > 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 > Thank you. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e**(i*pi)+1=0