CVS commit: pkgsrc/security/heimdal

["Jonathan A. Kollasch" <jakllsch%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jakllsch
Date:           Sun Mar  9 14:04:48 UTC 2025

Modified Files:
        pkgsrc/security/heimdal: Makefile PLIST options.mk

Log Message:
avoid bin/pagsh conflict with openafs in default case


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 pkgsrc/security/heimdal/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/heimdal/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/security/heimdal/options.mk

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

Modified files:

Index: pkgsrc/security/heimdal/Makefile
diff -u pkgsrc/security/heimdal/Makefile:1.168 pkgsrc/security/heimdal/Makefile:1.169
--- pkgsrc/security/heimdal/Makefile:1.168      Thu Nov 14 22:21:29 2024
+++ pkgsrc/security/heimdal/Makefile    Sun Mar  9 14:04:48 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.168 2024/11/14 22:21:29 wiz Exp $
+# $NetBSD: Makefile,v 1.169 2025/03/09 14:04:48 jakllsch Exp $
 
 DISTNAME=      heimdal-7.8.0
-PKGREVISION=   11
+PKGREVISION=   12
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=heimdal/}
 GITHUB_RELEASE=        ${DISTNAME}
@@ -15,7 +15,6 @@ TOOL_DEPENDS+=        p5-JSON-[0-9]*:../../conv
 
 CONFLICTS+=    arla-[0-9]*
 CONFLICTS+=    mit-krb5-[0-9]*
-CONFLICTS+=    openafs-[0-9]*
 CONFLICTS+=    gss-[0-9]*
 CONFLICTS+=    kth-krb4-[0-9]*
 

Index: pkgsrc/security/heimdal/PLIST
diff -u pkgsrc/security/heimdal/PLIST:1.28 pkgsrc/security/heimdal/PLIST:1.29
--- pkgsrc/security/heimdal/PLIST:1.28  Tue Nov 22 12:51:00 2022
+++ pkgsrc/security/heimdal/PLIST       Sun Mar  9 14:04:48 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2022/11/22 12:51:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.29 2025/03/09 14:04:48 jakllsch Exp $
 bin/${KRB5_PREFIX}su
 bin/afslog
 bin/bsearch
@@ -18,7 +18,7 @@ bin/kswitch
 bin/ktutil
 bin/otp
 bin/otpprint
-bin/pagsh
+bin/${KRB5_PREFIX}pagsh
 bin/string2key
 bin/verify_krb5_conf
 include/krb5/asn1-common.h
@@ -184,7 +184,7 @@ man/man1/kswitch.1
 man/man1/ktutil.1
 man/man1/otp.1
 man/man1/otpprint.1
-man/man1/pagsh.1
+man/man1/${KRB5_PREFIX}pagsh.1
 man/man3/HDB.3
 man/man3/arg_printusage.3
 man/man3/data.3

Index: pkgsrc/security/heimdal/options.mk
diff -u pkgsrc/security/heimdal/options.mk:1.6 pkgsrc/security/heimdal/options.mk:1.7
--- pkgsrc/security/heimdal/options.mk:1.6      Fri Oct 22 07:31:54 2021
+++ pkgsrc/security/heimdal/options.mk  Sun Mar  9 14:04:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2021/10/22 07:31:54 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2025/03/09 14:04:48 jakllsch Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.heimdal
 PKG_SUPPORTED_OPTIONS= inet6 kerberos-prefix-cmds ldap
@@ -38,10 +38,11 @@ heimdal-ldap-schema:
 ###
 .if !empty(PKG_OPTIONS:Mkerberos-prefix-cmds)
 KRB5_PREFIX=           k
-HEIMDAL_TRANSFORM=     s/^su/${KRB5_PREFIX}&/;
+HEIMDAL_TRANSFORM=     s/^su/${KRB5_PREFIX}&/;s/^pagsh/${KRB5_PREFIX}&/;
 CONFIGURE_ARGS+=       --program-transform-name=${HEIMDAL_TRANSFORM:Q}
 .else
 KRB5_PREFIX=           # empty
+CONFLICTS+=            openafs-[0-9]*
 .endif
 
 PLIST_SUBST+=          KRB5_PREFIX=${KRB5_PREFIX:Q}