diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/hpn-ssh/Makefile | 2 | ||||
| -rw-r--r-- | security/hpn-ssh/distinfo | 2 | ||||
| -rw-r--r-- | security/openssh-portable/Makefile | 2 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 2 | ||||
| -rw-r--r-- | security/openssh/Makefile | 3 | ||||
| -rw-r--r-- | security/openssh/distinfo | 3 | ||||
| -rw-r--r-- | security/openssh/files/patch-ad | 15 | ||||
| -rw-r--r-- | security/openssh/files/patch-am | 22 |
8 files changed, 24 insertions, 27 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile index 80c54234d1fc..bed49337273f 100644 --- a/security/hpn-ssh/Makefile +++ b/security/hpn-ssh/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openssh -PORTVERSION= 3.0p1 +PORTVERSION= 3.0.1p1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/hpn-ssh/distinfo b/security/hpn-ssh/distinfo index c238084503b3..a5e34c67f017 100644 --- a/security/hpn-ssh/distinfo +++ b/security/hpn-ssh/distinfo @@ -1 +1 @@ -MD5 (openssh-3.0p1.tar.gz) = 8f60ea3933b405a697e09c0eec46ab82 +MD5 (openssh-3.0.1p1.tar.gz) = ded31e3ca433790bab7584b4521ddd52 diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 80c54234d1fc..bed49337273f 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openssh -PORTVERSION= 3.0p1 +PORTVERSION= 3.0.1p1 CATEGORIES= security ipv6 MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \ diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index c238084503b3..a5e34c67f017 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1 +1 @@ -MD5 (openssh-3.0p1.tar.gz) = 8f60ea3933b405a697e09c0eec46ab82 +MD5 (openssh-3.0.1p1.tar.gz) = ded31e3ca433790bab7584b4521ddd52 diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 3fc5b5620858..4284769ad215 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -6,12 +6,13 @@ # PORTNAME= openssh -PORTVERSION= 3.0 +PORTVERSION= 3.0.1 CATEGORIES= security MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/ \ ftp://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/ \ ftp://ftp1.se.openbsd.org/pub/OpenBSD/OpenSSH/ DISTNAME= openssh-${PORTVERSION} +PATCHFILES= openbsd2x_3.0.1.patch EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org diff --git a/security/openssh/distinfo b/security/openssh/distinfo index 9198f8f3e3fc..6160b0b41513 100644 --- a/security/openssh/distinfo +++ b/security/openssh/distinfo @@ -1 +1,2 @@ -MD5 (openssh-3.0.tgz) = b7b0bb52480d966c9578e46b2fe35143 +MD5 (openssh-3.0.1.tgz) = 7101eb5ad3546e1031e5358a6d40c009 +MD5 (openbsd2x_3.0.1.patch) = 8215a1278530ae84640dd866743f2002 diff --git a/security/openssh/files/patch-ad b/security/openssh/files/patch-ad index 7dcdab138466..f3bbcbbe37d3 100644 --- a/security/openssh/files/patch-ad +++ b/security/openssh/files/patch-ad @@ -1,22 +1,19 @@ ---- lib/Makefile.orig Mon Sep 24 22:34:07 2001 -+++ lib/Makefile Wed Oct 3 13:45:40 2001 -@@ -9,10 +9,14 @@ +--- lib/Makefile.orig Tue Jun 26 19:52:41 2001 ++++ lib/Makefile Thu Nov 15 06:10:43 2001 +@@ -9,7 +9,11 @@ rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c atomicio.c \ key.c dispatch.c kex.c mac.c uuencode.c misc.c \ rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ - scard.c + scard.c strlcpy.c strlcat.c - - SRCS+= readpassphrase.c - ++ +.if defined(COMPAT_GETADDRINFO) +SRCS+= getaddrinfo.c getnameinfo.c name6.c rcmd.c bindresvport.c +.endif -+ + NOPROFILE= yes NOPIC= yes - -@@ -20,6 +24,8 @@ +@@ -18,6 +22,8 @@ @echo -n .include <bsd.own.mk> diff --git a/security/openssh/files/patch-am b/security/openssh/files/patch-am index 8c88701f8682..1cf6fe09175c 100644 --- a/security/openssh/files/patch-am +++ b/security/openssh/files/patch-am @@ -1,6 +1,6 @@ ---- sshd/Makefile.orig Sun Aug 20 14:42:41 2000 -+++ sshd/Makefile Sat Nov 4 17:08:36 2000 -@@ -3,8 +3,8 @@ +--- sshd/Makefile.orig Fri Nov 16 06:02:09 2001 ++++ sshd/Makefile Fri Nov 16 06:03:51 2001 +@@ -5,8 +5,8 @@ PROG= sshd BINOWN= root BINMODE=555 @@ -9,17 +9,17 @@ +BINDIR= /sbin +MAN8= sshd.8 CFLAGS+=-DHAVE_LOGIN_CAP + #CFLAGS+=-DBSD_AUTH - SRCS= sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \ -@@ -12,6 +12,7 @@ - auth.c auth1.c auth2.c auth-options.c session.c +@@ -17,6 +17,7 @@ + auth-skey.c auth-bsdauth.c .include <bsd.own.mk> # for KERBEROS and AFS +.include "../Makefile.inc" - .if (${KERBEROS} == "yes") - .if (${AFS} == "yes") -@@ -19,9 +20,9 @@ + .if (${KERBEROS5:L} == "yes") + CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV +@@ -31,15 +32,15 @@ LDADD+= -lkafs DPADD+= ${LIBKRBAFS} .endif # AFS @@ -31,12 +31,10 @@ DPADD+= ${LIBKRB} .endif # KERBEROS -@@ -31,7 +32,7 @@ - .include <bsd.prog.mk> -LDADD+= -lcrypto -lutil -lz +LDADD+= ${CRYPTOLIBS} -lcrypt -lutil -lz DPADD+= ${LIBCRYPTO} ${LIBUTIL} ${LIBZ} - .if (${TCP_WRAPPERS} == "yes") + .if (${TCP_WRAPPERS:L} == "yes") |