diff options
Diffstat (limited to 'security/sudo/patches/patch-af')
-rw-r--r-- | security/sudo/patches/patch-af | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/security/sudo/patches/patch-af b/security/sudo/patches/patch-af index 64675fd178b..398030998fc 100644 --- a/security/sudo/patches/patch-af +++ b/security/sudo/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ +$NetBSD: patch-af,v 1.17 2007/09/09 12:54:37 taca Exp $ ---- configure.in.orig 2007-07-16 22:51:21.000000000 -0400 -+++ configure.in 2007-07-23 11:15:42.000000000 -0400 -@@ -123,7 +123,6 @@ +--- configure.in.orig 2007-09-07 01:19:57.000000000 +0900 ++++ configure.in +@@ -129,7 +129,6 @@ dnl test "$mandir" = '${prefix}/man' && mandir='$(prefix)/man' test "$bindir" = '${exec_prefix}/bin' && bindir='$(exec_prefix)/bin' test "$sbindir" = '${exec_prefix}/sbin' && sbindir='$(exec_prefix)/sbin' @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ dnl dnl Deprecated --with options (these all warn or generate an error) -@@ -246,6 +245,19 @@ +@@ -252,6 +251,19 @@ AC_ARG_WITH(csops, [ --with-csops ;; esac]) @@ -29,9 +29,9 @@ $NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ + AC_ARG_WITH(passwd, [ --without-passwd don't use passwd/shadow file for authentication], [case $with_passwd in - yes) ;; -@@ -1466,7 +1478,7 @@ - AC_CHECK_FUNCS(auth_challenge, [with_bsdauth=maybe]) + yes|no) AC_MSG_CHECKING(whether to use shadow/passwd file authentication) +@@ -1470,7 +1482,7 @@ case "$host" in + AC_CHECK_FUNCS(auth_challenge, [AUTH_EXCL_DEF="BSD_AUTH"]) fi ;; - *-*-freebsd*) @@ -39,19 +39,19 @@ $NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ # FreeBSD has a real setreuid(2) starting with 2.1 and # backported to 2.0.5. We just take 2.1 and above... case "$OSREV" in -@@ -1482,6 +1494,8 @@ - fi - : ${with_pam='maybe'} +@@ -1484,6 +1496,8 @@ case "$host" in + CHECKSHADOW="false" + test -z "$with_pam" && AUTH_EXCL_DEF="PAM" : ${with_logincap='maybe'} + # We really want libutil. + SUDO_LIBS="${SUDO_LIBS} -lutil" ;; *-*-*openbsd*) # OpenBSD has a real setreuid(2) starting with 3.3 but -@@ -1515,10 +1529,12 @@ +@@ -1512,10 +1526,12 @@ case "$host" in + CHECKSHADOW="false" + test -z "$with_pam" && AUTH_EXCL_DEF="PAM" : ${with_logincap='maybe'} - dnl future versions of NetBSD (> 2.0) may include pam - : ${with_pam='maybe'} + # We really want libutil. + SUDO_LIBS="${SUDO_LIBS} -lutil" ;; @@ -60,15 +60,15 @@ $NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ - SUDO_LIBS="${SUDO_LIBS} -lmd" + SUDO_LIBS="${SUDO_LIBS} -lutil -lmd" fi - if test "$CHECKSHADOW" = "true"; then - CHECKSHADOW="false" -@@ -1895,16 +1911,6 @@ + CHECKSHADOW="false" + test -z "$with_pam" && AUTH_EXCL_DEF="PAM" +@@ -2047,16 +2063,6 @@ if test ${with_kerb5-'no'} != "no" -a -z fi dnl -dnl Some systems put login_cap(3) in libutil -dnl --if test "$with_logincap" = "yes"; then +-if test ${with_logincap-'no'} = "yes"; then - case "$OS" in - freebsd|netbsd) SUDO_LIBS="${SUDO_LIBS} -lutil" - ;; @@ -76,6 +76,6 @@ $NetBSD: patch-af,v 1.16 2007/08/18 15:09:13 taca Exp $ -fi - -dnl - dnl PAM support. Systems that might support PAM set with_pam=maybe - dnl and we do that actual tests here. + dnl extra AFS libs and includes dnl + if test ${with_AFS-'no'} = "yes"; then |