integrate Matthias KURZ's patch to fix with_wrap on Solaris PR#300

openssh/openssh.patch

@@ -60,3 +60,196 @@ Index: Makefile.in
  install-nokeys: $(CONFIGFILES) ssh_prng_cmds.out $(MANPAGES) $(TARGETS) install-files
  
  check-config:
+Index: configure
+--- configure.orig	2003-12-03 18:30:30.000000000 +0100
++++ configure	2003-12-03 18:29:05.000000000 +0100
+@@ -6452,92 +6452,6 @@
+ 
+ fi;
+ 
+-# Check whether user wants TCP wrappers support
+-TCPW_MSG="no"
+-
+-# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
+-if test "${with_tcp_wrappers+set}" = set; then
+-  withval="$with_tcp_wrappers"
+-
+-		if test "x$withval" != "xno" ; then
+-			saved_LIBS="$LIBS"
+-			saved_LDFLAGS="$LDFLAGS"
+-			saved_CPPFLAGS="$CPPFLAGS"
+-			if test -n "${withval}" -a "${withval}" != "yes"; then
+-				if test -d "${withval}/lib"; then
+-					if test -n "${need_dash_r}"; then
+-						LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
+-					else
+-						LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+-					fi
+-				else
+-					if test -n "${need_dash_r}"; then
+-						LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
+-					else
+-						LDFLAGS="-L${withval} ${LDFLAGS}"
+-					fi
+-				fi
+-				if test -d "${withval}/include"; then
+-					CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+-				else
+-					CPPFLAGS="-I${withval} ${CPPFLAGS}"
+-				fi
+-			fi
+-			LIBWRAP="-lwrap"
+-			LIBS="$LIBWRAP $LIBS"
+-			echo "$as_me:6488: checking for libwrap" >&5
+-echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
+-			cat >conftest.$ac_ext <<_ACEOF
+-#line 6491 "configure"
+-#include "confdefs.h"
+-
+-#include <tcpd.h>
+-					int deny_severity = 0, allow_severity = 0;
+-
+-int
+-main ()
+-{
+-hosts_access(0);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6509: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:6515: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-					echo "$as_me:6518: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-					cat >>confdefs.h <<\EOF
+-#define LIBWRAP 1
+-EOF
+-
+-					TCPW_MSG="yes"
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-
+-					{ { echo "$as_me:6530: 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;
+-
+ for ac_func in \
+ 	arc4random __b64_ntop b64_ntop __b64_pton b64_pton basename \
+ 	bcopy bindresvport_sa clock fchmod fchown freeaddrinfo futimes \
+@@ -15674,6 +15588,96 @@
+ 
+ fi;
+ 
++#---------------------------------------------------
++
++# Check whether user wants TCP wrappers support
++TCPW_MSG="no"
++
++# Check whether --with-tcp-wrappers or --without-tcp-wrappers was given.
++if test "${with_tcp_wrappers+set}" = set; then
++  withval="$with_tcp_wrappers"
++
++		if test "x$withval" != "xno" ; then
++			saved_LIBS="$LIBS"
++			saved_LDFLAGS="$LDFLAGS"
++			saved_CPPFLAGS="$CPPFLAGS"
++			if test -n "${withval}" -a "${withval}" != "yes"; then
++				if test -d "${withval}/lib"; then
++					if test -n "${need_dash_r}"; then
++						LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}"
++					else
++						LDFLAGS="-L${withval}/lib ${LDFLAGS}"
++					fi
++				else
++					if test -n "${need_dash_r}"; then
++						LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}"
++					else
++						LDFLAGS="-L${withval} ${LDFLAGS}"
++					fi
++				fi
++				if test -d "${withval}/include"; then
++					CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
++				else
++					CPPFLAGS="-I${withval} ${CPPFLAGS}"
++				fi
++			fi
++			LIBWRAP="-lwrap"
++			LIBS="$LIBWRAP $LIBS"
++			echo "$as_me:6488: checking for libwrap" >&5
++echo $ECHO_N "checking for libwrap... $ECHO_C" >&6
++			cat >conftest.$ac_ext <<_ACEOF
++#line 6491 "configure"
++#include "confdefs.h"
++
++#include <tcpd.h>
++					int deny_severity = 0, allow_severity = 0;
++
++int
++main ()
++{
++hosts_access(0);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:6506: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:6509: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:6512: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:6515: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++					echo "$as_me:6518: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++					cat >>confdefs.h <<\EOF
++#define LIBWRAP 1
++EOF
++
++					TCPW_MSG="yes"
++
++else
++  echo "$as_me: failed program was:" >&5
++cat conftest.$ac_ext >&5
++
++					{ { echo "$as_me:6530: 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;
++
++#---------------------------------------------------
++
+ echo "$as_me:15677: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5
+ echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6
+ IPV4_IN6_HACK_MSG="no"

openssh/openssh.spec

@@ -41,7 +41,7 @@ Distribution: OpenPKG [CORE]
 Group:        Security
 License:      BSD
 Version:      %{V_base}%{V_portable}
-Release:      20031125
+Release:      20031204
 
 #   package options
 %option       with_fsl      yes