tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

2 Patches to security/krb5/


I'm carrying two patches since quite some time. I'd like to commit them
to CVS, finally. One is about modern installs of mit-krb5 in Linux
differing in the headers and breaking An example is an
install of Ubuntu 20.04:

$ grep Massa /usr/include/krb5/krb5.h 
 * Copyright 1989, 1990, 1995, 2001, 2003, 2007, 2011 by the Massachusetts
$ cat /usr/include/krb5.h 
/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
/* The MIT Kerberos header file krb5.h used to live here.

   As of the 1.5 release, we're installing multiple Kerberos headers,
   so they're all moving to a krb5/ subdirectory.  This file is
   present just to keep old software still compiling.  Please update
   your code to use the new path for the header.  */
#include <krb5/krb5.h>

Because of that, this patch is needed (you see how old it already

--- pkgsrc-2015Q4/security/mit-krb5/	2014-02-28 13:17:20.000000000 +0100
+++ pkgsrc/security/mit-krb5/	2015-11-04 15:55:49.281124121 +0100
@@ -10,9 +10,12 @@
 .elif !empty(MACHINE_PLATFORM:MSunOS-*-*)
 BUILTIN_FIND_HEADERS.H_MIT_KRB5=	kerberosv5/krb5.h
+.elif !empty(MACHINE_PLATFORM:MLinux-*)
+# Assuming mit-krb5 >= 1.5 on GNU/Linux.
+BUILTIN_FIND_HEADERS.H_MIT_KRB5=        krb5/krb5.h
-BUILTIN_FIND_GREP.H_MIT_KRB5=		Massachusetts Institute of Technology
 BUILTIN_FIND_FILES.SH_KRB5_CONFIG=	/usr/bin/krb5-config
 .include "../../mk/buildlink3/"

Then, I am also carrying this patch originating from jperkin, where I
lost track a bit:

--- a/security/mit-krb5/
+++ b/security/mit-krb5/
@@ -88,6 +88,10 @@ ALL_ENV+=	KRB5_CONFIG=${KRB5_CONFIG:Q}!=	${SH_KRB5_CONFIG} --cflags!=	${SH_KRB5_CONFIG} --libs
+.    if !empty(SH_KRB5_CONFIG:M/usr/lib/mit/*)	/usr/lib/mit
+.    endif
 # The SunOS builtin krb5-config does not support all of the arguments that the
 # MIT version does so we install a fake script which strips them out.

I guess this has been communicated on IRC some time. I do not see that
_I_ need this change (no /usr/lib/mit/), but maybe it I got it for a
reason? Jonathan?

Fine to commit?

Alrighty then,


Dr. Thomas Orgis
Universität Hamburg
RRZ / Basisinfrastruktur / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270

Attachment: smime.p7s
Description: S/MIME cryptographic signature

Home | Main Index | Thread Index | Old Index