summaryrefslogtreecommitdiff
path: root/security/sudo/patches/patch-ag
blob: 06f2f3febdcfdcf6235248710019c41139d5f966 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
$NetBSD: patch-ag,v 1.12.12.1 2009/02/05 17:00:25 tron Exp $

--- configure.orig	2008-12-10 06:04:36.000000000 +0900
+++ configure
@@ -1451,7 +1451,7 @@ Fine tuning of the installation director
   --bindir=DIR           user executables [EPREFIX/bin]
   --sbindir=DIR          system admin executables [EPREFIX/sbin]
   --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --sysconfdir=DIR       read-only single-machine data [etc]
+  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   --libdir=DIR           object code libraries [EPREFIX/lib]
@@ -1523,6 +1523,7 @@ Optional Packages:
   --with-devel            add development options
   --with-efence           link with -lefence for malloc() debugging
   --with-csops            add CSOps standard options
+  --with-nbsdops          add NetBSD standard options
   --without-passwd        don't use passwd/shadow file for authentication
   --with-skey=DIR         enable S/Key support
   --with-opie=DIR         enable OPIE support
@@ -2163,7 +2164,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'
 
 
 
@@ -2356,6 +2356,23 @@ fi
 
 
 
+# Check whether --with-nbsdops or --without-nbsdops was given.
+if test "${with_nbsdops+set}" = set; then
+  withval="$with_nbsdops"
+  case $with_nbsdops in
+    yes)	echo 'Adding NetBSD standard options'
+		CHECKSIA=false
+		with_ignore_dot=yes
+		with_env_editor=yes
+		with_tty_tickets=yes
+		;;
+    no)		;;
+    *)		echo "Ignoring unknown argument to --with-nbsdops: $with_nbsdops"
+		;;
+esac
+fi;
+
+
 # Check whether --with-passwd was given.
 if test "${with_passwd+set}" = set; then
   withval=$with_passwd; case $with_passwd in
@@ -14091,7 +14108,7 @@ if test `eval echo '${'$as_ac_Header'}'`
 _ACEOF
  LOGINCAP_USAGE='[-c class|-] '; LCMAN=""
 	case "$OS" in
-	    freebsd|netbsd)	SUDO_LIBS="${SUDO_LIBS} -lutil"
+	    dragonfly*|freebsd*|netbsd*)	SUDO_LIBS="${SUDO_LIBS} -lutil"
 	    ;;
 	esac
 
@@ -21080,11 +21098,12 @@ fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     AUTH_OBJS="$AUTH_OBJS kerb5.o"
-    _LIBS="$LIBS"
-    LIBS="${LIBS} ${SUDO_LIBS}"
-
 
+fi
 
+if test ${with_kerb5-'no'} != "no"; then
+_LIBS="$LIBS"
+LIBS="${LIBS} ${SUDO_LIBS}"
 for ac_func in krb5_verify_user krb5_init_secure_context krb5_get_init_creds_opt_alloc
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`