mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

- Update to 3.1.0.

Browse Source 
PR:		ports/34740
  Submitted by:	larse@ISI.EDU

- Add %%PORTDOCS%% to pkg-plist.

- Assign MAINTAINER to the submitter.

  Requested by:	issei (previous MAINTAINER)
This commit is contained in:
Akinori MUSHA 2002-02-22 02:52:25 +00:00
parent 2cc65c878e
commit 2658ba9c3c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=55065
14 changed files with 45 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
security/ssh2/Makefile
View File

@ -6,23 +6,28 @@
#
PORTNAME= ssh2
PORTVERSION= 2.3.0
PORTVERSION= 3.1.0
CATEGORIES= security
MASTER_SITES= ftp://ftp.ssh.com/pub/ssh/ \
ftp://sunsite.unc.edu/pub/packages/security/ssh/ \
ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/
ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/ \
ftp://ftp.cis.fed.gov/pub/ssh/ \
ftp://ftp.keystealth.org/pub/ssh/ \
ftp://mirror.chpc.utah.edu/pub/ssh/ \
ftp://metalab.unc.edu/pub/packages/security/ssh/ \
ftp://herbie.ucs.indiana.edu/pub/security/ssh/
DISTNAME= ssh-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
MAINTAINER= larse@ISI.EDU
#RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --disable-compiler-optimizations
CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc/ssh2
#Uncomment if all your users are in their own group and their homedir
#is writeable by that group. Beware the security implications!
#CONFIGURE_ARGS+= --enable-group-writeability
#CONFIGURE_ARGS+= --enable-group-writeability
.include <bsd.port.pre.mk>
@ -30,28 +35,30 @@ CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --disable-compiler-optimizations
#WITH_TCPWRAP= yes
.if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCPWRAP)
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --with-libwrap
.elif defined(WITH_TCPWRAP)
CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
CONFIGURE_ARGS+= --with-libwrap="-L${LOCALBASE}/lib -lwrap"
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
MAN1= scp.1 sftp.1 scp2.1 sftp2.1 sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 \
ssh-pubkeymgr.1 ssh2.1 ssh-chrootmgr.1 ssh-agent.1 ssh-keygen.1 \
ssh-add.1 ssh-add2.1 ssh-agent2.1 ssh-keygen2.1
MAN5= ssh2_config.5 sshd2_config.5
MAN8= sshd.8 sshd2.8
MAN1= ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 scp2.1 sftp2.1 \
sshregex.1 ssh-probe2.1 ssh-dummy-shell.1 ssh-pubkeymgr.1 \
ssh-chrootmgr.1
MAN5= ssh2_config.5 sshd-check-conf.5 sshd2_config.5
MAN8= sshd2.8
MLINKS= ssh2.1 ssh.1 ssh-add2.1 ssh-add.1 ssh-agent2.1 ssh-agent.1 \
ssh-keygen2.1 ssh-keygen.1 scp2.1 scp.1 sftp2.1 sftp.1 \
ssh-probe2.1 ssh-probe.1 sshd2.8 sshd.8
MANCOMPRESSED= no
PORTDOCS= BUG.REPORT CHANGES FAQ INSTALL LICENSE README \
SSH2.QUICKSTART
PORTDOCS= BUG.REPORT CHANGES FAQ INSTALL LICENSE MANIFEST NEWS README \
REGEX-SYNTAX SSH2.QUICKSTART
post-install:
${RM} ${PREFIX}/man/man1/ssh.1
${RM} ${PREFIX}/man/man1/ssh-probe.1
.if !defined(NOPORTDOCS)
-${MKDIR} ${PREFIX}/share/doc/ssh2
${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ssh2
${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
.endfor
.endif
#

2
security/ssh2/distinfo
View File

@ -1 +1 @@
MD5 (ssh-2.3.0.tar.gz) = 2296fa2ad3474f117759f65678ce0e7a
MD5 (ssh-3.1.0.tar.gz) = 0a692bff9c0b2cdb1333c4b5bb8d4a1c

32
security/ssh2/files/patch-aa
View File

@ -1,32 +0,0 @@
--- lib/Makefile.in.orig Thu Aug 24 17:41:39 2000
+++ lib/Makefile.in Sun Aug 27 01:13:32 2000
@@ -110,7 +110,7 @@
AUTOMAKE_OPTIONS = 1.0 foreign dist-zip no-dependencies
-SUBDIRS = sshutil zlib sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
+SUBDIRS = sshutil sshmath sshreadline sshapputil sshcrypt sshproto sshsession sshpgp sshfilexfer
SUBDIRS_windelta = +win32
@@ -119,7 +119,7 @@
# The `object_SUBLIBRARIES' variables are used on the Windows to
# expand the original library `object' with the listed sublibraries at
# the link step.
-libssh_a_SUBLIBRARIES = sshcert/libsshcert.a sshcrypt/libsshcrypt.a sshexternalkey/libsshexternalkey.a sshhs/libsshhs.a sshhttp/libsshhttp.a sshipsecappapi/libsshipsecappapi.a sshisakmp/libsshisakmp.a sshldap/libsshldap.a sshmath/libsshmath.a sshpgp/libsshpgp.a sshproto/libsshproto.a sshscard/libsshscard.a sshtls/libsshtls.a sshsmtp/libsshsmtp.a sshemul/libsshemul.a sshutil/libsshutil.a sshfilexfer/libsshfilexfer.a sshsession/libsshsession.a trq/libtrq.a zlib/libz.a
+libssh_a_SUBLIBRARIES = sshcert/libsshcert.a sshcrypt/libsshcrypt.a sshexternalkey/libsshexternalkey.a sshhs/libsshhs.a sshhttp/libsshhttp.a sshipsecappapi/libsshipsecappapi.a sshisakmp/libsshisakmp.a sshldap/libsshldap.a sshmath/libsshmath.a sshpgp/libsshpgp.a sshproto/libsshproto.a sshscard/libsshscard.a sshtls/libsshtls.a sshsmtp/libsshsmtp.a sshemul/libsshemul.a sshutil/libsshutil.a sshfilexfer/libsshfilexfer.a sshsession/libsshsession.a trq/libtrq.a
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../sshconf.h
@@ -319,11 +319,6 @@
local-includes:
-if test '!' -d ../include; then mkdir ../include; fi
- for i in zlib/zlib.h zlib/zconf.h; do \
- if test -f $(srcdir)/$$i; then \
- $(COPY_INCLUDE) $(srcdir)/$$i ../include; \
- fi; \
- done
includes: local-includes
for d in $(SUBDIRS); do (cd $$d && $(MAKE) includes); done

11
security/ssh2/files/patch-ab
View File

@ -1,11 +0,0 @@
--- lib/sshapputil/Makefile.in.orig Sun Aug 27 01:23:04 2000
+++ lib/sshapputil/Makefile.in Sun Aug 27 01:23:41 2000
@@ -128,7 +128,7 @@
include_HEADERS = sshuserfile.h sshuserfilebuf.h
-INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
+INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../sshconf.h

11
security/ssh2/files/patch-ac
View File

@ -1,11 +0,0 @@
--- lib/sshcrypt/Makefile.in.orig Thu Aug 24 17:41:49 2000
+++ lib/sshcrypt/Makefile.in Sun Aug 27 01:15:02 2000
@@ -149,7 +149,7 @@
LDADD = libsshcrypt.a ../sshutil/libsshutil.a ../sshmath/libsshmath.a
-INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
+INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../sshconf.h

11
security/ssh2/files/patch-ad
View File

@ -1,11 +0,0 @@
--- lib/sshreadline/Makefile.in.orig Thu Aug 24 17:41:51 2000
+++ lib/sshreadline/Makefile.in Sun Aug 27 01:15:31 2000
@@ -127,7 +127,7 @@
include_HEADERS = sshreadline.h
-INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/zlib -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
+INCLUDES = $(ADD_INCLUDES) -I$(srcdir) -I. -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/lib/sshutil -I$(top_srcdir)/lib/sshutil/sshcore -I$(top_srcdir)/lib/sshutil/sshadt -I$(top_srcdir)/lib/sshutil/ssholdadt -I$(top_srcdir)/lib/sshutil/sshstrutil -I$(top_srcdir)/lib/sshutil/ssheloop -I$(top_srcdir)/lib/sshutil/sshstream -I$(top_srcdir)/lib/sshutil/sshfsm -I$(top_srcdir)/lib/sshutil/sshsysutil -I$(top_srcdir)/lib/sshutil/sshnet -I$(top_srcdir)/lib/sshutil/sshmisc -I$(top_srcdir)/lib/sshutil/sshpacketstream -I$(top_srcdir)/lib/sshutil/sshtestutil -I$(top_srcdir)/lib/sshmath -I$(top_srcdir)/lib/sshreadline -I$(top_srcdir)/lib/sshapputil -I$(top_srcdir)/lib/sshcrypt -I$(top_srcdir)/lib/sshproto -I$(top_srcdir)/lib/sshagent -I$(top_srcdir)/lib/sshsession -I$(top_srcdir)/lib/sshhttp -I$(top_srcdir)/lib/sshscrlock -I$(top_srcdir)/lib/sshsmtp -I$(top_srcdir)/lib/sshscm -I$(top_srcdir)/lib/sshpgp -I$(top_srcdir)/lib/sshipsecappapi -I$(top_srcdir)/lib/sshhs -I$(top_srcdir)/lib/sshexternalkey -I$(top_srcdir)/lib/sshfilexfer
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../sshconf.h

11
security/ssh2/files/patch-af
View File

@ -1,11 +0,0 @@
--- apps/ssh/Makefile.in.orig Thu Aug 24 17:41:55 2000
+++ apps/ssh/Makefile.in Sun Aug 27 01:16:01 2000
@@ -143,7 +143,7 @@
INCLUDES = -I. -I$(srcdir) -I../.. -I$(srcdir) -I$(top_builddir) -I$(top_srcdir) -I../../include -I$(srcdir)/../../include
-LDADD = @ssh2_ldadd_options@
+LDADD = @ssh2_ldadd_options@ -lz
DEPENDENCIES = ./libssh2.a ../../lib/libssh.a
libssh2_a_SOURCES = agentclient.c sshchagent.c sshserver.c agentpath.c sshchsession.c sshstdiofilter.c authc-passwd.c sshchssh1agent.c sshunixconfig.c authc-pubkey.c sshchtcpfwd.c sshunixuserfiles.c auths-passwd.c sshchx11.c sshuserfiles.c auths-pubkey.c auths-kerberos.c authc-kerberos.c auths-kerberos-tgt.c authc-kerberos-tgt.c sshclient.c sshcommon.c readpass.c sshconfig.c sshauthmethodc.c sshauthmethods.c sshglob.c auths-common.c sshttyflags.c auths-hostbased.c authc-hostbased.c auths-hostbased-rhosts.c ssh2pgppub.c ssh2pgpsec.c ssh2pgputil.c sshappcommon.c sshfilecopy.c sshgetcwd.c sshfc_conn.c sshfc_glob.c sshfc_transfer.c sshfc_recurse.c sshserverprobe.c ssh1encode.c ssh1keydecode.c

20
security/ssh2/files/patch-ag
View File

@ -1,20 +0,0 @@
--- configure.orig Thu Aug 24 17:41:37 2000
+++ configure Sun Aug 27 01:16:15 2000
@@ -6021,7 +6021,7 @@
char tgetent();
int main() {
-tgetent()
+XXXtgetent()
; return 0; }
EOF
if { (eval echo configure:6028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -6145,7 +6145,7 @@
echo "$ac_t""no" 1>&6
fi
-for ac_hdr in termcap.h term.h curses.h termios.h termio.h
+for ac_hdr in termcap.h termios.h termio.h
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

115
security/ssh2/files/patch-ah
View File

@ -1,115 +0,0 @@
--- apps/ssh/sshchsession.c.orig Thu Aug 24 17:40:41 2000
+++ apps/ssh/sshchsession.c Sun Aug 27 01:16:55 2000
@@ -83,6 +83,11 @@
#include <ulimit.h>
#endif /* ULIMIT_H */
+#ifdef HAVE_LOGIN_CAP_H
+#include <login_cap.h>
+extern char **environ;
+#endif
+
#define SSH_DEBUG_MODULE "Ssh2ChannelSession"
#define SSH_SESSION_INTERACTIVE_WINDOW 10000
@@ -489,6 +494,67 @@
if (getenv("TZ"))
ssh_child_set_env(envp, envsizep, "TZ", getenv("TZ"));
+#ifdef HAVE_LOGIN_CAP_H
+ {
+ char *p, *s, **tmpenv;
+ struct passwd *pwd;
+
+ pwd = getpwnam(user_name);
+ if (!pwd)
+ {
+ ssh_warning("Can't getpwnam %s: %s", user_name, strerror(errno));
+ }
+ else
+ {
+ /* Save previous environment array
+ */
+ tmpenv = environ;
+ environ = *envp;
+
+ /* Set the user's login environment
+ */
+ if (setusercontext(NULL, pwd,
+ ssh_user_uid(session->common->user_data),
+ LOGIN_SETPATH|LOGIN_SETENV) == 0)
+ {
+ p = getenv("PATH");
+ s = ssh_xmalloc((p != NULL ? strlen(p) + 1 : 0)
+ + sizeof(SSH_BINDIR));
+ *s = '\0';
+ if (p != NULL)
+ {
+ strcat(s, p);
+ strcat(s, ":");
+ }
+ strcat(s, SSH_BINDIR);
+
+ /* 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);
+ }
+ else
+ {
+ *envp = environ;
+ environ = tmpenv; /* Restore parent environment */
+ ssh_warning("Can't setusercontext env. variables: %s", strerror(errno));
+ }
+ }
+ endpwent();
+ }
+#endif /* HAVE_LOGIN_CAP_H */
+
/* Set SSH_CLIENT. */
snprintf(buf, sizeof(buf), "%s %s %s %s",
session->common->remote_ip, session->common->remote_port,
@@ -729,12 +795,20 @@
char buff[100], *time_string;
/* Check /etc/nologin. */
+#ifdef __FreeBSD__
+ f = fopen("/var/run/nologin", "r");
+#else
f = fopen("/etc/nologin", "r");
+#endif
if (f)
{ /* /etc/nologin exists. Print its contents and exit. */
/* Print a message about /etc/nologin existing; I am getting
questions because of this every week. */
+#ifdef __FreeBSD__
+ ssh_warning("Logins are currently denied by /var/run/nologin:");
+#else
ssh_warning("Logins are currently denied by /etc/nologin:");
+#endif
while (fgets(buf, sizeof(buf), f))
fputs(buf, stderr);
fclose(f);
@@ -918,7 +992,11 @@
{
struct stat mailbuf;
if (stat(mailbox, &mailbuf) == -1 || mailbuf.st_size == 0)
+#ifndef __FreeBSD__
printf("No mail.\n");
+#else
+ ;
+#endif
else if (mailbuf.st_atime > mailbuf.st_mtime)
printf("You have mail.\n");
else

46
security/ssh2/files/patch-ai
View File

@ -1,46 +0,0 @@
--- lib/sshsession/sshunixuser.c.orig Thu Aug 24 17:40:39 2000
+++ lib/sshsession/sshunixuser.c Sun Aug 27 01:21:57 2000
@@ -86,6 +86,10 @@
#define SSH_DEBUG_MODULE "SshUnixUser"
+#ifdef HAVE_LOGIN_CAP_H
+#include <login_cap.h>
+#endif /* HAVE_LOGIN_CAP_H */
+
extern char *crypt(const char *key, const char *salt);
/* Data type to hold machine-specific user data. */
@@ -1224,6 +1228,24 @@
/* Set uid, gid, and groups. */
if (getuid() == UID_ROOT || geteuid() == UID_ROOT)
{
+#ifdef HAVE_LOGIN_CAP_H
+ struct passwd *pwd;
+
+ pwd = getpwnam(ssh_user_name(uc));
+ if (!pwd)
+ {
+ ssh_debug("ssh_user_become: getpwnam: %s", strerror(errno));
+ return FALSE;
+ }
+ if (setusercontext(NULL, pwd, ssh_user_uid(uc),
+ LOGIN_SETALL & ~(LOGIN_SETLOGIN|LOGIN_SETPATH|LOGIN_SETENV)) != 0)
+ {
+ ssh_debug("ssh_user_become: setusercontext: %s", strerror(errno));
+ return FALSE;
+ }
+ endpwent();
+ endgrent();
+#else
if (setgid(ssh_user_gid(uc)) < 0)
{
SSH_DEBUG(2, ("ssh_user_become: setgid: %s", strerror(errno)));
@@ -1280,6 +1302,7 @@
}
#endif /* HAVE_SIA */
#endif /* SSHDIST_SESSION_SIA */
+#endif /* HAVE_LOGIN_CAP_H */
}
#ifdef KERBEROS

19
security/ssh2/files/patch-aj
View File

@ -1,19 +0,0 @@
--- lib/sshutil/sshincludes.h.orig Thu Aug 24 17:43:30 2000
+++ lib/sshutil/sshincludes.h Sun Aug 27 01:22:27 2000
@@ -213,7 +213,7 @@
#define SSH_UID_ROOT 0
#endif /* SSH_UID_ROOT */
-#ifdef SSHDIST_ZLIB
+#if defined(SSHDIST_ZLIB) && !defined(__FreeBSD__)
/* Define zlib to have ssh prefix, so we will not care if there is another zlib
in the kernel */
#define deflateInit_ ssh_z_deflateInit_
@@ -249,6 +249,6 @@
#define uLongf ssh_z_uLongf
#define voidpf ssh_z_voidpf
#define voidp ssh_z_voidp
-#endif /* SSHDIST_ZLIB */
+#endif /* SSHDIST_ZLIB && !__FreeBSD__ */
#endif /* SSHINCLUDES_H */

13
security/ssh2/files/patch-ak
View File

@ -1,13 +0,0 @@
--- apps/ssh/sshd2_config.orig Sun Aug 27 02:30:53 2000
+++ apps/ssh/sshd2_config Sun Aug 27 02:31:08 2000
@@ -90,8 +90,8 @@
## SSH1 compatibility
-# Ssh1Compatibility <set by configure by default>
-# Sshd1Path <set by configure by default>
+ Ssh1Compatibility yes
+ Sshd1Path /usr/sbin/sshd
## Chrooted environment settings

10
security/ssh2/files/patch-al
View File

@ -1,10 +0,0 @@
--- apps/ssh/ssh2_config.orig Sun Aug 27 02:30:11 2000
+++ apps/ssh/ssh2_config Sun Aug 27 02:30:48 2000
@@ -43,6 +43,7 @@
## SSH1 Compatibility
Ssh1Compatibility yes
+ Ssh1Path /usr/bin/ssh
Ssh1AgentCompatibility none
# Ssh1AgentCompatibility traditional
# Ssh1AgentCompatibility ssh2

27
security/ssh2/pkg-plist
View File

@ -6,6 +6,8 @@ bin/ssh-keygen2
bin/ssh-add2
bin/ssh-signer2
bin/ssh-probe2
bin/ssh-askpass2
bin/ssh-pam-client
bin/sftp-server2
bin/ssh-dummy-shell
bin/ssh-pubkeymgr
@ -21,17 +23,26 @@ bin/sftp-server
bin/ssh-signer
bin/ssh-probe
etc/rc.d/sshd.sh
etc/ssh2/hostkey
etc/ssh2/hostkey.pub
etc/ssh2/sshd2_config
etc/ssh2/ssh2_config
etc/ssh2/ssh_dummy_shell.out
sbin/sshd2
sbin/sshd-check-conf
sbin/sshd
share/doc/ssh2/BUG.REPORT
share/doc/ssh2/CHANGES
share/doc/ssh2/FAQ
share/doc/ssh2/INSTALL
share/doc/ssh2/LICENSE
share/doc/ssh2/README
share/doc/ssh2/SSH2.QUICKSTART
@dirrm share/doc/ssh2
@dirrm etc/ssh2/knownhosts
@dirrm etc/ssh2/hostkeys
@dirrm etc/ssh2
@exec if [ ! -f %D/etc/ssh2/hostkey ]; then umask 022; echo "Generating 1024 bit host key."; %D/bin/ssh-keygen2 -P -b 1024 -t dsa -c "1024-bit dsa hostkey" -o %D/etc/ssh2/hostkey; fi
%%PORTDOCS%%share/doc/ssh2/BUG.REPORT
%%PORTDOCS%%share/doc/ssh2/CHANGES
%%PORTDOCS%%share/doc/ssh2/FAQ
%%PORTDOCS%%share/doc/ssh2/INSTALL
%%PORTDOCS%%share/doc/ssh2/LICENSE
%%PORTDOCS%%share/doc/ssh2/MANIFEST
%%PORTDOCS%%share/doc/ssh2/NEWS
%%PORTDOCS%%share/doc/ssh2/README
%%PORTDOCS%%share/doc/ssh2/REGEX-SYNTAX
%%PORTDOCS%%share/doc/ssh2/SSH2.QUICKSTART
%%PORTDOCS%%@dirrm share/doc/ssh2