From 1d678e3ccd33c1405b4f7bf64101e1ad0f0a8cf5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 21 Feb 2001 10:48:20 +0000 Subject: [PATCH] 3f1b92058f0ff58ff13c3c2f127fc012 openssh-2.5.1p1.tar.gz Changed files: openssh-libwrap.patch -> 1.13 openssh-no_libnsl.patch -> 1.2 openssh-pam-session.patch -> 1.2 openssh-securityfix.patch -> 1.2 --- openssh-libwrap.patch | 35 ++++++++++++++++------------------- openssh-no_libnsl.patch | 24 +++++++----------------- openssh-pam-session.patch | 10 ---------- openssh-securityfix.patch | 18 ------------------ 4 files changed, 23 insertions(+), 64 deletions(-) delete mode 100644 openssh-pam-session.patch delete mode 100644 openssh-securityfix.patch diff --git a/openssh-libwrap.patch b/openssh-libwrap.patch index 991f686..df71815 100644 --- a/openssh-libwrap.patch +++ b/openssh-libwrap.patch @@ -1,40 +1,37 @@ -diff -ur openssh-2.3.0p1.orig/Makefile.in openssh-2.3.0p1/Makefile.in ---- openssh-2.3.0p1.orig/Makefile.in Sun Nov 5 22:13:45 2000 -+++ openssh-2.3.0p1/Makefile.in Tue Nov 7 16:13:15 2000 -@@ -22,6 +22,7 @@ - PATHS=-DETCDIR=\"$(sysconfdir)\" -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" -DSSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" - CFLAGS=@CFLAGS@ $(PATHS) @DEFS@ +diff -urN openssh-2.5.1p1.org/Makefile.in openssh-2.5.1p1/Makefile.in +--- openssh-2.5.1p1.org/Makefile.in Wed Feb 21 11:09:35 2001 ++++ openssh-2.5.1p1/Makefile.in Wed Feb 21 11:10:45 2001 +@@ -28,6 +28,7 @@ + CFLAGS=@CFLAGS@ + CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir)/openbsd-compat -I$(srcdir) $(PATHS) @DEFS@ LIBS=@LIBS@ +LIBWRAP=@LIBWRAP@ AR=@AR@ RANLIB=@RANLIB@ INSTALL=@INSTALL@ -@@ -73,7 +74,7 @@ +@@ -95,7 +96,7 @@ $(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) - sshd$(EXEEXT): libssh.a libopenbsd-compat.a $(SSHDOBJS) + sshd$(EXEEXT): libssh.a $(LIBCOMPAT) $(SSHDOBJS) - $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) + $(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBWRAP) - scp$(EXEEXT): libopenbsd-compat.a libssh.a scp.o - $(LD) -o $@ scp.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) -diff -ur openssh-2.3.0p1.orig/configure.in openssh-2.3.0p1/configure.in ---- openssh-2.3.0p1.orig/configure.in Tue Nov 7 16:11:05 2000 -+++ openssh-2.3.0p1/configure.in Tue Nov 7 16:12:28 2000 -@@ -1121,8 +1121,11 @@ - [ --with-tcp-wrappers Enable tcpwrappers support], + scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o log-client.o + $(LD) -o $@ scp.o log-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) +diff -urN openssh-2.5.1p1.org/configure.in openssh-2.5.1p1/configure.in +--- openssh-2.5.1p1.org/configure.in Wed Feb 21 11:09:36 2001 ++++ openssh-2.5.1p1/configure.in Wed Feb 21 11:12:07 2001 +@@ -459,7 +459,8 @@ [ if test "x$withval" != "xno" ; then -+ # we need to add -lwrap to LIBS only for configure -+ # testing, and then remove saved_LIBS="$LIBS" -- LIBS="$LIBS -lwrap" +- LIBS="-lwrap $LIBS" + LIBWRAP="-lwrap" + LIBS="$LIBS $LIBWRAP" AC_MSG_CHECKING(for libwrap) AC_TRY_LINK( [ -@@ -1133,12 +1136,14 @@ +@@ -470,12 +471,14 @@ [ AC_MSG_RESULT(yes) AC_DEFINE(LIBWRAP) diff --git a/openssh-no_libnsl.patch b/openssh-no_libnsl.patch index b46d064..01070ab 100644 --- a/openssh-no_libnsl.patch +++ b/openssh-no_libnsl.patch @@ -1,22 +1,12 @@ -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 @@ +diff -urN openssh-2.5.1p1.org/configure.in openssh-2.5.1p1/configure.in +--- openssh-2.5.1p1.org/configure.in Wed Feb 21 11:09:36 2001 ++++ openssh-2.5.1p1/configure.in Wed Feb 21 11:14:11 2001 +@@ -132,6 +132,8 @@ AC_DEFINE(DONT_TRY_OTHER_AF) AC_DEFINE(PAM_TTY_KLUDGE) inet6_default_4in6=yes + no_libnsl=1 -+ no_libsocket=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") - --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 + mips-sony-bsd|mips-sony-newsos4) + AC_DEFINE(HAVE_NEWS4) diff --git a/openssh-pam-session.patch b/openssh-pam-session.patch deleted file mode 100644 index b2a2aea..0000000 --- a/openssh-pam-session.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- openssh-2.3.0p1/session.c~ Sat Oct 28 05:19:58 2000 -+++ openssh-2.3.0p1/session.c Mon Jan 29 21:21:13 2001 -@@ -484,6 +484,7 @@ - session_proctitle(s); - - #ifdef USE_PAM -+ do_pam_session(pw->pw_name, NULL); - do_pam_setcred(); - #endif /* USE_PAM */ - diff --git a/openssh-securityfix.patch b/openssh-securityfix.patch deleted file mode 100644 index 0b933f4..0000000 --- a/openssh-securityfix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN openssh-2.3.0p1.org/sshd.c openssh-2.3.0p1/sshd.c ---- openssh-2.3.0p1.org/sshd.c Sat Jan 6 19:54:11 2001 -+++ openssh-2.3.0p1/sshd.c Sat Jan 6 19:55:48 2001 -@@ -782,10 +782,10 @@ - debug("Bind to port %s on %s.", strport, ntop); - - /* Bind the socket to the desired port. */ -- if ((bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) && -- (!ai->ai_next)) { -- error("Bind to port %s on %s failed: %.200s.", -- strport, ntop, strerror(errno)); -+ if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) { -+ if (!ai->ai_next) -+ error("Bind to port %s on %s failed: %.200s.", -+ strport, ntop, strerror(errno)); - close(listen_sock); - continue; - } -- 2.44.0