From fc77abfd1e62751b0c76cd5d8ef3299b8ca398c6 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 17 Jun 2025 15:46:33 -0400 Subject: [PATCH] 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 da9288bddaa..ab799b2f6c8 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