aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2002-05-03 03:02:30 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2002-05-03 03:02:30 +0000
commit9e4035bc2594eaa39e9974524f25da081c1a02d8 (patch)
treeab4124c8acb5bd53cb59d4312a075e463612135d
parentdbeaee84e1fb7f8cd50dbc89fa3055a79a7dd56c (diff)
downloadports-9e4035bc2594eaa39e9974524f25da081c1a02d8.tar.gz
ports-9e4035bc2594eaa39e9974524f25da081c1a02d8.zip
Notes
-rw-r--r--security/hpn-ssh/Makefile12
-rw-r--r--security/hpn-ssh/distinfo1
-rw-r--r--security/openssh-portable/Makefile12
-rw-r--r--security/openssh-portable/distinfo1
-rw-r--r--security/openssh/Makefile4
-rw-r--r--security/openssh/distinfo1
6 files changed, 21 insertions, 10 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 592786753fa4..c0e6f1fca76d 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -7,13 +7,16 @@
PORTNAME= openssh
PORTVERSION= 3.1p1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \
ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/
PKGNAMESUFFIX= -portable
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= openssh-3.1p1-adv.token.patch
+
MAINTAINER= dinoex@FreeBSD.org
MAN1= sftp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 scp.1 ssh.1
@@ -50,11 +53,12 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-MASTER_SITES+= ${PATCH_SITES}
+GSSAPI_SITE= http://www.sxw.org.uk/computing/patches/
+MASTER_SITES+= ${GSSAPI_SITE}
DISTFILES= ${EXTRACT_ONLY} ${PORTNAME}-${PORTVERSION}-gssapi-20020321.diff
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-PATCH_SITES= http://www.sxw.org.uk/computing/patches/
-PATCHFILES= ${PORTNAME}-mit-krb5-20020319.diff
+PATCH_SITES+= ${GSSAPI_SITE}
+PATCHFILES+= ${PORTNAME}-mit-krb5-20020319.diff
EXTRA_PATCHES+= ${FILESDIR}/servconf.c.patch
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
# USE_AUTOCONF_VER= 252 # broken
diff --git a/security/hpn-ssh/distinfo b/security/hpn-ssh/distinfo
index 1f84899513bc..a875a7b85e22 100644
--- a/security/hpn-ssh/distinfo
+++ b/security/hpn-ssh/distinfo
@@ -1,3 +1,4 @@
MD5 (openssh-3.1p1.tar.gz) = c6a52d4126ed27eb57c31729ec6b2362
MD5 (openssh-3.1p1-gssapi-20020321.diff) = d571cea9810630650139013a1af4b1d9
+MD5 (openssh-3.1p1-adv.token.patch) = 8c34327404f504f8d5bf1a2063f4e7b7
MD5 (openssh-mit-krb5-20020319.diff) = 151af40132624a615c96027491f09f25
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 592786753fa4..c0e6f1fca76d 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -7,13 +7,16 @@
PORTNAME= openssh
PORTVERSION= 3.1p1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \
ftp://carroll.cac.psu.edu/pub/OpenBSD/OpenSSH/portable/
PKGNAMESUFFIX= -portable
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= openssh-3.1p1-adv.token.patch
+
MAINTAINER= dinoex@FreeBSD.org
MAN1= sftp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 scp.1 ssh.1
@@ -50,11 +53,12 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-MASTER_SITES+= ${PATCH_SITES}
+GSSAPI_SITE= http://www.sxw.org.uk/computing/patches/
+MASTER_SITES+= ${GSSAPI_SITE}
DISTFILES= ${EXTRACT_ONLY} ${PORTNAME}-${PORTVERSION}-gssapi-20020321.diff
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
-PATCH_SITES= http://www.sxw.org.uk/computing/patches/
-PATCHFILES= ${PORTNAME}-mit-krb5-20020319.diff
+PATCH_SITES+= ${GSSAPI_SITE}
+PATCHFILES+= ${PORTNAME}-mit-krb5-20020319.diff
EXTRA_PATCHES+= ${FILESDIR}/servconf.c.patch
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
# USE_AUTOCONF_VER= 252 # broken
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index 1f84899513bc..a875a7b85e22 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,3 +1,4 @@
MD5 (openssh-3.1p1.tar.gz) = c6a52d4126ed27eb57c31729ec6b2362
MD5 (openssh-3.1p1-gssapi-20020321.diff) = d571cea9810630650139013a1af4b1d9
+MD5 (openssh-3.1p1-adv.token.patch) = 8c34327404f504f8d5bf1a2063f4e7b7
MD5 (openssh-mit-krb5-20020319.diff) = 151af40132624a615c96027491f09f25
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 83a6d3aa69dc..5a91e4bc6f33 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -7,7 +7,7 @@
PORTNAME= openssh
PORTVERSION= 3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/ \
ftp://ftp.usa.openbsd.org/pub/OpenBSD/OpenSSH/ \
@@ -16,7 +16,7 @@ DISTNAME= openssh-${PORTVERSION}
EXTRACT_SUFX= .tgz
PATCH_SITES= ${MASTER_SITES}
-PATCHFILES= openbsd28_3.1.patch
+PATCHFILES= openbsd28_3.1.patch openssh-3.1-adv.token.patch
MAINTAINER= dinoex@FreeBSD.org
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index 5edad480bf88..7b78282ed9bd 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,2 +1,3 @@
MD5 (openssh-3.1.tgz) = b43deb1a3b2047216a28c00ccc45f548
MD5 (openbsd28_3.1.patch) = eb904373fad27e1f71ddf5939f4923a6
+MD5 (openssh-3.1-adv.token.patch) = 4e37cb88fab56f7769126edfa66490ff