summaryrefslogtreecommitdiff
path: root/security/openssh/patches/patch-ab
blob: 9e5e6427917ce052ed2ed5351065b2469a4aa6a7 (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
$NetBSD: patch-ab,v 1.11 2002/06/25 02:13:13 itojun Exp $

use libcrypt before libcrypto, as crypt() in libcrypt is more than just for DES

--- configure.ac.orig	Fri Jun 21 09:01:19 2002
+++ configure.ac	Tue Jun 25 10:54:10 2002
@@ -183,8 +183,6 @@
 	CFLAGS="$CFLAGS"
 	;;
 *-*-solaris*)
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-	LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" 
 	need_dash_r=1
 	AC_DEFINE(PAM_SUN_CODEBASE)
 	AC_DEFINE(LOGIN_NEEDS_UTMPX)
@@ -310,6 +308,9 @@
 	;;
 esac
 
+# 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],
@@ -543,6 +544,10 @@
 			AC_MSG_CHECKING(for libwrap)
 			AC_TRY_LINK(
 				[
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#include <stdio.h>
 #include <tcpd.h>
 					int deny_severity = 0, allow_severity = 0;
 				],
@@ -725,7 +730,7 @@
 		fi
 	]
 )
-LIBS="$LIBS -lcrypto"
+LIBS="$LIBS -lcrypt -lcrypto"
 AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL),
 	[
 		dnl Check default openssl install dir
@@ -2372,7 +2377,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"