Index: head/security/ssh2/Makefile =================================================================== --- head/security/ssh2/Makefile (revision 16539) +++ head/security/ssh2/Makefile (revision 16540) @@ -1,100 +1,100 @@ # New ports collection makefile for: ssh2 -# Version required: 2.0.11 +# Version required: 2.0.* # Date created: 5 Oct 1998 # Whom: Issei Suzuki # -# $Id: Makefile,v 1.74 1998/12/01 09:33:58 obrien Exp $ +# $Id: Makefile,v 1.75 1998/12/01 11:10:33 obrien Exp $ # # Maximal ssh2 package requires YES values for # USE_SSH1, USE_TCPWRAP -DISTNAME= ssh-2.0.11 +DISTNAME= ssh-2.0.12 CATEGORIES= security net MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/ \ ftp://sunsite.unc.edu/pub/packages/security/ssh/ \ ftp://ftp.kyoto.wide.ad.jp/pub/security/ssh/ MAINTAINER= issei@jp.FreeBSD.org RESTRICTED= "Crypto; export-controlled" GNU_CONFIGURE= YES CONFIGURE_ARGS= --prefix=${PREFIX} --with-etcdir=${PREFIX}/etc #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 # # Include support for ssh1 client backward compatibility .if defined(USE_SSH1) && ${USE_SSH1} == YES BUILD_DEPENDS+= ssh1:${PORTSDIR}/security/ssh RUN_DEPENDS+= ssh1:${PORTSDIR}/security/ssh .endif # Warning: untested ! # Include support for the SecureID card .if defined(USE_SECUREID) && ${USE_SECUREID} == YES CONFIGURE_ARGS+= --with-secureid .endif .if defined(USE_TIS) && ${USE_TIS} == YES # Include support for the TIS authentication server CONFIGURE_ARGS+= --with-tis .endif # Include tcp_wrappers support .if defined(USE_TCPWRAP) && ${USE_TCPWRAP} == YES CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap" LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper .endif MAN1= ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 \ scp2.1 sftp2.1 MAN8= sshd2.8 USE_SSH1?= YES USE_TCPWRAP?= NO USE_TIS?= NO USE_SECUREID?= NO PORTDOCS= CHANGES LICENSING README .if !defined(USE_SSH1) || (defined(USE_SSH1) && ${USE_SSH1} != YES) PLIST= ${PKGDIR}/PLIST.ssh2_only .endif .if defined(NOMANCOMPRESS) MAN_SUFX= "" .else MAN_SUFX= .gz .endif post-install: .if defined(USE_SSH1) && ${USE_SSH1} == YES .for i in ssh ssh-keygen ssh-add ssh-agent scp ${MV} -f ${PREFIX}/man/man1/${i}.1${MAN_SUFX} ${PREFIX}/man/man1/${i}.old.1${MAN_SUFX} .endfor ${MV} -f ${PREFIX}/man/man8/sshd.8${MAN_SUFX} ${PREFIX}/man/man8/sshd.old.8${MAN_SUFX} .endif # .if !defined(NOMANCOMPRESS) .for i in ssh ssh-keygen ssh-add ssh-agent scp sftp ${RM} -f ${PREFIX}/man/man1/${i}.1 ${LN} -sf ${i}2.1.gz ${PREFIX}/man/man1/${i}.1.gz .endfor ${RM} -f ${PREFIX}/man/man8/sshd.8 ${LN} -sf sshd2.8.gz ${PREFIX}/man/man8/sshd.8.gz .endif # .if !defined(NOPORTDOCS) -${MKDIR} ${PREFIX}/share/doc/ssh2 .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/ssh2 .endfor .endif # @if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/sshd.sh; \ ${ECHO} "[ -x ${PREFIX}/sbin/sshd ] && ${PREFIX}/sbin/sshd && ${ECHO} -n ' sshd'" >> ${PREFIX}/etc/rc.d/sshd.sh; \ chmod 751 ${PREFIX}/etc/rc.d/sshd.sh; \ fi @if [ -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \ chmod -x ${PREFIX}/etc/rc.d/sshd.sh; \ fi .include Property changes on: head/security/ssh2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.75 \ No newline at end of property +1.76 \ No newline at end of property Index: head/security/ssh2/distinfo =================================================================== --- head/security/ssh2/distinfo (revision 16539) +++ head/security/ssh2/distinfo (revision 16540) @@ -1 +1 @@ -MD5 (ssh-2.0.11.tar.gz) = 2c93c5fa0cb530178bee8675e92be785 +MD5 (ssh-2.0.12.tar.gz) = 506632f8a9c2f5201587e2130a4d5408 Property changes on: head/security/ssh2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/security/ssh2/files/patch-aa =================================================================== --- head/security/ssh2/files/patch-aa (revision 16539) +++ head/security/ssh2/files/patch-aa (revision 16540) @@ -1,31 +1,31 @@ ---- lib/Makefile.in.old Tue Nov 24 18:18:33 1998 -+++ lib/Makefile.in Tue Nov 24 18:20:13 1998 -@@ -97,14 +97,14 @@ +--- 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 @@ 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 # sshtest testsuite lib_LIBRARIES = libssh.a - # libsshcrypt.kpure.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 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../sshconf.h CONFIG_CLEAN_FILES = -@@ -367,11 +367,6 @@ +@@ -368,11 +368,6 @@ all-local: includes 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 -for dir in $(SUBDIRS); do \ if test "$$dir" != "zlib" && test "$$dir" != "gmp"; then \ ( cd $$dir && $(MAKE) includes) ; \ Property changes on: head/security/ssh2/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/security/ssh2/files/patch-ac =================================================================== --- head/security/ssh2/files/patch-ac (revision 16539) +++ head/security/ssh2/files/patch-ac (revision 16540) @@ -1,11 +1,10 @@ ---- lib/sshcrypt/Makefile.in.old Tue Nov 24 18:24:57 1998 -+++ lib/sshcrypt/Makefile.in Tue Nov 24 18:25:21 1998 -@@ -173,7 +173,7 @@ - INCLUDES = -I../.. -I. -I$(srcdir) \ +--- 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 @@ -I$(top_builddir) -I$(top_srcdir) \ -I../sshutil -I$(srcdir)/../sshutil \ -- -I../sshmath -I$(srcdir)/../sshmath -I../zlib -I$(srcdir)/../zlib \ -+ -I../sshmath -I$(srcdir)/../sshmath \ + -I../sshmath -I$(srcdir)/../sshmath \ +- -I../zlib -I$(srcdir)/../zlib \ -I../sshscard -I$(srcdir)/../sshscard \ -I../trq -I$(srcdir)/../trq mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs Property changes on: head/security/ssh2/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.18 \ No newline at end of property +1.19 \ No newline at end of property Index: head/security/ssh2/files/patch-ag =================================================================== --- head/security/ssh2/files/patch-ag (revision 16539) +++ head/security/ssh2/files/patch-ag (revision 16540) @@ -1,20 +1,20 @@ ---- configure.orig Mon Nov 16 15:24:41 1998 -+++ configure Fri Jan 29 00:24:27 1999 -@@ -4825,7 +4825,7 @@ +--- configure.orig Fri Jan 29 14:30:18 1999 ++++ configure Fri Feb 5 08:55:50 1999 +@@ -4874,7 +4874,7 @@ char tgetent(); int main() { -tgetent() +XXXtgetent() ; return 0; } EOF - if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then -@@ -4855,7 +4855,7 @@ + if { (eval echo configure:4881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +@@ -4904,7 +4904,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 Property changes on: head/security/ssh2/files/patch-ag ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/security/ssh2/files/patch-ah =================================================================== --- head/security/ssh2/files/patch-ah (nonexistent) +++ head/security/ssh2/files/patch-ah (revision 16540) @@ -0,0 +1,23 @@ +--- apps/ssh/sshchsession.c.bak Mon Jan 18 13:32:24 1999 ++++ apps/ssh/sshchsession.c Fri Feb 5 08:49:14 1999 +@@ -628,12 +628,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); Property changes on: head/security/ssh2/files/patch-ah ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property