summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-ab
blob: 7daacc3b715854f3df4a0dae044710713b0d4f16 (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
$NetBSD: patch-ab,v 1.29 2011/02/06 11:31:18 obache Exp $

--- configure.ac.orig	2010-04-10 15:58:01.000000000 +0300
+++ configure.ac	2010-06-09 21:32:22.000000000 +0300
@@ -191,6 +191,9 @@
 	]
 )
 
+# pkgsrc handles any rpath settings this package needs
+need_dash_r=
+
 # Allow user to specify flags
 AC_ARG_WITH(cflags,
 	[  --with-cflags           Specify additional flags to pass to compiler],
@@ -258,6 +261,7 @@
 	maillock.h \
 	ndir.h \
 	net/if_tun.h \
+	net/tun/if_tun.h \
 	netdb.h \
 	netgroup.h \
 	pam/pam_appl.h \
@@ -541,6 +545,15 @@
 		;;
 	esac
 	;;
+*-*-interix*)
+        AC_DEFINE(HAVE_INTERIX)
+        AC_DEFINE(DISABLE_FD_PASSING)
+        AC_DEFINE(DISABLE_SHADOW)
+        AC_DEFINE(IP_TOS_IS_BROKEN)
+        AC_DEFINE(MISSING_HOWMANY)
+        AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
+        AC_DEFINE(USE_PIPES)
+        ;;
 *-*-irix5*)
 	PATH="$PATH:/usr/etc"
 	AC_DEFINE(BROKEN_INET_NTOA, 1,
@@ -1273,7 +1286,7 @@
 				LDFLAGS="-L${withval}/lib ${LDFLAGS}"
 			fi
 		fi
-		if test "x$use_pkgconfig_for_libedit" == "xyes"; then
+		if test "x$use_pkgconfig_for_libedit" = "xyes"; then
 			LIBEDIT=`$PKGCONFIG --libs-only-l libedit`
 			CPPFLAGS="$CPPFLAGS `$PKGCONFIG --cflags libedit`"
 		else
@@ -4106,9 +4119,17 @@
 )
 if test -z "$conf_wtmpx_location"; then
 	if test x"$system_wtmpx_path" = x"no" ; then
-		AC_DEFINE(DISABLE_WTMPX)
+		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
+			AC_DEFINE(DISABLE_WTMPX)
+		fi
 	fi
-else
+fi
+if test -n "$conf_wtmpx_location"; then
 	AC_DEFINE_UNQUOTED(CONF_WTMPX_FILE, "$conf_wtmpx_location",
 		[Define if you want to specify the path to your wtmpx file])
 fi
@@ -4156,7 +4177,7 @@
 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"