3 files changed, 9 insertions, 41 deletions

diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 02efd78bcdaa..9b1253e5e338 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	openssh
-DISTVERSION=	4.6p1
-PORTREVISION=	1
+DISTVERSION=	4.7p1
 PORTEPOCH=	1
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/%SUBDIR%/ \
@@ -100,6 +99,7 @@ CONFIGURE_ARGS+=	--disable-suid-ssh
 .if !defined(WITHOUT_KERBEROS)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}) || defined(WITH_GSSAPI)
 .if defined(WITH_KERB_GSSAPI)
+BROKEN=			Waiting new upstream patch
 PATCH_DIST_STRIP=	-p0
 PATCH_SITES+=		http://www.sxw.org.uk/computing/patches/
 PATCHFILES+=		openssh-4.6p1-gsskex-20070312.patch
@@ -147,7 +147,7 @@ BROKEN=			HPN and LPK patches are incompatible
 .if defined(WITH_HPN)
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=		http://www.psc.edu/networking/projects/hpn-ssh/
-PATCHFILES+=		openssh-4.6p1-hpn12v17.diff.gz
+PATCHFILES+=		openssh-4.7p1-hpn12v18.diff.gz
 .endif
 
 # See http://dev.inversepath.com/trac/openssh-lpk
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index 0d4fd0d47126..64e1bd7ce9dd 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,12 +1,12 @@
-MD5 (openssh-4.6p1.tar.gz) = 6a7fa99f44d9e1b5b04d15256e1405bb
-SHA256 (openssh-4.6p1.tar.gz) = 7bbe277faa80c8d8d9cb96111db65fc0007d451784cc459207cd46b746a6f23a
-SIZE (openssh-4.6p1.tar.gz) = 967395
+MD5 (openssh-4.7p1.tar.gz) = 50a800fd2c6def9e9a53068837e87b91
+SHA256 (openssh-4.7p1.tar.gz) = d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc
+SIZE (openssh-4.7p1.tar.gz) = 991119
 MD5 (openssh-4.6p1-gsskex-20070312.patch) = 9607f2faa8a50078d74f1169b5040599
 SHA256 (openssh-4.6p1-gsskex-20070312.patch) = d4f94d0a046ef1ada973faa4815d8af4d74ca068213e34b8537d6ac313895f92
 SIZE (openssh-4.6p1-gsskex-20070312.patch) = 69637
-MD5 (openssh-4.6p1-hpn12v17.diff.gz) = d5d4148c985c58a8784048edae9d8866
-SHA256 (openssh-4.6p1-hpn12v17.diff.gz) = 61438f6dc8959b038dee4fb365fe79b749053ccc149e768cdb73cb9c8740360b
-SIZE (openssh-4.6p1-hpn12v17.diff.gz) = 16145
+MD5 (openssh-4.7p1-hpn12v18.diff.gz) = 39011b556b2cfdeb3fb74d2bd6f2d7d8
+SHA256 (openssh-4.7p1-hpn12v18.diff.gz) = b94e406d5269cbc51546ce6b61199450270ca01b4f10d3149e2a6403649ea0de
+SIZE (openssh-4.7p1-hpn12v18.diff.gz) = 16094
 MD5 (openssh-lpk-4.6p1-0.3.9.patch) = f43a8aae7d69e72f0ec07bc96e46b328
 SHA256 (openssh-lpk-4.6p1-0.3.9.patch) = e12335e8bf020508ea3866db07b306f4c965e3f9de262c06f62fad494e93107e
 SIZE (openssh-lpk-4.6p1-0.3.9.patch) = 61605
diff --git a/security/openssh-portable/files/patch-fix-challenge-response b/security/openssh-portable/files/patch-fix-challenge-response
deleted file mode 100644
index e59aeab1d2c8..000000000000
--- a/security/openssh-portable/files/patch-fix-challenge-response
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Backported from OpenBSD:
-#
-# Move C/R -> kbdint special case to after the defaults have been
-# loaded, which makes ChallengeResponse default to yes again.  This
-# was broken by the Match changes and not fixed properly subsequently.
-# Found by okan at demirmen.com, ok djm@ "please do it" deraadt@
-#
---- servconf.c.orig	2007-08-30 11:50:17.000000000 -0300
-+++ servconf.c	2007-08-30 11:50:38.000000000 -0300
-@@ -1387,8 +1387,4 @@
- 	if (bad_options > 0)
- 		fatal("%s: terminating, %d bad configuration options",
- 		    filename, bad_options);
--
--	/* challenge-response is implemented via keyboard interactive */
--	if (options->challenge_response_authentication == 1)
--		options->kbd_interactive_authentication = 1;
- }
---- sshd.c.orig	2007-08-30 11:50:30.000000000 -0300
-+++ sshd.c	2007-08-30 11:51:42.000000000 -0300
-@@ -1421,6 +1421,10 @@
- 	/* Fill in default values for those options not explicitly set. */
- 	fill_default_server_options(&options);
- 
-+	/* challenge-response is implemented via keyboard interactive */
-+	if (options.challenge_response_authentication)
-+		options.kbd_interactive_authentication = 1;
-+
- 	/* set default channel AF */
- 	channel_set_af(options.address_family);
-