summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-aa
blob: 13551d6fa04846acdfa6c96828501288f78071f1 (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
$NetBSD: patch-aa,v 1.20 2002/03/14 13:07:33 wiz Exp $

--- configure.orig	Sun Dec  2 00:38:55 2001
+++ configure
@@ -3587,8 +3587,6 @@
 	CFLAGS="$CFLAGS"
 	;;
 *-*-solaris*)
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib"
 	need_dash_r=1
 	cat >>confdefs.h <<\_ACEOF
 #define PAM_SUN_CODEBASE 1
@@ -4051,6 +4049,9 @@
 	;;
 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.
@@ -6252,6 +6253,8 @@
 #line 6252 "configure"
 #include "confdefs.h"
 
+#include <sys/cdefs.h>
+#include <stdio.h>
 #include <tcpd.h>
 					int deny_severity = 0, allow_severity = 0;
 
@@ -6289,17 +6294,20 @@
 _ACEOF
 
 					TCPW_MSG="yes"
+					TCPW_LIB="-lwrap"
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 
+					TCPW_LIB=""
 					{ { echo "$as_me:6297: error: *** libwrap missing" >&5
 echo "$as_me: error: *** libwrap missing" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+			LIBS="$saved_LIBS"
 		fi
 
 fi;
@@ -15590,6 +15598,7 @@
 s,@TEST_MINUS_S_SH@,$TEST_MINUS_S_SH,;t t
 s,@LOGIN_PROGRAM_FALLBACK@,$LOGIN_PROGRAM_FALLBACK,;t t
 s,@LD@,$LD,;t t
+s,@TCPW_LIB@,$TCPW_LIB,;t t
 s,@NO_SFTP@,$NO_SFTP,;t t
 s,@rsh_path@,$rsh_path,;t t
 s,@xauth_path@,$xauth_path,;t t
@@ -16069,7 +16078,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 "        sshd default user PATH: $H"