aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--security/hpn-ssh/Makefile7
-rw-r--r--security/hpn-ssh/distinfo2
-rw-r--r--security/openssh-portable/Makefile7
-rw-r--r--security/openssh-portable/distinfo2
4 files changed, 10 insertions, 8 deletions
diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 26a10c695fa6..bfb560ad56fe 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -50,12 +50,11 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-BROKEN= Need updated patches from Simon Wilkinson
MASTER_SITES+= ${PATCH_SITES}
-DISTFILES= ${EXTRACT_ONLY} ${PORTNAME}-${PORTVERSION}-gssapi.patch
+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}-${PORTVERSION}-krb5.patch
+PATCHFILES= ${PORTNAME}-mit-krb5-20020319.diff
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
# USE_AUTOCONF_VER= 252 # broken
CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME}
@@ -65,7 +64,7 @@ AUTOHEADER= autoheader
post-patch:
@${ECHO_MSG} Applying extra patch for GSS-API key-exchange...
@${PATCH} ${PATCH_DIST_ARGS:S/-p0/-p1/} \
- < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-gssapi.patch
+ < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-gssapi-20020321.diff
pre-configure:
@${ECHO_MSG} !!!! Warning this option uses autoconf/autoheader !!!
diff --git a/security/hpn-ssh/distinfo b/security/hpn-ssh/distinfo
index ae7285957283..1f84899513bc 100644
--- a/security/hpn-ssh/distinfo
+++ b/security/hpn-ssh/distinfo
@@ -1 +1,3 @@
MD5 (openssh-3.1p1.tar.gz) = c6a52d4126ed27eb57c31729ec6b2362
+MD5 (openssh-3.1p1-gssapi-20020321.diff) = d571cea9810630650139013a1af4b1d9
+MD5 (openssh-mit-krb5-20020319.diff) = 151af40132624a615c96027491f09f25
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 26a10c695fa6..bfb560ad56fe 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -50,12 +50,11 @@ EXTRA_PATCHES+= ${FILESDIR}/batch.patch
.endif
.if defined(KRB5_HOME) && exists(${KRB5_HOME})
-BROKEN= Need updated patches from Simon Wilkinson
MASTER_SITES+= ${PATCH_SITES}
-DISTFILES= ${EXTRACT_ONLY} ${PORTNAME}-${PORTVERSION}-gssapi.patch
+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}-${PORTVERSION}-krb5.patch
+PATCHFILES= ${PORTNAME}-mit-krb5-20020319.diff
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
# USE_AUTOCONF_VER= 252 # broken
CONFIGURE_ARGS+= --with-kerberos5=${KRB5_HOME}
@@ -65,7 +64,7 @@ AUTOHEADER= autoheader
post-patch:
@${ECHO_MSG} Applying extra patch for GSS-API key-exchange...
@${PATCH} ${PATCH_DIST_ARGS:S/-p0/-p1/} \
- < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-gssapi.patch
+ < ${DISTDIR}/${PORTNAME}-${PORTVERSION}-gssapi-20020321.diff
pre-configure:
@${ECHO_MSG} !!!! Warning this option uses autoconf/autoheader !!!
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index ae7285957283..1f84899513bc 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1 +1,3 @@
MD5 (openssh-3.1p1.tar.gz) = c6a52d4126ed27eb57c31729ec6b2362
+MD5 (openssh-3.1p1-gssapi-20020321.diff) = d571cea9810630650139013a1af4b1d9
+MD5 (openssh-mit-krb5-20020319.diff) = 151af40132624a615c96027491f09f25