- rebuild with openssl-1.0.1k

[packages/openssh.git] / openssh-no_libnsl.patch

diff --git a/openssh-no_libnsl.patch b/openssh-no_libnsl.patch
index b46d0641dae479f3cf69e53be175b721905dad5f..c8fbdd4a9863b09fd2dd58ce0070dd8075053aab 100644 (file)
--- a/openssh-no_libnsl.patch
+++ b/openssh-no_libnsl.patch
@@ -1,22 +1,23 @@
-diff -Nru openssh-2.1.1p4/configure.in openssh-2.1.1p4.new/configure.in
---- openssh-2.1.1p4/configure.in       Wed Aug 23 00:34:43 2000
-+++ openssh-2.1.1p4.new/configure.in   Wed Aug 23 00:37:23 2000
-@@ -103,6 +103,8 @@
-       AC_DEFINE(DONT_TRY_OTHER_AF)
-       AC_DEFINE(PAM_TTY_KLUDGE)
+diff -urN openssh-3.0p1.orig/configure.ac openssh-3.0p1/configure.ac
+--- openssh-3.0p1.orig/configure.ac    Sat Nov  3 20:09:33 2001
++++ openssh-3.0p1/configure.ac Wed Nov  7 16:22:54 2001
+@@ -123,6 +123,8 @@
+       AC_DEFINE(LOCKED_PASSWD_PREFIX, "!!")
+       AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
        inet6_default_4in6=yes
 +      no_libnsl=1
 +      no_libsocket=1
-       ;;
- *-*-netbsd*)
-       need_dash_r=1
-@@ -208,9 +210,6 @@
- AC_CHECK_LIB(z, deflate, ,AC_MSG_ERROR([*** zlib missing - please install first ***]))
- AC_CHECK_LIB(util, login, AC_DEFINE(HAVE_LIBUTIL_LOGIN) LIBS="$LIBS -lutil")
+       case `uname -r` in
+       1.*|2.0.*)
+               AC_DEFINE(BROKEN_CMSG_TYPE)
+--- openssh-5.9p1/configure.ac~        2011-09-06 19:01:09.000000000 +0200
++++ openssh-5.9p1/configure.ac 2011-09-06 19:02:14.816070290 +0200
+@@ -972,7 +972,6 @@
  
--if test -z "$no_libsocket" ; then
--      AC_CHECK_LIB(nsl, yp_match, , )
--fi
- if test -z "$no_libnsl" ; then
-       AC_CHECK_LIB(socket, main, , )
- fi
+ dnl Checks for header files.
+ # Checks for libraries.
+-AC_CHECK_FUNC([yp_match], , [AC_CHECK_LIB([nsl], [yp_match])])
+ AC_CHECK_FUNC([setsockopt], , [AC_CHECK_LIB([socket], [setsockopt])])
+ 
+ dnl IRIX and Solaris 2.5.1 have dirname() in libgen
+