security/sudo/patches/patch-ag

   1 $NetBSD: patch-ag,v 1.12 2008/03/11 15:52:51 taca Exp $
   2
   3 --- configure.orig      2008-12-10 06:04:36.000000000 +0900
   4 +++ configure
   5 @@ -1451,7 +1451,7 @@ Fine tuning of the installation director
   6    --bindir=DIR           user executables [EPREFIX/bin]
   7    --sbindir=DIR          system admin executables [EPREFIX/sbin]
   8    --libexecdir=DIR       program executables [EPREFIX/libexec]
   9 -  --sysconfdir=DIR       read-only single-machine data [etc]
  10 +  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
  11    --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
  12    --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
  13    --libdir=DIR           object code libraries [EPREFIX/lib]
  14 @@ -1523,6 +1523,7 @@ Optional Packages:
  15    --with-devel            add development options
  16    --with-efence           link with -lefence for malloc() debugging
  17    --with-csops            add CSOps standard options
  18 +  --with-nbsdops          add NetBSD standard options
  19    --without-passwd        don't use passwd/shadow file for authentication
  20    --with-skey=DIR         enable S/Key support
  21    --with-opie=DIR         enable OPIE support
  22 @@ -2163,7 +2164,6 @@ else
  23  fi
  24  test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin'
  25  test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin'
  26 -test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc'
  27
  28
  29
  30 @@ -2356,6 +2356,23 @@ fi
  31
  32
  33
  34 +# Check whether --with-nbsdops or --without-nbsdops was given.
  35 +if test "${with_nbsdops+set}" = set; then
  36 +  withval="$with_nbsdops"
  37 +  case $with_nbsdops in
  38 +    yes)       echo 'Adding NetBSD standard options'
  39 +               CHECKSIA=false
  40 +               with_ignore_dot=yes
  41 +               with_env_editor=yes
  42 +               with_tty_tickets=yes
  43 +               ;;
  44 +    no)                ;;
  45 +    *)         echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
  46 +               ;;
  47 +esac
  48 +fi;
  49 +
  50 +
  51  # Check whether --with-passwd was given.
  52  if test "${with_passwd+set}" = set; then
  53    withval=$with_passwd; case $with_passwd in
  54 @@ -14091,7 +14108,7 @@ if test `eval echo '${'$as_ac_Header'}'`
  55  _ACEOF
  56   LOGINCAP_USAGE='[-c class|-] '; LCMAN=""
  57         case "$OS" in
  58 -           freebsd|netbsd)     SUDO_LIBS="${SUDO_LIBS} -lutil"
  59 +           dragonfly*|freebsd*|netbsd*)        SUDO_LIBS="${SUDO_LIBS} -lutil"
  60             ;;
  61         esac
  62
  63 @@ -21080,11 +21098,12 @@ fi
  64
  65  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  66      AUTH_OBJS="$AUTH_OBJS kerb5.o"
  67 -    _LIBS="$LIBS"
  68 -    LIBS="${LIBS} ${SUDO_LIBS}"
  69 -
  70
  71 +fi
  72
  73 +if test ${with_kerb5-'no'} != "no"; then
  74 +_LIBS="$LIBS"
  75 +LIBS="${LIBS} ${SUDO_LIBS}"
  76  for ac_func in krb5_verify_user krb5_init_secure_context krb5_get_init_creds_opt_alloc
  77  do
  78  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`