summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-aa
blob: 7c8ad0c95c3c2dd18ed034e0ae9c0b50eb498c5a (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-aa,v 1.35 2004/08/04 06:43:52 minskim Exp $

--- configure.orig	Sun Apr 18 07:51:57 2004
+++ configure
@@ -4814,8 +4814,18 @@ EOF
 EOF
 
 	;;
+
+*-*-interix3)
+	cat >>confdefs.h <<\EOF
+#define MISSING_HOWMANY 1
+EOF
+
+	;;
 esac
 
+# pkgsrc handles any rpath settings this package needs
+need_dash_r=
+
 # Allow user to specify flags
 
 # Check whether --with-cflags or --without-cflags was given.
@@ -17263,12 +17273,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test -z "$conf_utmpx_location"; then
 	if test x"$system_utmpx_path" = x"no" ; then
-		cat >>confdefs.h <<\EOF
+		for f in /var/run/utmpx; do
+			if test -f $f ; then
+				conf_utmpx_location=$f
+			fi
+		done
+		if test -z "$conf_utmpx_location"; then
+			cat >>confdefs.h <<\EOF
 #define DISABLE_UTMPX 1
 EOF
 
+		fi
 	fi
-else
+fi
+if test -n "$conf_utmpx_location"; then
 	cat >>confdefs.h <<EOF
 #define CONF_UTMPX_FILE "$conf_utmpx_location"
 EOF
@@ -17323,12 +17341,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test -z "$conf_wtmpx_location"; then
 	if test x"$system_wtmpx_path" = x"no" ; then
-		cat >>confdefs.h <<\EOF
+		for f in /var/log/wtmpx; do
+			if test -f $f ; then
+				conf_wtmpx_location=$f
+			fi
+		done
+		if test -z "$conf_wtmpx_location"; then
+			cat >>confdefs.h <<\EOF
 #define DISABLE_WTMPX 1
 EOF
 
+		fi
 	fi
-else
+fi
+if test -n "$conf_wtmpx_location"; then
 	cat >>confdefs.h <<EOF
 #define CONF_WTMPX_FILE "$conf_wtmpx_location"
 EOF
@@ -18237,7 +18263,7 @@ echo "OpenSSH has been configured with t
 echo "                     User binaries: $B"
 echo "                   System binaries: $C"
 echo "               Configuration files: $D"
-echo "                   Askpass program: $E"
+echo "                   Askpass program: ${ASKPASS_PROGRAM}"
 echo "                      Manual pages: $F"
 echo "                          PID file: $G"
 echo "  Privilege separation chroot path: $H"