security/sudo/patches/patch-af

   1 $NetBSD: patch-af,v 1.20 2008/03/11 15:52:51 taca Exp $
   2
   3 --- configure.in.orig   2008-12-10 06:13:01.000000000 +0900
   4 +++ configure.in
   5 @@ -153,7 +153,6 @@ else
   6  fi
   7  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
   8  test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
   9 -test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
  10
  11  dnl
  12  dnl Deprecated --with options (these all warn or generate an error)
  13 @@ -277,6 +276,19 @@ AC_ARG_WITH(csops, [  --with-csops
  14                 ;;
  15  esac])
  16
  17 +AC_ARG_WITH(nbsdops, [  --with-nbsdops          add NetBSD standard options],
  18 +[case $with_nbsdops in
  19 +    yes)       echo 'Adding NetBSD standard options'
  20 +               CHECKSIA=false
  21 +               with_ignore_dot=yes
  22 +               with_env_editor=yes
  23 +               with_tty_tickets=yes
  24 +               ;;
  25 +    no)                ;;
  26 +    *)         echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
  27 +               ;;
  28 +esac])
  29 +
  30  AC_ARG_WITH(passwd, [  --without-passwd        don't use passwd/shadow file for authentication],
  31  [case $with_passwd in
  32      yes|no)    AC_MSG_CHECKING(whether to use shadow/passwd file authentication)
  33 @@ -1716,7 +1728,7 @@ fi
  34  if test ${with_logincap-'no'} != "no"; then
  35      AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=""
  36         case "$OS" in
  37 -           freebsd|netbsd)     SUDO_LIBS="${SUDO_LIBS} -lutil"
  38 +           dragonfly*|freebsd*|netbsd*)        SUDO_LIBS="${SUDO_LIBS} -lutil"
  39             ;;
  40         esac
  41      ])
  42 @@ -2148,6 +2160,8 @@ if test ${with_kerb5-'no'} != "no" -a -z
  43             AC_CHECK_LIB(krb5support, main, [SUDO_LIBS="${SUDO_LIBS} -lkrb5support,"])
  44      ])
  45      AUTH_OBJS="$AUTH_OBJS kerb5.o"
  46 +fi
  47 +if test ${with_kerb5-'no'} != "no"; then
  48      _LIBS="$LIBS"
  49      LIBS="${LIBS} ${SUDO_LIBS}"
  50      AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context krb5_get_init_creds_opt_alloc)