Fri Jan 5 23:46:29 2024 UTC (142d)
mit-krb5: updated to 1.21.2

Major changes in 1.21.2 (2023-08-14)

Fix double-free in KDC TGS processing [CVE-2023-39975].

Major changes in 1.21.1 (2023-07-10)

Fix potential uninitialized pointer free in kadm5 XDR parsing [CVE-2023-36054].

Major changes in 1.21 (2023-06-05)

User experience
Added a credential cache type providing compatibility with the macOS 11 native credential cache.
Developer experience
libkadm5 will use the provided krb5_context object to read configuration values, instead of creating its own.
Added an interface to retrieve the ticket session key from a GSS context.
Protocol evolution
The KDC will no longer issue tickets with RC4 or triple-DES session keys unless explicitly configured with the new allow_rc4 or allow_des3 variables respectively.
The KDC will assume that all services can handle aes256-sha1 session keys unless the service principal has a session_enctypes string attribute.
Support for PAC full KDC checksums has been added to mitigate an S4U2Proxy privilege escalation attack.
The PKINIT client will advertise a more modern set of supported CMS algorithms.
Code quality
Removed unused code in libkrb5, libkrb5support, and the PKINIT module.
Modernized the KDC code for processing TGS requests, the code for encrypting and decrypting key data, the PAC handling code, and the GSS library packet parsing and composition code.
Improved the test framework's detection of memory errors in daemon processes when used with asan.


(adam)
diff -r1.116 -r1.117 pkgsrc/security/mit-krb5/Makefile
diff -r1.24 -r1.25 pkgsrc/security/mit-krb5/PLIST
diff -r1.17 -r1.18 pkgsrc/security/mit-krb5/buildlink3.mk
diff -r1.18 -r1.19 pkgsrc/security/mit-krb5/builtin.mk
diff -r1.80 -r1.81 pkgsrc/security/mit-krb5/distinfo
diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-kprop_kproplog.c
diff -r1.4 -r0 pkgsrc/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c
diff -r0 -r1.1 pkgsrc/security/mit-krb5/patches/patch-util_verto_verto-k5ev.c
Sat Jan 6 08:46:29 2024
Mon Jun 26 19:40:15 2023
pkgsrc/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c,v
anoncvs not yet been updated
cvs diff -r1.116 -r1.117 pkgsrc/security/mit-krb5/Makefile (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/Makefile 2023/10/24 22:10:52 1.116
+++ pkgsrc/security/mit-krb5/Makefile 2024/01/05 23:46:29 1.117
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.116 2023/10/24 22:10:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.117 2024/01/05 23:46:29 adam Exp $
2 2
3BRANCHNAME= 1.19 3BRANCHNAME= 1.21
4DISTNAME= krb5-${BRANCHNAME}.3 4DISTNAME= krb5-${BRANCHNAME}.2
5PKGNAME= mit-${DISTNAME} 5PKGNAME= mit-${DISTNAME}
6PKGREVISION= 1 
7CATEGORIES= security 6CATEGORIES= security
8# It is not clear how stable this URL scheme is. 7# It is not clear how stable this URL scheme is.
9MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${BRANCHNAME}/ 8MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${BRANCHNAME}/
10 9
11MAINTAINER= tez@NetBSD.org 10MAINTAINER= tez@NetBSD.org
12HOMEPAGE= https://web.mit.edu/kerberos/ 11HOMEPAGE= https://web.mit.edu/kerberos/
13COMMENT= MIT Kerberos 5 authentication system 12COMMENT= MIT Kerberos 5 authentication system
14 13
15# There is a file NOTICE in the sources, which is enormous. Most 14# There is a file NOTICE in the sources, which is enormous. Most
16# licenses appear to be some flavor of X11, 3-clause BSD, 4-clause 15# licenses appear to be some flavor of X11, 3-clause BSD, 4-clause
17# BSD. 16# BSD.
18# 20201007: gdt emailed upstream asking for clarification on the AES 17# 20201007: gdt emailed upstream asking for clarification on the AES
19# license, which is not entirely clearly Free, by the text. 18# license, which is not entirely clearly Free, by the text.
cvs diff -r1.24 -r1.25 pkgsrc/security/mit-krb5/PLIST (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/PLIST 2020/07/03 13:36:57 1.24
+++ pkgsrc/security/mit-krb5/PLIST 2024/01/05 23:46:29 1.25
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.24 2020/07/03 13:36:57 hauke Exp $ 1@comment $NetBSD: PLIST,v 1.25 2024/01/05 23:46:29 adam Exp $
2bin/compile_et 2bin/compile_et
3bin/gss-client 3bin/gss-client
4bin/k5srvutil 4bin/k5srvutil
5bin/kadmin 5bin/kadmin
6bin/kdestroy 6bin/kdestroy
7bin/kinit 7bin/kinit
8bin/klist 8bin/klist
9bin/kpasswd 9bin/kpasswd
10bin/krb5-config 10bin/krb5-config
11bin/ksu 11bin/ksu
12bin/kswitch 12bin/kswitch
13bin/ktutil 13bin/ktutil
14bin/kvno 14bin/kvno
@@ -52,55 +52,61 @@ include/krb5/hostrealm_plugin.h @@ -52,55 +52,61 @@ include/krb5/hostrealm_plugin.h
52include/krb5/kadm5_auth_plugin.h 52include/krb5/kadm5_auth_plugin.h
53include/krb5/kadm5_hook_plugin.h 53include/krb5/kadm5_hook_plugin.h
54include/krb5/kdcpolicy_plugin.h 54include/krb5/kdcpolicy_plugin.h
55include/krb5/kdcpreauth_plugin.h 55include/krb5/kdcpreauth_plugin.h
56include/krb5/krb5.h 56include/krb5/krb5.h
57include/krb5/localauth_plugin.h 57include/krb5/localauth_plugin.h
58include/krb5/locate_plugin.h 58include/krb5/locate_plugin.h
59include/krb5/plugin.h 59include/krb5/plugin.h
60include/krb5/preauth_plugin.h 60include/krb5/preauth_plugin.h
61include/krb5/pwqual_plugin.h 61include/krb5/pwqual_plugin.h
62include/profile.h 62include/profile.h
63include/verto-module.h 63include/verto-module.h
64include/verto.h 64include/verto.h
 65@pkgdir lib/krb5/plugins/authdata
65lib/krb5/plugins/kdb/db2.la 66lib/krb5/plugins/kdb/db2.la
66${PLIST.ldap}lib/krb5/plugins/kdb/kldap.la 67${PLIST.ldap}lib/krb5/plugins/kdb/kldap.la
67lib/krb5/plugins/kdb/klmdb.la 68lib/krb5/plugins/kdb/klmdb.la
 69@pkgdir lib/krb5/plugins/libkrb5
68lib/krb5/plugins/preauth/otp.la 70lib/krb5/plugins/preauth/otp.la
69lib/krb5/plugins/preauth/pkinit.la 71lib/krb5/plugins/preauth/pkinit.la
70lib/krb5/plugins/preauth/spake.la 72lib/krb5/plugins/preauth/spake.la
71lib/krb5/plugins/tls/k5tls.la 73lib/krb5/plugins/tls/k5tls.la
72lib/libcom_err.la 74lib/libcom_err.la
73lib/libgssapi_krb5.la 75lib/libgssapi_krb5.la
74lib/libgssrpc.la 76lib/libgssrpc.la
75lib/libk5crypto.la 77lib/libk5crypto.la
76lib/libkadm5clnt.la 78lib/libkadm5clnt.la
77lib/libkadm5clnt_mit.la 79lib/libkadm5clnt_mit.la
78lib/libkadm5srv.la 80lib/libkadm5srv.la
79lib/libkadm5srv_mit.la 81lib/libkadm5srv_mit.la
80lib/libkdb5.la 82lib/libkdb5.la
81${PLIST.ldap}lib/libkdb_ldap.la 83${PLIST.ldap}lib/libkdb_ldap.la
82lib/libkrad.la 84lib/libkrad.la
83lib/libkrb5.la 85lib/libkrb5.la
84lib/libkrb5support.la 86lib/libkrb5support.la
85lib/libverto.la 87lib/libverto.la
86lib/pkgconfig/gssrpc.pc 88lib/pkgconfig/gssrpc.pc
87lib/pkgconfig/kadm-client.pc 89lib/pkgconfig/kadm-client.pc
88lib/pkgconfig/kadm-server.pc 90lib/pkgconfig/kadm-server.pc
89lib/pkgconfig/kdb.pc 91lib/pkgconfig/kdb.pc
90lib/pkgconfig/krb5-gssapi.pc 92lib/pkgconfig/krb5-gssapi.pc
91lib/pkgconfig/krb5.pc 93lib/pkgconfig/krb5.pc
92lib/pkgconfig/mit-krb5-gssapi.pc 94lib/pkgconfig/mit-krb5-gssapi.pc
93lib/pkgconfig/mit-krb5.pc 95lib/pkgconfig/mit-krb5.pc
 96@pkgdir man/cat1
 97@pkgdir man/cat5
 98@pkgdir man/cat7
 99@pkgdir man/cat8
94man/man1/compile_et.1 100man/man1/compile_et.1
95man/man1/k5srvutil.1 101man/man1/k5srvutil.1
96man/man1/kadmin.1 102man/man1/kadmin.1
97man/man1/kdestroy.1 103man/man1/kdestroy.1
98man/man1/kinit.1 104man/man1/kinit.1
99man/man1/klist.1 105man/man1/klist.1
100man/man1/kpasswd.1 106man/man1/kpasswd.1
101man/man1/krb5-config.1 107man/man1/krb5-config.1
102man/man1/ksu.1 108man/man1/ksu.1
103man/man1/kswitch.1 109man/man1/kswitch.1
104man/man1/ktutil.1 110man/man1/ktutil.1
105man/man1/kvno.1 111man/man1/kvno.1
106man/man1/sclient.1 112man/man1/sclient.1
@@ -129,22 +135,17 @@ sbin/kdb5_util @@ -129,22 +135,17 @@ sbin/kdb5_util
129sbin/kprop 135sbin/kprop
130sbin/kpropd 136sbin/kpropd
131sbin/kproplog 137sbin/kproplog
132sbin/krb5-send-pr 138sbin/krb5-send-pr
133sbin/krb5kdc 139sbin/krb5kdc
134sbin/sim_server 140sbin/sim_server
135sbin/sserver 141sbin/sserver
136sbin/uuserver 142sbin/uuserver
137share/et/et_c.awk 143share/et/et_c.awk
138share/et/et_h.awk 144share/et/et_h.awk
139share/examples/krb5/kdc.conf 145share/examples/krb5/kdc.conf
140share/examples/krb5/krb5.conf 146share/examples/krb5/krb5.conf
141share/examples/krb5/services.append 147share/examples/krb5/services.append
 148@pkgdir share/gnats
142share/locale/de/LC_MESSAGES/mit-krb5.mo 149share/locale/de/LC_MESSAGES/mit-krb5.mo
143share/locale/en_US/LC_MESSAGES/mit-krb5.mo 150share/locale/en_US/LC_MESSAGES/mit-krb5.mo
144@pkgdir share/gnats 151share/locale/ka/LC_MESSAGES/mit-krb5.mo
145@pkgdir man/cat8 
146@pkgdir man/cat7 
147@pkgdir man/cat5 
148@pkgdir man/cat1 
149@pkgdir lib/krb5/plugins/libkrb5 
150@pkgdir lib/krb5/plugins/authdata 
cvs diff -r1.17 -r1.18 pkgsrc/security/mit-krb5/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/buildlink3.mk 2022/07/29 20:22:44 1.17
+++ pkgsrc/security/mit-krb5/buildlink3.mk 2024/01/05 23:46:29 1.18
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.17 2022/07/29 20:22:44 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.18 2024/01/05 23:46:29 adam Exp $
2 2
3BUILDLINK_TREE+= mit-krb5 3BUILDLINK_TREE+= mit-krb5
4 4
5.if !defined(MIT_KRB5_BUILDLINK3_MK) 5.if !defined(MIT_KRB5_BUILDLINK3_MK)
6MIT_KRB5_BUILDLINK3_MK:= 6MIT_KRB5_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4 8BUILDLINK_API_DEPENDS.mit-krb5+= mit-krb5>=1.4
9BUILDLINK_ABI_DEPENDS.mit-krb5?= mit-krb5>=1.18.4nb1 9BUILDLINK_ABI_DEPENDS.mit-krb5+= mit-krb5>=1.18.4nb1
10BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5 10BUILDLINK_PKGSRCDIR.mit-krb5?= ../../security/mit-krb5
11.endif # MIT_KRB5_BUILDLINK3_MK 11.endif # MIT_KRB5_BUILDLINK3_MK
12 12
13BUILDLINK_TREE+= -mit-krb5 13BUILDLINK_TREE+= -mit-krb5
cvs diff -r1.18 -r1.19 pkgsrc/security/mit-krb5/builtin.mk (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/builtin.mk 2022/07/29 20:22:44 1.18
+++ pkgsrc/security/mit-krb5/builtin.mk 2024/01/05 23:46:29 1.19
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1# $NetBSD: builtin.mk,v 1.18 2022/07/29 20:22:44 jperkin Exp $ 1# $NetBSD: builtin.mk,v 1.19 2024/01/05 23:46:29 adam Exp $
2 2
3BUILTIN_PKG:= mit-krb5 3BUILTIN_PKG:= mit-krb5
4 4
5.include "../../mk/bsd.fast.prefs.mk" 5.include "../../mk/bsd.fast.prefs.mk"
6 6
7BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5 7BUILTIN_FIND_HEADERS_VAR:= H_MIT_KRB5
8.if !(empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \ 8.if !(!${MACHINE_PLATFORM:MDarwin-9.*-*} && \
9 empty(MACHINE_PLATFORM:MDarwin-1?.*-*)) 9 empty(MACHINE_PLATFORM:MDarwin-1?.*-*))
10BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h 10BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h
11.elif !empty(MACHINE_PLATFORM:MSunOS-*-*) 11.elif ${MACHINE_PLATFORM:MSunOS-*-*}
12BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h 12BUILTIN_FIND_HEADERS.H_MIT_KRB5= kerberosv5/krb5.h
13.elif !empty(MACHINE_PLATFORM:MLinux-*) 13.elif ${MACHINE_PLATFORM:MLinux-*}
14# Assuming mit-krb5 >= 1.5 on GNU/Linux. 14# Assuming mit-krb5 >= 1.5 on GNU/Linux.
15BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h 15BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5/krb5.h
16.else 16.else
17BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h 17BUILTIN_FIND_HEADERS.H_MIT_KRB5= krb5.h
18.endif 18.endif
19BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts 19BUILTIN_FIND_GREP.H_MIT_KRB5= Massachusetts
20BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG 20BUILTIN_FIND_FILES_VAR:= SH_KRB5_CONFIG
21BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config 21BUILTIN_FIND_FILES.SH_KRB5_CONFIG= /usr/bin/krb5-config
22BUILTIN_FIND_FILES.SH_KRB5_CONFIG+= /usr/lib/mit/bin/krb5-config 22BUILTIN_FIND_FILES.SH_KRB5_CONFIG+= /usr/lib/mit/bin/krb5-config
23BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version) 23BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*--version)
24 24
25.include "../../mk/buildlink3/bsd.builtin.mk" 25.include "../../mk/buildlink3/bsd.builtin.mk"
26 26
@@ -31,70 +31,70 @@ BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]* @@ -31,70 +31,70 @@ BUILTIN_FIND_GREP.SH_KRB5_CONFIG= ^[ ]*
31.if !defined(IS_BUILTIN.mit-krb5) 31.if !defined(IS_BUILTIN.mit-krb5)
32IS_BUILTIN.mit-krb5= no 32IS_BUILTIN.mit-krb5= no
33. if empty(H_MIT_KRB5:M__nonexistent__) && empty(H_MIT_KRB5:M${LOCALBASE}/*) 33. if empty(H_MIT_KRB5:M__nonexistent__) && empty(H_MIT_KRB5:M${LOCALBASE}/*)
34IS_BUILTIN.mit-krb5= yes 34IS_BUILTIN.mit-krb5= yes
35. endif 35. endif
36.endif 36.endif
37MAKEVARS+= IS_BUILTIN.mit-krb5 37MAKEVARS+= IS_BUILTIN.mit-krb5
38 38
39### 39###
40### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to 40### If there is a built-in implementation, then set BUILTIN_PKG.<pkg> to
41### a package name to represent the built-in package. 41### a package name to represent the built-in package.
42### 42###
43.if !defined(BUILTIN_PKG.mit-krb5) && \ 43.if !defined(BUILTIN_PKG.mit-krb5) && \
44 !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS]) 44 ${IS_BUILTIN.mit-krb5:tl} == yes
45. if empty(SH_KRB5_CONFIG:M__nonexistent__) 45. if empty(SH_KRB5_CONFIG:M__nonexistent__)
46BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \ 46BUILTIN_VERSION.mit-krb5!= ${SH_KRB5_CONFIG} --version | \
47 ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//' 47 ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
48. endif 48. endif
49BUILTIN_VERSION.mit-krb5?= 1.4.0 49BUILTIN_VERSION.mit-krb5?= 1.4.0
50BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5} 50BUILTIN_PKG.mit-krb5= mit-krb5-${BUILTIN_VERSION.mit-krb5}
51.endif 51.endif
52MAKEVARS+= BUILTIN_PKG.mit-krb5 52MAKEVARS+= BUILTIN_PKG.mit-krb5
53 53
54### 54###
55### Determine whether we should use the built-in implementation if it 55### Determine whether we should use the built-in implementation if it
56### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no"). 56### exists, and set USE_BUILTIN.<pkg> appropriate ("yes" or "no").
57### 57###
58.if !defined(USE_BUILTIN.mit-krb5) 58.if !defined(USE_BUILTIN.mit-krb5)
59. if ${PREFER.mit-krb5} == "pkgsrc" 59. if ${PREFER.mit-krb5} == "pkgsrc"
60USE_BUILTIN.mit-krb5= no 60USE_BUILTIN.mit-krb5= no
61. else 61. else
62USE_BUILTIN.mit-krb5= ${IS_BUILTIN.mit-krb5} 62USE_BUILTIN.mit-krb5= ${IS_BUILTIN.mit-krb5}
63. if defined(BUILTIN_PKG.mit-krb5) && \ 63. if defined(BUILTIN_PKG.mit-krb5) && \
64 !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS]) 64 ${IS_BUILTIN.mit-krb5:tl} == yes
65USE_BUILTIN.mit-krb5= yes 65USE_BUILTIN.mit-krb5= yes
66. for dep__ in ${BUILDLINK_API_DEPENDS.mit-krb5} 66. for dep__ in ${BUILDLINK_API_DEPENDS.mit-krb5}
67. if !empty(USE_BUILTIN.mit-krb5:M[yY][eE][sS]) 67. if ${USE_BUILTIN.mit-krb5:tl} == yes
68USE_BUILTIN.mit-krb5!= \ 68USE_BUILTIN.mit-krb5!= \
69 if ${PKG_ADMIN} pmatch ${dep__:Q} ${BUILTIN_PKG.mit-krb5:Q}; then \ 69 if ${PKG_ADMIN} pmatch ${dep__:Q} ${BUILTIN_PKG.mit-krb5}; then \
70 ${ECHO} "yes"; \ 70 ${ECHO} "yes"; \
71 else \ 71 else \
72 ${ECHO} "no"; \ 72 ${ECHO} "no"; \
73 fi 73 fi
74. endif 74. endif
75. endfor 75. endfor
76. endif 76. endif
77. endif 77. endif
78.endif 78.endif
79MAKEVARS+= USE_BUILTIN.mit-krb5 79MAKEVARS+= USE_BUILTIN.mit-krb5
80 80
81### 81###
82### The section below only applies if we are not including this file 82### The section below only applies if we are not including this file
83### solely to determine whether a built-in implementation exists. 83### solely to determine whether a built-in implementation exists.
84### 84###
85CHECK_BUILTIN.mit-krb5?= no 85CHECK_BUILTIN.mit-krb5?= no
86.if !empty(CHECK_BUILTIN.mit-krb5:M[nN][oO]) 86.if ${CHECK_BUILTIN.mit-krb5:tl} == no
87. if !empty(USE_BUILTIN.mit-krb5:M[yY][eE][sS]) 87. if ${USE_BUILTIN.mit-krb5:tl} == yes
88KRB5_CONFIG?= ${SH_KRB5_CONFIG} 88KRB5_CONFIG?= ${SH_KRB5_CONFIG}
89ALL_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q} 89ALL_ENV+= KRB5_CONFIG=${KRB5_CONFIG:Q}
90 90
91BUILDLINK_CPPFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --cflags 91BUILDLINK_CPPFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --cflags
92BUILDLINK_LDFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --libs 92BUILDLINK_LDFLAGS.mit-krb5!= ${SH_KRB5_CONFIG} --libs
93 93
94# 94#
95# The SunOS builtin krb5-config does not support all of the arguments that the 95# The SunOS builtin krb5-config does not support all of the arguments that the
96# MIT version does so we install a fake script which strips them out. 96# MIT version does so we install a fake script which strips them out.
97# 97#
98. if ${OPSYS} == "SunOS" 98. if ${OPSYS} == "SunOS"
99KRB5_CONFIG= ${BUILDLINK_DIR}/bin/krb5-config 99KRB5_CONFIG= ${BUILDLINK_DIR}/bin/krb5-config
100BUILDLINK_CPPFLAGS.mit-krb5+= -I/usr/include/gssapi 100BUILDLINK_CPPFLAGS.mit-krb5+= -I/usr/include/gssapi
cvs diff -r1.80 -r1.81 pkgsrc/security/mit-krb5/distinfo (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/distinfo 2022/07/29 20:22:44 1.80
+++ pkgsrc/security/mit-krb5/distinfo 2024/01/05 23:46:29 1.81
@@ -1,32 +1,32 @@ @@ -1,32 +1,32 @@
1$NetBSD: distinfo,v 1.80 2022/07/29 20:22:44 jperkin Exp $ 1$NetBSD: distinfo,v 1.81 2024/01/05 23:46:29 adam Exp $
2 2
3BLAKE2s (krb5-1.19.3.tar.gz) = 25b6d084dcc560252f6ee576da976a6f6a1972537eb355dc0aa240dcab4400d2 3BLAKE2s (krb5-1.21.2.tar.gz) = 409811ddde6dd93f489a655aa558e668af2a9fcf6768973d2109442feb828907
4SHA512 (krb5-1.19.3.tar.gz) = 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351 4SHA512 (krb5-1.21.2.tar.gz) = 4e09296b412383d53872661718dbfaa90201e0d85f69db48e57a8d4bd73c95a90c7ec7b6f0f325f6bc967f8d203b256b071c0191facf080aca0e2caec5d0ac49
5Size (krb5-1.19.3.tar.gz) = 8741343 bytes 5Size (krb5-1.21.2.tar.gz) = 8622513 bytes
6SHA1 (patch-Makefile.in) = 24f915d7a4340b9a4a454b9b67c94147fdc49c34 6SHA1 (patch-Makefile.in) = 24f915d7a4340b9a4a454b9b67c94147fdc49c34
7SHA1 (patch-aclocal.m4) = 07b5d9ae38c74eaea6ba62aed9062dca1bf7f3fb 7SHA1 (patch-aclocal.m4) = 07b5d9ae38c74eaea6ba62aed9062dca1bf7f3fb
8SHA1 (patch-build-tools_krb5-config.in) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a 8SHA1 (patch-build-tools_krb5-config.in) = 4ab922df1d86d86f9ef043f2c5cdf048c0477d3a
9SHA1 (patch-ccapi_test_test__ccapi.sh) = 5210f31dd23e6f556d40f5ff2b436bf395eef4d0 9SHA1 (patch-ccapi_test_test__ccapi.sh) = 5210f31dd23e6f556d40f5ff2b436bf395eef4d0
10SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007 10SHA1 (patch-config_lib.in) = 974db26486b3239e4fcd53be7280b32c802f6007
11SHA1 (patch-config_libnover.in) = 9337e06792e2dcc50c610503ef842ebfc18fc08b 11SHA1 (patch-config_libnover.in) = 9337e06792e2dcc50c610503ef842ebfc18fc08b
12SHA1 (patch-config_libobj.in) = c7395b9de5baf6612b8787fad55dbc051a680bfd 12SHA1 (patch-config_libobj.in) = c7395b9de5baf6612b8787fad55dbc051a680bfd
13SHA1 (patch-config_libpriv.in) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b 13SHA1 (patch-config_libpriv.in) = 78342f649f8e9d3a3b5a4f83e65b6c46f589586b
14SHA1 (patch-config_pre.in) = 255973132db9327190211214c3e33b4551bd283b 14SHA1 (patch-config_pre.in) = 255973132db9327190211214c3e33b4551bd283b
15SHA1 (patch-config_shlib.conf) = 74859f18c5bf7c723face05873a219a839b28942 15SHA1 (patch-config_shlib.conf) = 74859f18c5bf7c723face05873a219a839b28942
16SHA1 (patch-include_osconf.hin) = d31a8164f417bc31a787c8e16d1bd24f27b7140d 16SHA1 (patch-include_osconf.hin) = d31a8164f417bc31a787c8e16d1bd24f27b7140d
17SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d 17SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d
18SHA1 (patch-kprop_kproplog.c) = 9b751de7eb70d026b54e15275bb878bdb0ce52eb 18SHA1 (patch-kprop_kproplog.c) = cbfd43495d40ecd9edf427c3dfb135b0fe2c9546
19SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7 19SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7
20SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c 20SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c
21SHA1 (patch-lib_gssapi_Makefile.in) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3 21SHA1 (patch-lib_gssapi_Makefile.in) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
22SHA1 (patch-lib_gssapi_krb5_import__name.c) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa 22SHA1 (patch-lib_gssapi_krb5_import__name.c) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
23SHA1 (patch-lib_kdb_Makefile.in) = 0c45e34ea8b5d0270c386d430b0d37469e8440ea 23SHA1 (patch-lib_kdb_Makefile.in) = 0c45e34ea8b5d0270c386d430b0d37469e8440ea
24SHA1 (patch-lib_kdb_kdb__log.c) = dc759fae6099e7586686bcf14d7cd775854e0360 24SHA1 (patch-lib_kdb_kdb__log.c) = dc759fae6099e7586686bcf14d7cd775854e0360
25SHA1 (patch-lib_krb5_ccache_Makefile.in) = 330ae21ec3b290ae16478c2c49a138acac5bf2fd 25SHA1 (patch-lib_krb5_ccache_Makefile.in) = 330ae21ec3b290ae16478c2c49a138acac5bf2fd
26SHA1 (patch-plugins_kdb_db2_Makefile.in) = eae56f7f450a299bdf1d86ee491af1fd51bd1d0c 26SHA1 (patch-plugins_kdb_db2_Makefile.in) = eae56f7f450a299bdf1d86ee491af1fd51bd1d0c
27SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9 27SHA1 (patch-plugins_kdb_db2_libdb2_Makefile.in) = b4b7e8e4192b5e5318f1e42c49315789619f3ae9
28SHA1 (patch-plugins_kdb_ldap_ldap__util_Makefile.in) = 7aa0f44cc02c523c837e7e3e1766624d2323deb9 28SHA1 (patch-plugins_kdb_ldap_ldap__util_Makefile.in) = 7aa0f44cc02c523c837e7e3e1766624d2323deb9
29SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8 29SHA1 (patch-plugins_preauth_otp_Makefile.in) = 8c779e3b37cab4138f300f4a09325387092c79f8
30SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = 7d9e5429737536bf1577a41040e6587bb55d8142 30SHA1 (patch-plugins_preauth_pkinit_Makefile.in) = 7d9e5429737536bf1577a41040e6587bb55d8142
31SHA1 (patch-util_k5ev_verto-k5ev.c) = 8f074ddccbaaa03576f0302437aed3aaad1b738d 
32SHA1 (patch-util_ss_Makefile.in) = 5ca0bf7295a8f4c1d8e59097863940f88d224ee7 31SHA1 (patch-util_ss_Makefile.in) = 5ca0bf7295a8f4c1d8e59097863940f88d224ee7
 32SHA1 (patch-util_verto_verto-k5ev.c) = 8f074ddccbaaa03576f0302437aed3aaad1b738d
cvs diff -r1.1 -r1.2 pkgsrc/security/mit-krb5/patches/patch-kprop_kproplog.c (expand / switch to unified diff)

--- pkgsrc/security/mit-krb5/patches/patch-kprop_kproplog.c 2020/04/09 10:57:49 1.1
+++ pkgsrc/security/mit-krb5/patches/patch-kprop_kproplog.c 2024/01/05 23:46:29 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-kprop_kproplog.c,v 1.1 2020/04/09 10:57:49 adam Exp $ 1$NetBSD: patch-kprop_kproplog.c,v 1.2 2024/01/05 23:46:29 adam Exp $
2 2
3Fix mmap -Werror=incompatible-pointer-types. 3Fix mmap -Werror=incompatible-pointer-types.
4 4
5--- kprop/kproplog.c.orig 2020-04-09 08:50:26.000000000 +0000 5--- kprop/kproplog.c.orig 2023-08-14 16:16:43.000000000 +0000
6+++ kprop/kproplog.c 6+++ kprop/kproplog.c
7@@ -412,7 +412,7 @@ map_ulog(const char *filename) 7@@ -415,7 +415,7 @@ map_ulog(const char *filename, int *fd_o
8 return NULL; 8 close(fd);
9 if (fstat(fd, &st) < 0) 
10 return NULL; 9 return NULL;
 10 }
11- ulog = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); 11- ulog = mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
12+ ulog = (kdb_hlog_t *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); 12+ ulog = (kdb_hlog_t *)mmap(0, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
13 return (ulog == MAP_FAILED) ? NULL : ulog; 13 if (ulog == MAP_FAILED) {
14 } 14 close(fd);
15  15 return NULL;
File Deleted: pkgsrc/security/mit-krb5/patches/patch-util_k5ev_verto-k5ev.c
File Added: pkgsrc/security/mit-krb5/patches/patch-util_verto_verto-k5ev.c
$NetBSD: patch-util_verto_verto-k5ev.c,v 1.1 2024/01/05 23:46:29 adam Exp $

Fix include file path

--- util/verto/verto-k5ev.c.orig	2018-05-03 14:34:47.000000000 +0000
+++ util/verto/verto-k5ev.c
@@ -35,7 +35,7 @@
 
 #include <verto.h>
 #include <verto-module.h>
-#include "rename.h"
+#include "gssrpc/rename.h"
 
 /* Ignore some warnings generated by the libev code, which the libev maintainer
  * isn't interested in avoiding. */