CVS commit: pkgsrc/mk

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Apr 12 08:41:11 UTC 2025

Modified Files:
        pkgsrc/mk: krb5.buildlink3.mk
        pkgsrc/mk/platform: Darwin.mk FreeBSD.mk HPUX.mk NetBSD.mk SunOS.mk

Log Message:
mk: Switch KRB5_DEFAULT default to mit-krb5.

More OS include this than heimdal, and for OS that do not provide
either, building the pkgsrc version is a lot more portable.

Retain heimdal as the default on NetBSD and FreeBSD, since they
include it in their base system.

via dreckly, original author jperkin@


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/mk/krb5.buildlink3.mk
cvs rdiff -u -r1.143 -r1.144 pkgsrc/mk/platform/Darwin.mk
cvs rdiff -u -r1.42 -r1.43 pkgsrc/mk/platform/FreeBSD.mk
cvs rdiff -u -r1.28 -r1.29 pkgsrc/mk/platform/HPUX.mk
cvs rdiff -u -r1.83 -r1.84 pkgsrc/mk/platform/NetBSD.mk
cvs rdiff -u -r1.96 -r1.97 pkgsrc/mk/platform/SunOS.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/krb5.buildlink3.mk
diff -u pkgsrc/mk/krb5.buildlink3.mk:1.14 pkgsrc/mk/krb5.buildlink3.mk:1.15
--- pkgsrc/mk/krb5.buildlink3.mk:1.14   Tue Jan  2 05:39:00 2018
+++ pkgsrc/mk/krb5.buildlink3.mk        Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: krb5.buildlink3.mk,v 1.14 2018/01/02 05:39:00 maya Exp $
+# $NetBSD: krb5.buildlink3.mk,v 1.15 2025/04/12 08:41:11 nia Exp $
 #
 # This Makefile fragment is meant to be included by packages that
 # require a Kerberos 5 implementation.  krb5.buildlink3.mk will:
@@ -28,7 +28,7 @@ KRB5_BUILDLINK3_MK:=  ${KRB5_BUILDLINK3_M
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(KRB5_BUILDLINK3_MK:M+)
-KRB5_DEFAULT?= heimdal
+KRB5_DEFAULT?= mit-krb5
 KRB5_ACCEPTED?=        ${_KRB5_PKGS}
 
 # This is an exhaustive list of all of the Kerberos 5 implementations

Index: pkgsrc/mk/platform/Darwin.mk
diff -u pkgsrc/mk/platform/Darwin.mk:1.143 pkgsrc/mk/platform/Darwin.mk:1.144
--- pkgsrc/mk/platform/Darwin.mk:1.143  Sat Apr 12 08:36:35 2025
+++ pkgsrc/mk/platform/Darwin.mk        Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.143 2025/04/12 08:36:35 nia Exp $
+# $NetBSD: Darwin.mk,v 1.144 2025/04/12 08:41:11 nia Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -168,9 +168,6 @@ _PATCH_CAN_BACKUP=  yes     # native patch(1)
 _PATCH_BACKUP_ARG?=    -V simple -b -z # switch to patch(1) for backup suffix
 _USE_RPATH=            no      # don't add rpath to LDFLAGS
 
-# Comes with a native mit-krb5 implementation
-KRB5_DEFAULT?=         mit-krb5
-
 #
 # Builtin overrides.
 #

Index: pkgsrc/mk/platform/FreeBSD.mk
diff -u pkgsrc/mk/platform/FreeBSD.mk:1.42 pkgsrc/mk/platform/FreeBSD.mk:1.43
--- pkgsrc/mk/platform/FreeBSD.mk:1.42  Sat Apr 12 08:36:35 2025
+++ pkgsrc/mk/platform/FreeBSD.mk       Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.42 2025/04/12 08:36:35 nia Exp $
+# $NetBSD: FreeBSD.mk,v 1.43 2025/04/12 08:41:11 nia Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -90,3 +90,6 @@ _OPSYS_CAN_CHECK_SSP=         no  # only suppor
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
+
+# Comes with a native heimdal implementation
+KRB5_DEFAULT?=         heimdal

Index: pkgsrc/mk/platform/HPUX.mk
diff -u pkgsrc/mk/platform/HPUX.mk:1.28 pkgsrc/mk/platform/HPUX.mk:1.29
--- pkgsrc/mk/platform/HPUX.mk:1.28     Sat Apr 12 08:36:35 2025
+++ pkgsrc/mk/platform/HPUX.mk  Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: HPUX.mk,v 1.28 2025/04/12 08:36:35 nia Exp $
+# $NetBSD: HPUX.mk,v 1.29 2025/04/12 08:41:11 nia Exp $
 #
 # Variable definitions for the HP-UX operating system.
 
@@ -59,9 +59,6 @@ _OPSYS_CAN_CHECK_SHLIBS=      no # can't use 
 # sysutils/fam is not usable on HP-UX.
 FAM_DEFAULT?=          gamin
 
-# mit-krb5 is builtin, and heimdal doesn't build.
-KRB5_DEFAULT?=         mit-krb5
-
 # Builtin openssl and zlib have issues. Prefer pkgsrc's until we know which
 # versions work.
 _OPSYS_PREFER.openssl?=        pkgsrc

Index: pkgsrc/mk/platform/NetBSD.mk
diff -u pkgsrc/mk/platform/NetBSD.mk:1.83 pkgsrc/mk/platform/NetBSD.mk:1.84
--- pkgsrc/mk/platform/NetBSD.mk:1.83   Sat Apr 12 08:36:35 2025
+++ pkgsrc/mk/platform/NetBSD.mk        Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.83 2025/04/12 08:36:35 nia Exp $
+# $NetBSD: NetBSD.mk,v 1.84 2025/04/12 08:41:11 nia Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -231,6 +231,9 @@ _OPSYS_CAN_CHECK_SSP=               no  # only suppor
 # to avoid a test required by the libtool script that takes forever.
 _OPSYS_MAX_CMDLEN_CMD= /sbin/sysctl -n kern.argmax
 
+# Comes with a native heimdal implementation
+KRB5_DEFAULT?=         heimdal
+
 # ABI selection.  (XXX Can we do this in terms of ${ABI} instead of
 # ${MACHINE_ARCH} vs ${HOST_MACHINE_ARCH} (uname -m)?  Complication is
 # I don't know how to get the value of ${ABI} that ld is configured for

Index: pkgsrc/mk/platform/SunOS.mk
diff -u pkgsrc/mk/platform/SunOS.mk:1.96 pkgsrc/mk/platform/SunOS.mk:1.97
--- pkgsrc/mk/platform/SunOS.mk:1.96    Sat Apr 12 08:36:36 2025
+++ pkgsrc/mk/platform/SunOS.mk Sat Apr 12 08:41:11 2025
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.96 2025/04/12 08:36:36 nia Exp $
+# $NetBSD: SunOS.mk,v 1.97 2025/04/12 08:41:11 nia Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -61,14 +61,10 @@ INIT_SYSTEM?=               smf
 OPSYS_HAS_POSIX_SPAWN= # defined
 .endif
 
-# Comes with a builtin implementation based on mit-krb5, however it's quite
-# old at this point so the default is pkgsrc to avoid build issues.
-KRB5_DEFAULT?=         mit-krb5
-
 # Builtin defaults which make sense for this platform.
 _OPSYS_PREFER.getopt?=         native
 _OPSYS_PREFER.libexecinfo?=    native
-_OPSYS_PREFER.mit-krb5?=       pkgsrc
+_OPSYS_PREFER.mit-krb5?=       pkgsrc  # builtin is old
 _OPSYS_PREFER.openssl?=                pkgsrc
 _OPSYS_PREFER.solaris-pam?=    native