CVS commit: pkgsrc/security/mit-krb5

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon May  6 08:20:32 UTC 2019

Modified Files:
        pkgsrc/security/mit-krb5: Makefile builtin.mk distinfo
Added Files:
        pkgsrc/security/mit-krb5/patches: patch-lib_crypto_builtin_pbkdf2.c

Log Message:
mit-krb5: update to 1.16.2nb1.

Fix conflict with hmac symbol from libc, from Naveen Narayanan.
Update configure option, it was renamed. Bump PKGREVISION for that.
Small pkglint fix while here.


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/security/mit-krb5/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/security/mit-krb5/builtin.mk
cvs rdiff -u -r1.66 -r1.67 pkgsrc/security/mit-krb5/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/mit-krb5/patches/patch-lib_crypto_builtin_pbkdf2.c

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

Modified files:

Index: pkgsrc/security/mit-krb5/Makefile
diff -u pkgsrc/security/mit-krb5/Makefile:1.99 pkgsrc/security/mit-krb5/Makefile:1.100
--- pkgsrc/security/mit-krb5/Makefile:1.99      Fri Dec 21 15:45:13 2018
+++ pkgsrc/security/mit-krb5/Makefile   Mon May  6 08:20:32 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.99 2018/12/21 15:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.100 2019/05/06 08:20:32 wiz Exp $
 
 DISTNAME=      krb5-1.16.2
 PKGNAME=       mit-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  http://web.mit.edu/kerberos/dist/krb5/${PKGVERSION_NOREV:R}/
 
@@ -40,7 +41,7 @@ CONFIGURE_ARGS+=      --localstatedir=${MIT_K
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --enable-shared
 CONFIGURE_ARGS+=       --enable-dns-for-realm
-CONFIGURE_ARGS+=       --enable-kdc-replay-cache
+CONFIGURE_ARGS+=       --disable-kdc-lookaside-cache
 CONFIGURE_ARGS+=       --disable-thread-support
 CONFIGURE_ARGS+=       --without-tcl
 CONFIGURE_ARGS+=       --enable-pkgsrc-libtool

Index: pkgsrc/security/mit-krb5/builtin.mk
diff -u pkgsrc/security/mit-krb5/builtin.mk:1.14 pkgsrc/security/mit-krb5/builtin.mk:1.15
--- pkgsrc/security/mit-krb5/builtin.mk:1.14    Fri Jun 15 20:46:01 2018
+++ pkgsrc/security/mit-krb5/builtin.mk Mon May  6 08:20:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.14 2018/06/15 20:46:01 tez Exp $
+# $NetBSD: builtin.mk,v 1.15 2019/05/06 08:20:32 wiz Exp $
 
 BUILTIN_PKG:=  mit-krb5
 
@@ -98,6 +98,7 @@ BUILDLINK_CPPFLAGS.mit-krb5+= -I/usr/inc
 BUILDLINK_LDFLAGS.mit-krb5+=   -lgss
 BUILDLINK_TARGETS+=            fake-krb5-config
 
+.PHONY: fake-krb5-config
 fake-krb5-config:
        ${RUN}                                                          \
        src=../../security/mit-krb5/files/krb5-config-wrapper.sh;       \

Index: pkgsrc/security/mit-krb5/distinfo
diff -u pkgsrc/security/mit-krb5/distinfo:1.66 pkgsrc/security/mit-krb5/distinfo:1.67
--- pkgsrc/security/mit-krb5/distinfo:1.66      Fri Dec 21 15:45:13 2018
+++ pkgsrc/security/mit-krb5/distinfo   Mon May  6 08:20:32 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.66 2018/12/21 15:45:13 adam Exp $
+$NetBSD: distinfo,v 1.67 2019/05/06 08:20:32 wiz Exp $
 
 SHA1 (krb5-1.16.2.tar.gz) = 6d6ef205194be386fb5f4e6bef32cb9fc79e853b
 RMD160 (krb5-1.16.2.tar.gz) = 76188113d13eb9667d6057fe23d653a3d09d4817
@@ -18,6 +18,7 @@ SHA1 (patch-include_osconf.hin) = d31a81
 SHA1 (patch-kadmin_cli_ss_wrapper.c) = e32e6180f8d508cb2eb18489ce2fef0a1ad0f51d
 SHA1 (patch-lib_apputils_Makefile.in) = 085004041a2bb8c4bb3074c2e71e71f22f4f06d7
 SHA1 (patch-lib_apputils_udppktinfo.c) = 47ac861181faebfe5f95c28be329ce917ece872c
+SHA1 (patch-lib_crypto_builtin_pbkdf2.c) = d36cd73761bd139ab1d134d6d57b570ca98851a4
 SHA1 (patch-lib_gssapi_Makefile.in) = 806b089d3b12ea9a17c6caab59cbdeb6ec17bbc3
 SHA1 (patch-lib_gssapi_krb5_import__name.c) = 7445639b82eadf9b1feb1448c1654fa6ddc937aa
 SHA1 (patch-lib_kdb_Makefile.in) = 0c45e34ea8b5d0270c386d430b0d37469e8440ea

Added files:

Index: pkgsrc/security/mit-krb5/patches/patch-lib_crypto_builtin_pbkdf2.c
diff -u /dev/null pkgsrc/security/mit-krb5/patches/patch-lib_crypto_builtin_pbkdf2.c:1.1
--- /dev/null   Mon May  6 08:20:32 2019
+++ pkgsrc/security/mit-krb5/patches/patch-lib_crypto_builtin_pbkdf2.c  Mon May  6 08:20:32 2019
@@ -0,0 +1,33 @@
+$NetBSD: patch-lib_crypto_builtin_pbkdf2.c,v 1.1 2019/05/06 08:20:32 wiz Exp $
+
+Fix conflict with hmac() symbol in libc.
+
+--- lib/crypto/builtin/pbkdf2.c.orig   2018-11-01 23:51:07.000000000 +0000
++++ lib/crypto/builtin/pbkdf2.c
+@@ -75,7 +75,7 @@ static void printd (const char *descr, k
+  * index appended to the original salt.
+  */
+ static krb5_error_code
+-hmac(const struct krb5_hash_provider *hash, krb5_keyblock *pass,
++krb5_hmac(const struct krb5_hash_provider *hash, krb5_keyblock *pass,
+      krb5_data *salt, krb5_data *out)
+ {
+     krb5_error_code err;
+@@ -123,7 +123,7 @@ F(char *output, char *u_tmp1, char *u_tm
+ #if 0
+     printf("F: computing hmac #1 (U_1) with %s\n", pdata.contents);
+ #endif
+-    err = hmac(hash, pass, &sdata, &out);
++    err = krb5_hmac(hash, pass, &sdata, &out);
+     if (err)
+         return err;
+ #if 0
+@@ -138,7 +138,7 @@ F(char *output, char *u_tmp1, char *u_tm
+         printf("F: computing hmac #%d (U_%d)\n", j, j);
+ #endif
+         memcpy(u_tmp2, u_tmp1, hlen);
+-        err = hmac(hash, pass, &sdata, &out);
++        err = krb5_hmac(hash, pass, &sdata, &out);
+         if (err)
+             return err;
+ #if 0