[pkgsrc/trunk]: pkgsrc/security/sudo Fix building this package with Kerberos ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12fd9dba7c8c
branches:  trunk
changeset: 471232:12fd9dba7c8c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Mar 22 08:45:56 2004 +0000

description:
Fix building this package with Kerberos 5 support -- the misdeclared
krb5_mcc_ops variable is "const" in both Heimdal and in MIT krb5.

diffstat:

 security/sudo/Makefile         |  10 +++++-----
 security/sudo/distinfo         |   3 ++-
 security/sudo/patches/patch-ab |  13 +++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r be7789207f23 -r 12fd9dba7c8c security/sudo/Makefile
--- a/security/sudo/Makefile    Mon Mar 22 08:27:13 2004 +0000
+++ b/security/sudo/Makefile    Mon Mar 22 08:45:56 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/01/05 11:37:13 jlam Exp $
+# $NetBSD: Makefile,v 1.63 2004/03/22 08:45:56 jlam Exp $
 #
 
 DISTNAME=              sudo-1.6.7p5
@@ -33,11 +33,11 @@
 .endif
 
 .if defined(KERBEROS)
-PKG_USE_KERBEROS=      # defined
-CONFIGURE_ARGS+=       --with-kerb4 --with-kerb5
-CPPFLAGS+=             -I/usr/include/krb5
+CONFIGURE_ARGS+=       --without-kerb4
+.  include "../../mk/krb5.buildlink3.mk"
+CONFIGURE_ARGS+=       --with-kerb5
 .else
-CONFIGURE_ARGS+=       --without-kerb4 --without-kerb5
+CONFIGURE_ARGS+=       --without-kerb5
 .endif
 
 CONFIGURE_ARGS+=       --with-nbsdops --disable-path-info
diff -r be7789207f23 -r 12fd9dba7c8c security/sudo/distinfo
--- a/security/sudo/distinfo    Mon Mar 22 08:27:13 2004 +0000
+++ b/security/sudo/distinfo    Mon Mar 22 08:45:56 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.18 2003/05/09 08:29:14 wiz Exp $
+$NetBSD: distinfo,v 1.19 2004/03/22 08:45:56 jlam Exp $
 
 SHA1 (sudo-1.6.7p5.tar.gz) = 6814bd874c5d42781757b5cbab1961c05cc26c8f
 Size (sudo-1.6.7p5.tar.gz) = 349785 bytes
 SHA1 (patch-aa) = 23c35edd2aad78cc94881a8b03e2ade66dc7c993
+SHA1 (patch-ab) = f2c3a6a10568a6bd394504360a1f53f2fcfc5123
 SHA1 (patch-af) = 33ed24f6c812f3a2fc5fead32352d0dbf199b248
 SHA1 (patch-ag) = 40b6a5a97f6bed16248cb2c1d94ce7f42aba9b2a
diff -r be7789207f23 -r 12fd9dba7c8c security/sudo/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/sudo/patches/patch-ab    Mon Mar 22 08:45:56 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.9 2004/03/22 08:45:56 jlam Exp $
+
+--- auth/kerb5.c.orig  Mon Apr 21 17:19:15 2003
++++ auth/kerb5.c       Mon Mar 22 03:34:44 2004
+@@ -88,7 +88,7 @@
+ } sudo_krb5_data = { NULL, NULL, NULL };
+ typedef struct _sudo_krb5_data *sudo_krb5_datap;
+ 
+-extern krb5_cc_ops krb5_mcc_ops;
++extern const krb5_cc_ops krb5_mcc_ops;
+ 
+ int
+ kerb5_init(pw, promptp, auth)