diff options
Diffstat (limited to 'security/sudo/patches/patch-af')
| -rw-r--r-- | security/sudo/patches/patch-af | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 478cd8b54de..2d6f42d303b 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,16 +1,8 @@ -$NetBSD: patch-af,v 1.24 2010/07/05 03:08:10 taca Exp $ +$NetBSD: patch-af,v 1.25 2010/09/10 17:11:27 spz Exp $ ---- configure.in.orig 2010-06-30 13:16:51.000000000 +0000 +--- configure.in.orig 2010-09-06 12:03:33.000000000 +0000 +++ configure.in -@@ -158,7 +158,6 @@ else - fi - test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin' - test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin' --test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' - - dnl - dnl Deprecated --with options (these all warn or generate an error) -@@ -296,6 +295,19 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi +@@ -322,6 +322,18 @@ AC_ARG_WITH(csops, [AS_HELP_STRING([--wi ;; esac]) @@ -26,25 +18,32 @@ $NetBSD: patch-af,v 1.24 2010/07/05 03:08:10 taca Exp $ + *) echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops" + ;; +esac]) -+ AC_ARG_WITH(passwd, [AS_HELP_STRING([--without-passwd], [don't use passwd/shadow file for authentication])], [case $with_passwd in yes|no) AC_MSG_CHECKING(whether to use shadow/passwd file authentication) -@@ -1799,7 +1811,7 @@ fi +@@ -1865,7 +1877,7 @@ SUDO_MAILDIR if test ${with_logincap-'no'} != "no"; then - AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN="" + AC_CHECK_HEADERS(login_cap.h, [LOGINCAP_USAGE='[[-c class|-]] '; LCMAN=1 case "$OS" in - freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" + dragonfly*|freebsd*|netbsd*) SUDO_LIBS="${SUDO_LIBS} -lutil" ;; esac ]) -@@ -2251,6 +2263,8 @@ if test ${with_kerb5-'no'} != "no" -a -z - AC_CHECK_LIB(krb5support, main, [SUDO_LIBS="${SUDO_LIBS} -lkrb5support"]) - ]) - AUTH_OBJS="$AUTH_OBJS kerb5.o" -+fi -+if test ${with_kerb5-'no'} != "no"; then - _LIBS="$LIBS" - LIBS="${LIBS} ${SUDO_LIBS}" - AC_CHECK_FUNCS(krb5_verify_user krb5_init_secure_context) +@@ -2317,6 +2329,8 @@ if test ${with_kerb5-'no'} != "no"; then + if test -n "$KRB5CONFIG"; then + AC_DEFINE(HAVE_KERB5) + AUTH_OBJS="$AUTH_OBJS kerb5.o" ++ fi ++ if test ${with_kerb5-'no'} != "no"; then + CPPFLAGS="$CPPFLAGS `krb5-config --cflags`" + SUDO_LIBS="$SUDO_LIBS `krb5-config --libs`" + dnl +@@ -2798,7 +2812,6 @@ test "$libexecdir" = '${exec_prefix}/lib + test "$includedir" = '${prefix}/include' && includedir='$(prefix)/include' + test "$datarootdir" = '${prefix}/share' && datarootdir='$(prefix)/share' + test "$docdir" = '${datarootdir}/doc/${PACKAGE_TARNAME}' && docdir='$(datarootdir)/doc/$(PACKAGE_TARNAME)' +-test "$sysconfdir" = '${prefix}/etc' -a X"$with_stow" != X"yes" && sysconfdir='/etc' + + dnl + dnl Substitute into the Makefile and man pages |