Date: Fri, 18 Jun 1999 12:10:03 -0700 (PDT) From: Issei Suzuki <issei@jp.freebsd.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/12279: Update port : security/ssh2 Message-ID: <199906181910.MAA01436@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/12279; it has been noted by GNATS. From: Issei Suzuki <issei@jp.freebsd.org> To: FreeBSD-gnats-submit@FreeBSD.ORG Cc: Subject: Re: ports/12279: Update port : security/ssh2 Date: Sat, 19 Jun 1999 04:03:16 +0900 In mail "Re: ports/12279: Update port : security/ssh2" "Andrey A. Chernov" <ache@nagual.pp.ru> wrote: > > patch-ah > > Delete [ Don't print "No mail." ] patch added by ache. Now you can > > control it by CheckMail configration parameter. > > Are you shure about this one? Checking mail *is* needed but traditional > BSD login *not* print "No mail" (and print something if mail exists). I misunderstood. Please use the following patch instead of what I sent before. diff -urN ssh2.old/Makefile ssh2/Makefile --- ssh2.old/Makefile Fri Jun 18 15:55:00 1999 +++ ssh2/Makefile Fri Jun 18 22:37:33 1999 @@ -8,7 +8,7 @@ # Maximal ssh2 package requires YES values for # USE_SSH1, USE_TCPWRAP -DISTNAME= ssh-2.0.12 +DISTNAME= ssh-2.0.13 CATEGORIES= security net MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ ftp://sunsite.unc.edu/pub/packages/security/ssh/ \ diff -urN ssh2.old/files/md5 ssh2/files/md5 --- ssh2.old/files/md5 Fri Jun 18 15:55:00 1999 +++ ssh2/files/md5 Fri Jun 18 15:56:57 1999 @@ -1 +1 @@ -MD5 (ssh-2.0.12.tar.gz) = 506632f8a9c2f5201587e2130a4d5408 +MD5 (ssh-2.0.13.tar.gz) = 1853aba4c7c9c501545c9e56a71fa9c3 diff -urN ssh2.old/patches/patch-aa ssh2/patches/patch-aa --- ssh2.old/patches/patch-aa Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-aa Fri Jun 18 16:02:06 1999 @@ -1,23 +1,23 @@ ---- lib/Makefile.in.orig Fri Jan 29 14:30:20 1999 -+++ lib/Makefile.in Fri Feb 5 08:38:26 1999 -@@ -98,14 +98,14 @@ +--- lib/Makefile.in.orig Tue May 11 17:35:00 1999 ++++ lib/Makefile.in Fri Jun 18 16:01:12 1999 +@@ -99,14 +99,14 @@ AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies --SUBDIRS = zlib sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession -+SUBDIRS = sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession +-SUBDIRS = zlib sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession sshpgp ++SUBDIRS = sshmath sshreadline sshutil sshapputil sshcrypt sshproto sshsession sshpgp # sshtest testsuite lib_LIBRARIES = libssh.a # libsshcrypt.kpure.a --SUBLIBRARIES = sshmath/libsshmath.a zlib/libz.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a -+SUBLIBRARIES = sshmath/libsshmath.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a +-SUBLIBRARIES = sshmath/libsshmath.a zlib/libz.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a sshpgp/libsshpgp.a ++SUBLIBRARIES = sshmath/libsshmath.a sshutil/libsshutil.a sshapputil/libsshapputil.a sshcrypt/libsshcrypt.a sshproto/libsshproto.a sshsession/libsshsession.a sshreadline/libsshreadline.a sshpgp/libsshpgp.a mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../sshconf.h CONFIG_CLEAN_FILES = -@@ -368,11 +368,6 @@ +@@ -369,11 +369,6 @@ all-local: includes includes: -if test '!' -d ../include; then mkdir ../include; fi diff -urN ssh2.old/patches/patch-ab ssh2/patches/patch-ab --- ssh2.old/patches/patch-ab Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ab Fri Jun 18 16:02:35 1999 @@ -1,6 +1,6 @@ ---- lib/sshapputil/Makefile.in.old Tue Nov 24 18:24:57 1998 -+++ lib/sshapputil/Makefile.in Tue Nov 24 18:25:12 1998 -@@ -105,7 +105,7 @@ +--- lib/sshapputil/Makefile.in.orig Tue May 11 17:35:02 1999 ++++ lib/sshapputil/Makefile.in Fri Jun 18 16:02:20 1999 +@@ -108,7 +108,7 @@ INCLUDES = -I../.. -I. -I$(srcdir) \ -I$(top_builddir) -I$(top_srcdir) \ -I../sshutil -I$(srcdir)/../sshutil -I../sshmath \ diff -urN ssh2.old/patches/patch-ac ssh2/patches/patch-ac --- ssh2.old/patches/patch-ac Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ac Fri Jun 18 16:02:48 1999 @@ -1,6 +1,6 @@ ---- lib/sshcrypt/Makefile.in.orig Fri Jan 29 14:30:22 1999 -+++ lib/sshcrypt/Makefile.in Fri Feb 5 08:42:04 1999 -@@ -176,7 +176,6 @@ +--- lib/sshcrypt/Makefile.in.orig Tue May 11 17:35:02 1999 ++++ lib/sshcrypt/Makefile.in Fri Jun 18 16:02:38 1999 +@@ -179,7 +179,6 @@ -I$(top_builddir) -I$(top_srcdir) \ -I../sshutil -I$(srcdir)/../sshutil \ -I../sshmath -I$(srcdir)/../sshmath \ diff -urN ssh2.old/patches/patch-ad ssh2/patches/patch-ad --- ssh2.old/patches/patch-ad Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ad Fri Jun 18 16:03:00 1999 @@ -1,6 +1,6 @@ ---- lib/sshreadline/Makefile.in.old Tue Nov 24 18:24:57 1998 -+++ lib/sshreadline/Makefile.in Tue Nov 24 18:25:27 1998 -@@ -106,7 +106,6 @@ +--- lib/sshreadline/Makefile.in.orig Tue May 11 17:35:03 1999 ++++ lib/sshreadline/Makefile.in Fri Jun 18 16:02:51 1999 +@@ -108,7 +108,6 @@ INCLUDES = -I$(srcdir) -I. -I../.. \ -I$(top_builddir) -I$(top_srcdir) \ -I../sshmath -I$(srcdir)/../sshmath \ diff -urN ssh2.old/patches/patch-ae ssh2/patches/patch-ae --- ssh2.old/patches/patch-ae Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ae Fri Jun 18 16:03:11 1999 @@ -1,6 +1,6 @@ ---- lib/sshutil/Makefile.in.old Tue Nov 24 18:34:58 1998 -+++ lib/sshutil/Makefile.in Tue Nov 24 18:35:05 1998 -@@ -193,7 +193,6 @@ +--- lib/sshutil/Makefile.in.orig Tue May 11 17:35:01 1999 ++++ lib/sshutil/Makefile.in Fri Jun 18 16:03:03 1999 +@@ -207,7 +207,6 @@ INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. \ -I$(top_builddir) -I$(top_srcdir) \ -I../sshmath -I$(srcdir)/../sshmath \ diff -urN ssh2.old/patches/patch-af ssh2/patches/patch-af --- ssh2.old/patches/patch-af Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-af Fri Jun 18 16:05:08 1999 @@ -1,11 +1,12 @@ ---- apps/ssh/Makefile.in.orig Mon Nov 16 21:24:45 1998 -+++ apps/ssh/Makefile.in Tue Nov 24 19:06:58 1998 -@@ -133,9 +133,9 @@ +--- apps/ssh/Makefile.in.orig Tue May 11 17:35:06 1999 ++++ apps/ssh/Makefile.in Fri Jun 18 16:04:37 1999 +@@ -140,9 +140,10 @@ - INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) -I../../include \ + INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) \ -I$(top_builddir) -I$(top_srcdir) \ -- -I$(srcdir)/../../include -+ -I$(srcdir)/../../include -I${PREFIX}/include +- -I../../include -I$(srcdir)/../../include ++ -I$(srcdir)/../../include -I${PREFIX}/include \ ++ -I${PREFIX}/include -LDADD = -L. -L../../lib -lssh2 -lssh +LDADD = -L. -L../../lib -lssh2 -lssh -lz diff -urN ssh2.old/patches/patch-ag ssh2/patches/patch-ag --- ssh2.old/patches/patch-ag Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ag Fri Jun 18 16:05:29 1999 @@ -1,6 +1,6 @@ ---- configure.orig Fri Jan 29 14:30:18 1999 -+++ configure Fri Feb 5 08:55:50 1999 -@@ -4874,7 +4874,7 @@ +--- configure.orig Tue May 11 17:34:58 1999 ++++ configure Fri Jun 18 16:05:12 1999 +@@ -4877,7 +4877,7 @@ char tgetent(); int main() { @@ -8,8 +8,8 @@ +XXXtgetent() ; return 0; } EOF - if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -@@ -4904,7 +4904,7 @@ + if { (eval echo configure:4884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +@@ -5033,7 +5033,7 @@ echo "$ac_t""no" 1>&6 fi diff -urN ssh2.old/patches/patch-ah ssh2/patches/patch-ah --- ssh2.old/patches/patch-ah Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ah Sat Jun 19 03:52:01 1999 @@ -1,6 +1,6 @@ ---- apps/ssh/sshchsession.c.orig Mon Jan 18 13:32:24 1999 -+++ apps/ssh/sshchsession.c Sat Feb 6 04:20:26 1999 -@@ -80,6 +80,11 @@ +--- apps/ssh/sshchsession.c.orig Fri May 7 20:02:03 1999 ++++ apps/ssh/sshchsession.c Sat Jun 19 03:51:31 1999 +@@ -81,6 +81,11 @@ #include <ulimit.h> #endif /* ULIMIT_H */ @@ -12,7 +12,7 @@ #define SSH_DEBUG_MODULE "Ssh2ChannelSession" #define SSH_SESSION_INTERACTIVE_WINDOW 10000 -@@ -405,6 +410,62 @@ +@@ -406,6 +411,67 @@ if (getenv("TZ")) ssh_child_set_env(envp, envsizep, "TZ", getenv("TZ")); @@ -50,14 +50,19 @@ + } + strcat(s, SSH_BINDIR); + -+ *envp = environ; -+ environ = tmpenv; /* Restore parent environment */ -+ for (*envsizep = 0; (*envp)[*envsizep] != NULL; (*envsizep)++) -+ ; -+ (*envsizep)++; -+ (*envsizep) += 50; -+ (*envp) = ssh_xrealloc(*envp, (*envsizep) * sizeof(char *)); ++ /* copy enviroment variables to (*envp) */ ++ for (i = 0; environ[i] != NULL; i++) ++ ; ++ (*envp) = ssh_xmalloc((i + 51) * sizeof(char *)); ++ (*envsizep) = i + 50; + ++ for (i = 0; environ[i] != NULL; ++i) { ++ (*envp)[i] = ssh_xmalloc((strlen(environ[i]) + 1) * sizeof(char)); ++ strcpy((*envp)[i], environ[i]); ++ } ++ (*envp)[i] = NULL; ++ ++ environ = tmpenv; /* Restore parent environment */ + ssh_child_set_env(envp, envsizep, "PATH", s); + ssh_xfree(s); + } @@ -75,7 +80,7 @@ /* Set SSH_CLIENT. */ snprintf(buf, sizeof(buf), "%s %s %s %s", session->common->remote_ip, session->common->remote_port, -@@ -628,12 +689,20 @@ +@@ -633,12 +699,20 @@ char buff[100], *time_string; /* Check /etc/nologin. */ @@ -96,15 +101,15 @@ while (fgets(buf, sizeof(buf), f)) fputs(buf, stderr); fclose(f); -@@ -754,7 +823,11 @@ - { - struct stat mailbuf; - if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0) +@@ -789,7 +863,11 @@ + { + struct stat mailbuf; + if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0) +#ifndef __FreeBSD__ - printf("No mail.\n"); + printf("No mail.\n"); +#else -+ ; ++ ; +#endif - else if (mailbuf.st_atime > mailbuf.st_mtime) - printf("You have mail.\n"); - else + else if (mailbuf.st_atime > mailbuf.st_mtime) + printf("You have mail.\n"); + else diff -urN ssh2.old/patches/patch-ai ssh2/patches/patch-ai --- ssh2.old/patches/patch-ai Fri Jun 18 15:55:00 1999 +++ ssh2/patches/patch-ai Fri Jun 18 16:18:25 1999 @@ -1,8 +1,8 @@ ---- lib/sshsession/sshunixuser.c.orig Fri Jan 29 12:06:07 1999 -+++ lib/sshsession/sshunixuser.c Sat Feb 6 03:00:28 1999 -@@ -55,6 +55,10 @@ - #include "tcbc2.h" - #endif /* HAVE_OSF1_C2_SECURITY */ +--- lib/sshsession/sshunixuser.c.orig Tue May 4 20:09:15 1999 ++++ lib/sshsession/sshunixuser.c Fri Jun 18 16:18:08 1999 +@@ -56,6 +56,10 @@ + + #define SSH_DEBUG_MODULE "SshUnixUser" +#ifdef HAVE_LOGIN_CAP_H +#include <login_cap.h> @@ -11,7 +11,7 @@ extern char *crypt(const char *key, const char *salt); /* Data type to hold machine-specific user data. */ -@@ -713,6 +717,24 @@ +@@ -776,6 +780,24 @@ /* Set uid, gid, and groups. */ if (getuid() == UID_ROOT || geteuid() == UID_ROOT) { @@ -35,12 +35,12 @@ +#else if (setgid(ssh_user_gid(uc)) < 0) { - ssh_debug("ssh_user_become: setgid: %s", strerror(errno)); -@@ -745,6 +767,7 @@ - (int)ssh_user_uid(uc), strerror(errno)); + SSH_DEBUG(2, ("ssh_user_become: setgid: %s", strerror(errno))); +@@ -830,6 +852,7 @@ return FALSE; } + #endif /* HAVE_SIA */ +#endif /* HAVE_LOGIN_CAP_H */ } - if (getuid() != ssh_user_uid(uc) || geteuid() != ssh_user_uid(uc)) + /* We are now running with the user's privileges. */ diff -urN ssh2.old/pkg/PLIST ssh2/pkg/PLIST --- ssh2.old/pkg/PLIST Fri Jun 18 15:55:00 1999 +++ ssh2/pkg/PLIST Sat Jun 19 03:59:44 1999 @@ -26,6 +26,8 @@ @exec mv %D/bin/ssh-askpass %D/bin/ssh-askpass.old bin/ssh-askpass @unexec mv -f %B/%f.old %B/%f +bin/ssh-signer2 +bin/ssh-signer etc/ssh2/ssh2_config etc/ssh2/sshd2_config man/man1/sftp.1.gz diff -urN ssh2.old/pkg/PLIST.ssh2_only ssh2/pkg/PLIST.ssh2_only --- ssh2.old/pkg/PLIST.ssh2_only Fri Jun 18 15:55:00 1999 +++ ssh2/pkg/PLIST.ssh2_only Sat Jun 19 03:59:13 1999 @@ -14,6 +14,8 @@ bin/ssh-add bin/ssh-askpass2 bin/ssh-askpass +bin/ssh-signer2 +bin/ssh-signer etc/rc.d/sshd.sh etc/ssh2/ssh2_config etc/ssh2/sshd2_config To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199906181910.MAA01436>