diff options
| author | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-01-18 11:18:25 +0000 |
|---|---|---|
| committer | Munechika SUMIKAWA <sumikawa@FreeBSD.org> | 2000-01-18 11:18:25 +0000 |
| commit | 9df24a193823688f18b834839e1502fb5bd19ce2 (patch) | |
| tree | e0062887449a8b414fa2ab30ef67c12e485e7d5e | |
| parent | Oops, forgot to update the checksum file. (diff) | |
- remove me from another MAINTAINER
- add 'ipv6' on CATEGORIES
- use ${OSVERSION} instead of ${USE_INET6} for checking getaddrinfo()
existence.
- fix broken ${ECHO_MSG}
- avoid duplicate copying rcmd.c
Notes
Notes:
svn path=/head/; revision=24814
| -rw-r--r-- | security/openssh/Makefile | 12 | ||||
| -rw-r--r-- | security/openssh/files/patch-ad | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/security/openssh/Makefile b/security/openssh/Makefile index febe1a93b81d..0da3daf81d94 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -8,12 +8,11 @@ DISTNAME= src/usr.bin/ssh PKGNAME= OpenSSH-1.2.1 -CATEGORIES= security net +CATEGORIES= security net ipv6 # ${MASTER_SITES} is only for if CVS won't work, period. MASTER_SITES= ftp://internat.FreeBSD.org/pub/Crypto/OpenSSH/ MAINTAINER= green@FreeBSD.org -MAINTAINER+= sumikawa@FreeBSD.org RESTRICTED= "One file calls external cryptographic routines." @@ -38,6 +37,9 @@ MAKE_ENV= DESTDIR=${PREFIX} MANDIR=/man/man CRYPTOLIBS="${CRYPTOLIBS}" .if defined(USE_INET6) MAKE_ENV+= USET_INET6=yes .endif +.if ${OSVERSION} < 400014 +MAKE_ENV+= COMPAT_GETADDRINFO=yes +.endif .if !exists(/usr/include/tcpd.h) MAKE_ENV+= TCP_WRAPPERS=no .endif @@ -110,17 +112,17 @@ fetchsrctarball: done; \ ${ECHO_MSG} ">> Couldn't fetch $$file."; \ ${ECHO_MSG} ">> Please try to retrieve this file manually into"; \ - ${ECHO_MSG" ">> ${_DISTDIR} and try again."; \ + ${ECHO_MSG} ">> ${_DISTDIR} and try again."; \ exit 1 do-extract: @${MKDIR} ${WRKDIR} @${CP} -r ${DISTDIR}/${PKGNAME}/${DISTNAME} ${WRKDIR} @${CP} ${FILESDIR}/strlcat.c ${FILESDIR}/strlcpy.c ${WRKSRC}/lib/ -.if !defined(USE_INET6) +.if ${OSVERSION} < 400014 @${CP} ${FILESDIR}/getaddrinfo.c ${FILESDIR}/name6.c ${WRKSRC}/lib/ @${CP} ${FILESDIR}/bindresvport.c ${FILESDIR}/rcmd.c ${WRKSRC}/lib/ - @${CP} ${FILESDIR}/getnameinfo.c ${FILESDIR}/rcmd.c ${WRKSRC}/lib/ + @${CP} ${FILESDIR}/getnameinfo.c ${WRKSRC}/lib/ @${CP} ${FILESDIR}/netdb.h ${WRKSRC}/ .endif @${MKDIR} ${WRKSRC}/pam_ssh diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-ad index ee8482f484c0..fe07d2c0ee29 100644 --- a/security/openssh/files/patch-ad +++ b/security/openssh/files/patch-ad @@ -1,5 +1,5 @@ ---- lib/Makefile.orig Fri Jan 14 04:55:08 2000 -+++ lib/Makefile Fri Jan 14 08:01:17 2000 +--- lib/Makefile.orig Sun Jan 16 07:10:10 2000 ++++ lib/Makefile Tue Jan 18 14:56:00 2000 @@ -4,7 +4,12 @@ SRCS= authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \ cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \ @@ -8,7 +8,7 @@ + rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \ + strlcat.c strlcpy.c + -+.if !defined(USE_INET6) ++.if defined(COMPAT_GETADDRINFO) +SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c +.endif |