diff options
| author | thorpej <thorpej@pkgsrc.org> | 2000-02-27 20:48:16 +0000 |
|---|---|---|
| committer | thorpej <thorpej@pkgsrc.org> | 2000-02-27 20:48:16 +0000 |
| commit | 565be9586ea5ee75e54abdd2c85ac75aeaa7bdb7 (patch) | |
| tree | 89f15933b83bbbb69463c3abf9adb62dccaeebcb | |
| parent | 92d7d5d056bbe009f8063235571eec8d80591fb5 (diff) | |
| download | pkgsrc-565be9586ea5ee75e54abdd2c85ac75aeaa7bdb7.tar.gz | |
Find krb5 includes/libraries as installed in a crypto-aware NetBSD
installation.
Still doesn't work; MIT Kerberos 5 is missing some calls that
sudo wants (tho Heimdal has them).
| -rw-r--r-- | security/sudo/files/patch-sum | 4 | ||||
| -rw-r--r-- | security/sudo/patches/patch-af | 44 |
2 files changed, 35 insertions, 13 deletions
diff --git a/security/sudo/files/patch-sum b/security/sudo/files/patch-sum index 4137b34f2d4..230e961a413 100644 --- a/security/sudo/files/patch-sum +++ b/security/sudo/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.3 1999/12/30 22:51:29 jlam Exp $ +$NetBSD: patch-sum,v 1.4 2000/02/27 20:48:16 thorpej Exp $ MD5 (patch-ab) = da4fc241e92a8a244c923d083bbadaf0 -MD5 (patch-af) = bca79c3e2453b758e5277954820f53f9 +MD5 (patch-af) = 303e1db803e7abde9f4f7d753848734c diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 56ba45e69fe..a251cc15169 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.5 1999/12/30 22:51:29 jlam Exp $ +$NetBSD: patch-af,v 1.6 2000/02/27 20:48:18 thorpej Exp $ ---- configure.in.orig Wed Dec 8 23:04:45 1999 -+++ configure.in Thu Dec 30 17:14:53 1999 +--- configure.in.orig Thu Jan 27 12:01:37 2000 ++++ configure.in Sun Feb 27 12:33:56 2000 @@ -146,7 +146,7 @@ DEV="" ;; @@ -11,13 +11,10 @@ $NetBSD: patch-af,v 1.5 1999/12/30 22:51:29 jlam Exp $ ;; esac]) -@@ -162,6 +162,19 @@ +@@ -165,6 +165,19 @@ ;; - no) ;; - *) echo "Ignoring unknown argument to --with-csops: $with_csops" -+ ;; -+esac]) -+ + esac]) + +AC_ARG_WITH(nbsdops, [ --with-nbsdops add NetBSD standard options], +[case $with_nbsdops in + yes) echo 'Adding NetBSD standard options' @@ -28,6 +25,31 @@ $NetBSD: patch-af,v 1.5 1999/12/30 22:51:29 jlam Exp $ + ;; + no) ;; + *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops" - ;; - esac]) ++ ;; ++esac]) ++ + AC_ARG_WITH(passwd, [ --without-passwd don't use passwd/shadow file for authentication], + [case $with_passwd in + yes) ;; +@@ -1408,7 +1421,9 @@ + dnl + if test "$with_kerb5" = "yes"; then + AC_DEFINE(HAVE_KERB5) +- if test -f "/usr/local/include/krb5.h"; then ++ if test -f "/usr/include/krb5/krb5.h"; then ++ CPPFLAGS="$CPPFLAGS -I/usr/include/krb5"; ++ elif test -f "/usr/local/include/krb5.h"; then + CPPFLAGS="$CPPFLAGS -I/usr/local/include" + elif test -f "/usr/local/kerberos/include/krb5.h"; then + CPPFLAGS="$CPPFLAGS -I/usr/local/kerberos/include" +@@ -1418,7 +1433,9 @@ + echo 'Unable to locate kerberos 5 include files, you will have to edit the Makefile and add -I/path/to/krb/includes to CPPFLAGS' + fi +- if test -f "/usr/local/lib/libkrb5.a"; then ++ if test -f "/usr/lib/libkrb5.a"; then ++ SUDO_LDFLAGS="${SUDO_LDFLAGS}"; ++ elif test -f "/usr/local/lib/libkrb5.a"; then + SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/lib" + elif test -f "/usr/local/kerberos/lib/libkrb5.a"; then + SUDO_LDFLAGS="${SUDO_LDFLAGS} -L/usr/local/kerberos/lib" |