From 7b3d367711150cba22b5017a36baf757668c4260 Mon Sep 17 00:00:00 2001 From: Brian Feldman Date: Sun, 21 Nov 1999 16:42:44 +0000 Subject: Update to the latest CVS_DATE, obsoleting patches patch-a[yz]. Add "ignorelogin" login.conf functionality to sshd. The biggest change: new port functionality. Making "fetchsrctarball" will soon work for those of you who cannot use CVS to get OpenSSH. Mark Murray, the savior he is :), will use "make makesrctarball" and put the snapshots of OpenSSH source in the proper place. The current ${MASTER_SITES} is just a guess at where the snapshot files could be hosted; something definite should be worked out very soon. --- security/openssh/Makefile | 41 ++++++++++++++++++++++++++++++++++++++--- security/openssh/distinfo | 8 ++++---- security/openssh/files/patch-ay | 8 -------- 3 files changed, 42 insertions(+), 15 deletions(-) delete mode 100644 security/openssh/files/patch-ay (limited to 'security') diff --git a/security/openssh/Makefile b/security/openssh/Makefile index b4cc44501df6..14f2278a4bc7 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -9,7 +9,8 @@ DISTNAME= src/usr.bin/ssh PKGNAME= OpenSSH-1.2 CATEGORIES= security net -MASTER_SITES= # See ${CVS_SITES} +# ${MASTER_SITES} is only for if CVS won't work, period. +MASTER_SITES= ftp://internat.FreeBSD.org/pub/Crypto/misc/ MAINTAINER= green@FreeBSD.org @@ -23,7 +24,9 @@ DISTFILES!= ${CAT} ${FILESDIR}/distfiles CFLAGS+= -DHAVE_OPENPTY CVS_CMD?= cvs -z3 -CVS_DATE= Fri Nov 19 20:25:38 EST 1999 +CVS_DATE= Sun Nov 21 11:22:08 EST 1999 +SED?= /usr/bin/sed +CVS_DATE_!= ${ECHO} -n ${CVS_DATE} | ${SED} 's/[ \t:]/_/g' CVS_SITES= anoncvs@anoncvs1.ca.openbsd.org:/cvs \ :pserver:anoncvs@anoncvs1.usa.openbsd.org:/cvs CRYPTOLIBS= -L${PREFIX}/lib -lcrypto @@ -50,6 +53,13 @@ WRKSRC= ${WRKDIR}/ssh do-fetch: @if [ ! -e ${STAMPFILE} ] || \ [ "X${CVS_DATE}" != "X$$(${CAT} ${STAMPFILE})" ]; then \ + if [ -e ${DISTDIR}/${PKGNAME}.${CVS_DATE_}.tar.gz ]; then \ + cd ${DISTDIR}; \ + ${TAR} xfz ${PKGNAME}.${CVS_DATE_}.tar.gz \ + ${DISTFILES}; \ + ${ECHO} -n ${CVS_DATE} > ${STAMPFILE}; \ + exit; \ + fi; \ unset CVS_RSH CVS_SERVER || ${TRUE}; \ if [ -n "${PORTS_CVS_RSH}" ]; then \ export CVS_RSH="${PORTS_CVS_RSH}"; \ @@ -65,10 +75,35 @@ do-fetch: fi \ done; \ ${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}. Please try to retrieve"; \ - ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try again."; \ + ${ECHO_MSG} ">> a snapshot with \"make fetchsrctarball\" and try again."; \ exit 1; \ fi +makesrctarball: fetch + @cd ${DISTDIR}; \ + ${ECHO_MSG} ">> Creating source tarball in ${DISTDIR}"; \ + ${ECHO_MSG} ">> \"${PKGNAME}.${CVS_DATE_}.tar.gz\"."; \ + ${TAR} cfz ${PKGNAME}.${CVS_DATE_}.tar.gz ${PKGNAME} + +fetchsrctarball: + @cd ${DISTDIR}; \ + file=${PKGNAME}.${CVS_DATE_}.tar.gz; \ + if [ -e $$file ]; then \ + exit; \ + fi; \ + ${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \ + for site in ${MASTER_SITES}; do \ + ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \ + if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} \ + $${site}$${file}; then \ + exit; \ + fi; \ + done; \ + ${ECHO_MSG} ">> Couldn't fetch $$file."; \ + ${ECHO_MSG} ">> Please try to retrieve this file manually into"; \ + ${ECHO_MSG" ">> ${_DISTDIR} and try again."; \ + exit 1 + do-extract: @${MKDIR} ${WRKDIR} @${CP} -r ${DISTDIR}/${PKGNAME}/${DISTNAME} ${WRKDIR} diff --git a/security/openssh/distinfo b/security/openssh/distinfo index fc27ca53c11e..6d05068e01a6 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1,8 +1,8 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/COPYING.Ylonen) = d8416f438a512281d230790c8487ce0b MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile) = 7f10222699e8a34758fe63d0c7df6806 MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc) = 8f096d4d5a830efe7dde5674b482cd2b -MD5 (OpenSSH-1.2/src/usr.bin/ssh/OVERVIEW) = 2aa4be725bbc218e97ca89e5f8bb181b -MD5 (OpenSSH-1.2/src/usr.bin/ssh/README) = a744582db9d285ffbc55030ced3d87d5 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/OVERVIEW) = 5def77be758d9e4aa2390c3825ed7cb2 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/README) = e54fb9189053db5ad25892054c8d0989 MD5 (OpenSSH-1.2/src/usr.bin/ssh/RFC.nroff) = 1615f30810a3d47716883b2eaddd712c MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-krb4.c) = 5e49fb727617e55f95c66246d3c90843 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-passwd.c) = dd6381fb76a253e47e423dd1034f0cb4 @@ -65,14 +65,14 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 0e51e4ece3a96e2400f369813e9ee0d9 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.1) = 33b62903d3aa452fa106b484b016bbc5 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 2d3bc7ef09dc7b21866eb03da34100f9 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.1) = 746734eab948fff84a44c3383f5a1701 -MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = 27f16c34361e7043405dbf4e9ce943e3 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = 29198d94ca51be42214d2c7931ed78eb MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 287e6df9dcbecadcda91ac2d9e842116 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = cea39462d5846a2fc799a6e7551a8d45 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = dea24d4daef79b2dd6f44f0a4cade43d MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 6dc88619d579b1e7abfb1c2611a1faa1 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.8) = 5bdc27ad21f71a3dfac06cff380e8fd6 -MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = b8f073e7ca7bfc8822930bfe17eaf607 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 2620dd27e868ecedece3b7dbaf1ed037 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd_config) = e78b81c34da5c97eee1359cccda908d6 MD5 (OpenSSH-1.2/src/usr.bin/ssh/tildexpand.c) = 6f797f65e32fe1022ee20f291611a6e2 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.c) = b11079749fc93e0a8337af4afb3ebc43 diff --git a/security/openssh/files/patch-ay b/security/openssh/files/patch-ay deleted file mode 100644 index 1daf01e52cea..000000000000 --- a/security/openssh/files/patch-ay +++ /dev/null @@ -1,8 +0,0 @@ ---- OVERVIEW.orig Mon Nov 8 00:53:18 1999 -+++ OVERVIEW Mon Nov 8 00:53:36 1999 -@@ -1,4 +1,4 @@ --This document is inteded for those who wish to read the ssh source -+This document is intended for those who wish to read the ssh source - code. This tries to give an overview of the structure of the code. - - Copyright (c) 1995 Tatu Ylonen -- cgit v1.2.3