kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Protect inclusion of sys/cdefs.h in configure code checking for tcp_wrappers.

Browse source 
This helps on Solaris.
This commit is contained in:
seb 2002-04-02 11:20:11 +00:00
parent 60ce5372b0
commit 28a2fa7f4e
3 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
security/openssh/distinfo
View file

@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.13 2002/03/14 13:07:32 wiz Exp $
$NetBSD: distinfo,v 1.14 2002/04/02 11:20:11 seb Exp $
SHA1 (openssh-3.0.2p1.tar.gz) = c9a7e02936ace163ea58ec42e8e3f95df27fef2a
Size (openssh-3.0.2p1.tar.gz) = 781092 bytes
SHA1 (patch-aa) = dd6937ab8edf0c874365118ba223958bbb4fe871
SHA1 (patch-ab) = 271811fc88fbed42f22fa1dc503dc88953b5d76f
SHA1 (patch-aa) = 9fd81ee4fae0abc1d399bcc80da5b8c4e36750e1
SHA1 (patch-ab) = 23c5dd2aa404d16892118f21b7a4d197418f8231
SHA1 (patch-ac) = e151977f95723c9bdc48dea5e313b89361b5b515
SHA1 (patch-ah) = 0c75daaa11c6a6e32bce628b8f866008677f155f

19
security/openssh/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.20 2002/03/14 13:07:33 wiz Exp $
$NetBSD: patch-aa,v 1.21 2002/04/02 11:20:12 seb Exp $
--- configure.orig Sun Dec 2 00:38:55 2001
+++ configure
@ -21,11 +21,21 @@ $NetBSD: patch-aa,v 1.20 2002/03/14 13:07:33 wiz Exp $
# Allow user to specify flags
# Check whether --with-cflags or --without-cflags was given.
@@ -6252,6 +6253,8 @@
#line 6252 "configure"
@@ -6246,12 +6247,16 @@
fi
fi
LIBS="-lwrap $LIBS"
- echo "$as_me:6249: checking for libwrap" >&5
+ echo "$as_me:6250: checking for libwrap" >&5
echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 6252 "configure"
+#line 6253 "configure"
#include "confdefs.h"
+#ifdef HAVE_SYS_CDEFS_H
+#include <sys/cdefs.h>
+#endif
+#include <stdio.h>
#include <tcpd.h>
int deny_severity = 0, allow_severity = 0;
@ -40,8 +50,9 @@ $NetBSD: patch-aa,v 1.20 2002/03/14 13:07:33 wiz Exp $
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- { { echo "$as_me:6297: error: *** libwrap missing" >&5
+ TCPW_LIB=""
{ { echo "$as_me:6297: error: *** libwrap missing" >&5
+ { { echo "$as_me:6304: error: *** libwrap missing" >&5
echo "$as_me: error: *** libwrap missing" >&2;}
{ (exit 1); exit 1; }; }

12
security/openssh/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.7 2002/02/05 04:17:32 jlam Exp $
$NetBSD: patch-ab,v 1.8 2002/04/02 11:20:13 seb Exp $
--- configure.ac.orig Sat Nov 3 14:09:33 2001
--- configure.ac.orig Sat Nov 3 20:09:33 2001
+++ configure.ac
@@ -150,8 +150,6 @@
CFLAGS="$CFLAGS"
@ -21,16 +21,18 @@ $NetBSD: patch-ab,v 1.7 2002/02/05 04:17:32 jlam Exp $
# Allow user to specify flags
AC_ARG_WITH(cflags,
[ --with-cflags Specify additional flags to pass to compiler],
@@ -550,6 +551,8 @@
@@ -550,6 +551,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;
],
@@ -558,14 +561,18 @@
@@ -558,14 +563,18 @@
AC_MSG_RESULT(yes)
AC_DEFINE(LIBWRAP)
TCPW_MSG="yes"
@ -49,7 +51,7 @@ $NetBSD: patch-ab,v 1.7 2002/02/05 04:17:32 jlam Exp $
dnl Checks for library functions.
AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa \
@@ -2194,7 +2201,7 @@
@@ -2194,7 +2203,7 @@
echo " User binaries: $B"
echo " System binaries: $C"
echo " Configuration files: $D"