diff options
| author | Brian Feldman <green@FreeBSD.org> | 1999-11-17 20:12:35 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 1999-11-17 20:12:35 +0000 |
| commit | db156967fa65b5609e6ba7adf04f9decc4de8cfd (patch) | |
| tree | 0cc3516a0782c1075fb82d9cb968be73f8811086 | |
| parent | Thanks to those who replied! The include (ssl versus openssl) transform (diff) | |
Update OpenSSH to the latest CVS_DATE.
CVS_SITE is now MASTER_SITES, and each is tried if the previous fails
Include a :pserver: as one of the CVS repositories, so those inside firewalls
should be able to fetch SSH. If this doesn't work for everyone, I've still
got a trick up my sleeve.
Fix rlimit-related warnings people are seeing by moving the setclasscontext()
to before the switching of uids. Let me know if this does not work, as I
never got the warnings in the first place.
Don't clobber sshd_config, etc. Instead, if they're there, just warn of
their existance.
Take the config files and sshd.sh out of the pkg/PLIST, mainly so you don't
lose your configuration files by doing a "make deinstall reinstall clean"
update.
Parts submitted by: Robert Muir <rmuir@gibralter.net>, Travis Mikalson <bofh@terranova.net>
Notes
Notes:
svn path=/head/; revision=23167
| -rw-r--r-- | security/openssh/Makefile | 31 | ||||
| -rw-r--r-- | security/openssh/distinfo | 6 | ||||
| -rw-r--r-- | security/openssh/pkg-plist | 3 |
3 files changed, 27 insertions, 13 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index dc9d50088ff2..a6cbb0f73dea 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -9,6 +9,8 @@ DISTNAME= src/usr.bin/ssh PKGNAME= OpenSSH-1.2 CATEGORIES= security net +MASTER_SITES= anoncvs@anoncvs1.ca.openbsd.org:/cvs \ + :pserver:anoncvs@anoncvs1.usa.openbsd.org:/cvs MAINTAINER= green@FreeBSD.org @@ -21,8 +23,7 @@ CAT?= /bin/cat DISTFILES!= ${CAT} ${FILESDIR}/distfiles CVS_CMD?= cvs -z3 -CVS_DATE= Tue Nov 16 16:45:45 PST 1999 -CVS_SITE?= anoncvs@anoncvs1.ca.openbsd.org:/cvs +CVS_DATE= Wed Nov 17 14:09:01 EST 1999 CRYPTOLIBS= -L${PREFIX}/lib -lcrypto .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES CRYPTOLIBS+= -lRSAglue -lrsaref @@ -52,9 +53,19 @@ do-fetch: export CVS_RSH="${PORTS_CVS_RSH}"; \ fi; \ ${MKDIR} ${DISTDIR}/${PKGNAME} && \ - cd ${DISTDIR}/${PKGNAME} && \ - ${CVS_CMD} -d ${CVS_SITE} co -D "${CVS_DATE}" ${DISTNAME} && \ - ${ECHO} -n ${CVS_DATE} > ${STAMPFILE}; \ + cd ${DISTDIR}/${PKGNAME} || exit; \ + for CVS_SITE in ${MASTER_SITES}; do \ + ${ECHO_MSG} ">> Attempting to CVS checkout from\ + $${CVS_SITE}."; \ + ${CVS_CMD} -d $${CVS_SITE} co -D "${CVS_DATE}" \ + ${DISTNAME} && { ${ECHO} -n ${CVS_DATE} > \ + ${STAMPFILE} && exit; }; \ + done; \ + ${ECHO_MSG} ">> Couldn't CVS checkout ${PKGNAME}. Please try\ + to retrieve"; \ + ${ECHO_MSG} ">> this port manually into ${_DISTDIR} and try\ + again."; \ + exit 1; \ fi do-extract: @@ -72,11 +83,17 @@ post-patch: ${WRKSRC}/*.[ch] pre-install: - @cd ${WRKSRC} && ${MAKE} DESTDIR=${PREFIX} distribution + @if [ ! -f ${PREFIX}/etc/sshd_config ]; then \ + cd ${WRKSRC} && ${MAKE} DESTDIR=${PREFIX} distribution; \ + else \ + ${ECHO} ">> ${PREFIX}/etc/sshd_config exists, not being replaced!"; \ + ${ECHO} ">> If this is left over from another version of SSH, you will"; \ + ${ECHO} ">> need to update it to work with OpenSSH."; \ + fi post-install: @if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \ + ${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; \ diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 7001e99c3d2a..12d563431e7c 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -56,7 +56,7 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/readpass.c) = 88a5e2a41c43d53d3dac739f7110e3db MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.c) = 60f3f3aa33911742feb13032e06fb6a1 MD5 (OpenSSH-1.2/src/usr.bin/ssh/rsa.h) = b4175dcd58022ac6961ac57a255718a7 MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.1) = a9144b2b272d8ac656b1d63c71644999 -MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = dbe9a6bd347ef622e1248751ff2707b2 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = 034c71d912a5524f781aefb4569a7685 MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.c) = 751b822fb21c816b40b457cf0b736c11 MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.h) = 468c25070e4afbccf948730311690a34 MD5 (OpenSSH-1.2/src/usr.bin/ssh/serverloop.c) = 2bc1b89e4ce7fb8942fcdb61922b56b0 @@ -70,9 +70,9 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 79990c8a57e503ed1edbb66a772f210c MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = cea39462d5846a2fc799a6e7551a8d45 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = fb253bd3a36bcef99f1c4f5b63cef8e7 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f -MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = eae083dc313b8976add5ad1ea30f8fa1 +MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 607fa8cfbad59d2680f90a9593aff8f7 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.8) = 97965e2d3844e6bc5979dcaa268af7bb -MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 7105359a53ed30d552b64d215bed16bf +MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = d4f036cdef7ae8201cab920694418e5f 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/pkg-plist b/security/openssh/pkg-plist index 22342ca2975d..4cd9e6d7bfe1 100644 --- a/security/openssh/pkg-plist +++ b/security/openssh/pkg-plist @@ -3,9 +3,6 @@ bin/ssh bin/ssh-add bin/ssh-agent bin/ssh-keygen -etc/rc.d/sshd.sh -etc/ssh_config -etc/sshd_config man/man1/scp.1.gz man/man1/slogin.1.gz man/man1/ssh-add.1.gz |