Re: CVS commit: pkgsrc/security/mit-krb5

[Greg Troxel <gdt%lexort.com@localhost>]

"Tobias Nygren" <tnn%netbsd.org@localhost> writes:

> Index: pkgsrc/security/mit-krb5/Makefile
> diff -u pkgsrc/security/mit-krb5/Makefile:1.121 pkgsrc/security/mit-krb5/Makefile:1.122
> --- pkgsrc/security/mit-krb5/Makefile:1.121	Mon Dec  9 15:49:13 2024
> +++ pkgsrc/security/mit-krb5/Makefile	Tue Apr 29 12:51:48 2025
> @@ -80,6 +80,13 @@ INSTALLATION_DIRS=	bin include/gssapi in
>  			lib/krb5/plugins/tls include/krb5 include/kadm5 \
>  			lib/pkgconfig
>  
> +.include "../../mk/compiler.mk"
> +
> +.if !empty(CC_VERSION:Mgcc-15)
> +# mit-krb5 is not C23 compliant & needs too many patches to make it compile.
> +CFLAGS+=		-std=gnu17 # reduced from gnu23
> +.endif
> +
>  .include "options.mk"
>  
>  pre-configure:

I see where you are coming from, but this seems off to me.

It is entirely reasonable for a prrogram to be written to C17 (and more
or less, to C17 with gnu extensions).  It is not a bug that it is not
valid C23, even though upstream might wish to make it so.

What is a bug is that it does not docment a language and then check for
and add --std= for that.

It's not clear what language standard this is written for -- I can't
find it in the docs.  configure prints

  checking for gcc option to enable C11 features... none needed

so I'm going with C11.

The package is buggy in that it does not have USE_CC_FEATURES+= c11, and
given that one can't know what's default and that upstream doesn't set
--std, FORCE_C_STANDARD=c11.

I then removed c++ from USE_LANGUAGES, and it still built fine.  The
build output was almost the same with and without c++, just configure
checking for c++ but the compiler was never used.   In the sources, I
see c++ only in some files marked as for Windows only.

With those changes, it builds on NetBSD 10 with gcc10, and I expect it
to build with gcc15 and any oother compiler that defaults to c23.  I'll
commit this tomorrow after 12Z, unless there are objections.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/mit-krb5/Makefile,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile
--- Makefile	29 Apr 2025 12:51:48 -0000	1.122
+++ Makefile	29 Apr 2025 13:38:32 -0000
@@ -3,7 +3,7 @@
 BRANCHNAME=	1.21
 DISTNAME=	krb5-${BRANCHNAME}.3
 PKGNAME=	mit-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	security
 # It is not clear how stable this URL scheme is.
 MASTER_SITES=	http://web.mit.edu/kerberos/dist/krb5/${BRANCHNAME}/
@@ -34,7 +34,10 @@ BUILD_TARGET=	generate-files-mac all
 CONFLICTS+=	heimdal-[0-9]*
 CONFLICTS+=	kth-krb4-[0-9]*
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c
+USE_CC_FEATURES+=	c11	# not documented, but configure checks
+FORCE_C_STD=		c11	# build fails in c23 mode
+
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		autoconf bison gzip m4 msgfmt perl
@@ -82,11 +85,6 @@ INSTALLATION_DIRS=	bin include/gssapi in
 
 .include "../../mk/compiler.mk"
 
-.if !empty(CC_VERSION:Mgcc-15)
-# mit-krb5 is not C23 compliant & needs too many patches to make it compile.
-CFLAGS+=		-std=gnu17 # reduced from gnu23
-.endif
-
 .include "options.mk"
 
 pre-configure: