Version bump #470222 by Jason A. Donenfeld.

(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

4 files changed, 26 insertions, 17 deletions

diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index f6cf4b8d6773..f60c4388a1e8 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/openssh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.473 2013/06/23 08:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.474 2013/06/24 16:48:35 vapier Exp $
+
+*openssh-6.2_p2 (24 Jun 2013)
+
+  24 Jun 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/openssh-6.2_p2-x509-glue.patch,
+  +files/openssh-6.2_p2-x509-hpn-glue.patch, +openssh-6.2_p2.ebuild,
+  -files/openssh-6.2_p1-x509-glue.patch,
+  -files/openssh-6.2_p1-x509-hpn-glue.patch, -openssh-6.2_p1.ebuild:
+  Version bump #470222 by Jason A. Donenfeld.
 
   23 Jun 2013; Mike Frysinger <vapier@gentoo.org> openssh-6.2_p1.ebuild:
   Move into ~arch w/hpn disabled as it randomly hangs.
diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
index 2c174298d881..f405d7d1c293 100644
--- a/net-misc/openssh/files/openssh-6.2_p1-x509-glue.patch
+++ b/net-misc/openssh/files/openssh-6.2_p2-x509-glue.patch
@@ -1,7 +1,7 @@
 make x509 apply after openssh-5.9_p1-sshd-gssapi-multihomed.patch
 
---- openssh-6.2p1+x509-7.4.1.diff
-+++ openssh-6.2p1+x509-7.4.1.diff
+--- openssh-6.2p2+x509-7.5.diff
++++ openssh-6.2p2+x509-7.5.diff
 @@ -14571,10 +14571,9 @@
   .It Cm ChallengeResponseAuthentication
   Specifies whether challenge-response authentication is allowed (e.g. via
diff --git a/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
index 22b9764a4d59..89d3d66e5775 100644
--- a/net-misc/openssh/files/openssh-6.2_p1-x509-hpn-glue.patch
+++ b/net-misc/openssh/files/openssh-6.2_p2-x509-hpn-glue.patch
@@ -1,5 +1,5 @@
---- openssh-6.2p1/Makefile.in
-+++ openssh-6.2p1/Makefile.in
+--- openssh-6.2p2/Makefile.in
++++ openssh-6.2p2/Makefile.in
 @@ -45,7 +45,7 @@
  CC=@CC@
  LD=@LD@
@@ -17,8 +17,8 @@
  AR=@AR@
  AWK=@AWK@
  RANLIB=@RANLIB@
---- openssh-6.2p1/sshconnect.c
-+++ openssh-6.2p1/sshconnect.c
+--- openssh-6.2p2/sshconnect.c
++++ openssh-6.2p2/sshconnect.c
 @@ -458,7 +458,7 @@
  {
  	/* Send our own protocol version identification. */
@@ -28,8 +28,8 @@
  		    PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
  	} else {
  		xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n",
---- openssh-6.2p1/sshd.c
-+++ openssh-6.2p1/sshd.c
+--- openssh-6.2p2/sshd.c
++++ openssh-6.2p2/sshd.c
 @@ -466,8 +466,8 @@
  		comment = "";
  	}
@@ -41,11 +41,11 @@
  	    *options.version_addendum == '\0' ? "" : " ",
  	    options.version_addendum, newline);
  
---- openssh-6.2p1/version.h
-+++ openssh-6.2p1/version.h
+--- openssh-6.2p2/version.h
++++ openssh-6.2p2/version.h
 @@ -3,4 +3,5 @@
  #define SSH_VERSION	"OpenSSH_6.2"
  
- #define SSH_PORTABLE	"p1"
+ #define SSH_PORTABLE	"p2"
 +#define SSH_X509	" PKIX"
  #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
diff --git a/net-misc/openssh/openssh-6.2_p1.ebuild b/net-misc/openssh/openssh-6.2_p2.ebuild
index d33365fc08f1..70186f6847b1 100644
--- a/net-misc/openssh/openssh-6.2_p1.ebuild
+++ b/net-misc/openssh/openssh-6.2_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p1.ebuild,v 1.4 2013/06/23 08:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.2_p2.ebuild,v 1.1 2013/06/24 16:48:35 vapier Exp $
 
 EAPI="4"
 inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -11,7 +11,7 @@ PARCH=${P/_}
 
 #HPN_PATCH="${PARCH/6.2/6.1}-hpn13v14.diff.bz2"
 #LDAP_PATCH="${PARCH/-/-lpk-}-0.3.14.patch.gz"
-X509_VER="7.4.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="7.5" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
 HOMEPAGE="http://www.openssh.org/"
@@ -65,7 +65,7 @@ S=${WORKDIR}/${PARCH}
 pkg_setup() {
 	# this sucks, but i'd rather have people unable to `emerge -u openssh`
 	# than not be able to log in to their server any more
-	maybe_fail() { [[ -z ${!2} ]] && echo ${1} ; }
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
 	local fail="
 		$(use X509 && maybe_fail X509 X509_PATCH)
 		$(use ldap && maybe_fail ldap LDAP_PATCH)
@@ -101,10 +101,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.9_p1-sshd-gssapi-multihomed.patch #378361
 	if use X509 ; then
 		pushd .. >/dev/null
-		epatch "${FILESDIR}"/${PN}-6.2_p1-x509-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.2_p2-x509-glue.patch
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
-		epatch "${FILESDIR}"/${PN}-6.2_p1-x509-hpn-glue.patch
+		epatch "${FILESDIR}"/${PN}-6.2_p2-x509-hpn-glue.patch
 		save_version X509
 	fi
 	if ! use X509 ; then