Add net-misc/openssh-7.2_p2-r1, update net-misc/openssh-7.2_p2

4 files changed, 374 insertions, 2 deletions

diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 3b57e685..19b34947 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -15,6 +15,7 @@ AUX openssh-7.1_p1-hpn-x509-glue.patch 535 SHA256 28fabcb503632c57f4f4dfdbdd3e5f
 AUX openssh-7.1_p2-x509-hpn14v10-glue.patch 1451 SHA256 13eb0540a6cd951f2a1c59ea979201fd15ea22ed1c73d153b329f0c8eb9e306e SHA512 e649981c553275baafb34b4d7d05c733cf9a3a829b68dbee206bfde969fb827c54244e67650626915d3403f9d6df9d633eec9a4eebe67face492fa2b16dcb392 WHIRLPOOL 701f4ded357ac8497e60c39d78ef64cb7052f90a0c66748e3fb85713605acd00843f607993b6dc9ccec3af12623cfc9365eeddc274b5eadaaaca9db56a2cfa90
 AUX openssh-7.2_p1-GSSAPI-dns.patch 3555 SHA256 619c9f98b92ad1b4fb5fdb05129f100d2d99baaecda7c4c5199d260aa93dbf3d SHA512 de6728531ccafb3b66c8251ac3f9179478bf876ad2bad7274c1935e9e925a738a8569175b4cd4b3a8d9fd7b2ff4b854921f4b0df5abf743e30e3892f8762c975 WHIRLPOOL 4ab0a75577a50c244595b0130011819492e3772a551719cb92d7de5d8e9e20b76bc5334157ae34c79deb4f3cba5abf38f954f94434327b2dd458d71288b9acd5
 AUX openssh-7.2_p1-sctp-x509-glue.patch 2604 SHA256 7fc07af817ace057fbd4b7f0c5c4784a0156d834e73ea066f3f61aaaccc02469 SHA512 7de8a1a9720d091c45a4a4c1475e973901904475916de3dbade21580e747a23a475ec1b5789fec981dfeb8a706ecbd3df4ede27796e43f65852ca1de0abe93e4 WHIRLPOOL 39fce545d5d5e87738d1f0ae92585a252167f56d44d041440131c86f74b03a1fe4defea05dd368f88de9c8d8811073de2d6d50524a42bb8569c8f53f4ca7ea2b
+AUX openssh-7.2_p1-x509-warnings.patch 712 SHA256 506b0770e33540f6f6f79a506f403caeeee3cfe8e66830ed8226c9e649dbd95c SHA512 831b3765e1770ef1759ed70f17dbe6e36b67c77c70eaf045e9ce3815355a0fab925be9379ff78b1398f46fe9889bd9acaaa0aadf45c7d71c39096d1d697c0732 WHIRLPOOL d81e52b755d2b45393f3ef948b86990b0cd1bf64b3c9cdbd40c094fc7021579d38f4fa2a47d8224f7a70b8fa60b7718288d9527e401750e840bd7d67936fc294
 AUX sshd.confd 389 SHA256 761146acca3bc9914f118416d5c40903169fec0e2cc0695543e88c850a50dc17 SHA512 b17f915b17401a8f8f53e098d29baf729df6635ef10945f125bbd1d0fff2a334be4d778c430aaa84e7c188da74e39b47a85703b2c91b1a51410b0f1f57ebc4fd WHIRLPOOL 0e3b88adbc09ca015463412ef71f17b762b6e16eed77b5e55d32fc296a7305533ce27d50ceb84f3531a3566f3c4251ee14cdcc63978a4df02c554db685ac9008
 AUX sshd.pam_include.2 156 SHA256 166136e27d653e0bf481a6ca79fecb7d9fa2fc3d597d041f97df595f65a8193c SHA512 d3f7e6ca8c9f2b5060ebccb259316bb59c9a7e158e8ef9466765a20db263a4043a590811f1a3ab072b718dbd70898bc69b77e0b19603d7f394b5ac1bd0a4a56c WHIRLPOOL ba7a0a8c3bb39c5fda69de34b822a19696398e0a8789211ac1faae787ee34f9639eb35efe29c67f874b5f9fe674742503e570f441c005974f4a0c93468b8970b
 AUX sshd.rc6.4 2227 SHA256 7753d47e7719123192d33e327b002cbac2976b49b57957c5da82dff67070f761 SHA512 23e61a83ae0500eba10b799ef1ce71c53c631599c1d7082d81a11932e4355a30cf818ae41b8f4b1daca6a9c208c75f82d6b7b42d69b83920ebaec672adadc7e7 WHIRLPOOL 7229d63bebfe86fdba4daae36c4e597bde8e1469cc0389d126c71c05d2205c358a0e85c182daa70e9446696886f2b5dc71d14d2c6a948bf576bf26e3cb397fa9
@@ -44,4 +45,5 @@ EBUILD openssh-6.6_p1-r1.ebuild 9904 SHA256 7cf5ad6aa05c239df6d18dafb3a2f8467190
 EBUILD openssh-6.9_p1-r2.ebuild 10513 SHA256 4e9ca0a1ea7dbed3185450ee4ab15318b03a6b12e7bce1c152e5413c37a780c1 SHA512 3f611a10e7853dcc3a3a0e2d922f6be8f693a6823f457fecf031e7f5c16e74ce3e3a5ce8ae1cd3d02acb338376830123505dc1b9bc5d12ed4bee4faa456983fd WHIRLPOOL ed9335e67ecd188b082c86ea5c6438a4d2038ace2f423d46ab7b82161deab4f1c05b45d8c960e01ec3b42b8fbf1ce3ce3487f83a96f0a9297a1779bf23cd9fc4
 EBUILD openssh-7.1_p1-r2.ebuild 11377 SHA256 a87cfdb70f33bcc82167fdda5204378f949c935b01473d2889011e5422c3ce28 SHA512 ff43a853ea10b096240e6c70dd6a95e865ca0f7e7131f14b19accbb794b56c7b807df80ffbdf4e2f36e259c34994322f9393390473f5b1ee96782eb2d01059df WHIRLPOOL 132bb75d8d845936b4dbbd0c34ec3317ab4fec72dd0c0ed896a01bae93505ea8b069dfe9b557774ca105c1958df27b9bd4f6fcf616937790d9596f05490ec2bb
 EBUILD openssh-7.1_p2.ebuild 11234 SHA256 7b6988caa6bd87d1db71f4d05926e45b2adfeeaf7b5c50212139519374cd995c SHA512 3465c27f3b22b42a81b000c40ed1d392587a127aead4699947dd451119c3ccfb0b34ea166917227c1a7dc700e9f380059b06de6c3d28756b179a587a2e32840a WHIRLPOOL 89a0a5df12b99d1ac3cd5d26f66d95a2bb2b49c6ee7a228181f7ab4145f6af61ea7f6f7fa5dcf527773b78be1a9e9021131e2fcbe88ccd7b862dd9ace19505aa
-EBUILD openssh-7.2_p2.ebuild 11375 SHA256 756e9a52e32b99bd5062b920187027bd0e8f33c65ee5b4d547ce4c31c0c03465 SHA512 0905d02190d5a926506288e173c54d1a71522026b2309f8e85334796884c7a7064f58952323c0937ac13ee624963690fcb48814a08ebc58ea01cbf8efecda892 WHIRLPOOL 9af5b8b8cc165c58462fdfdfece867e1addeec22ed93328ebf186af0ddf0175539c8ffadf66659e2a99da23ccf2e456f325a91b36523523db2b9f6591a939843
+EBUILD openssh-7.2_p2-r1.ebuild 11491 SHA256 49043465fcdadd915ff3c508266d77fae9e71e23d44a2fa23b9e8780e5e21cda SHA512 c3692f44162618b7ca6d268e8f8c5ed6a3976a1897f149690dea41a491d75c10316d7f686d893795798b9eb3f5e55ac1d795067aba19e99482eaa803ff64a29a WHIRLPOOL 2de3d82fc8703f2651ff5e8ec47fe125c89df36e32ea1a4905edfdf6c0371c849a757b1dd34ef4ae7eb0cca637ac6382f652cbec6d77ae853041c5a4fed76a07
+EBUILD openssh-7.2_p2.ebuild 11375 SHA256 e12b05c4f68064e1aa7a156052ba793205d90f4760bb5769e6cf251ff2fedb7d SHA512 1b41950cb0e3323e0a3a6386249289b201c89fb3898a413f71737de393d4781cd9ae956304cc807f1c7ca5a4eb00d99c91a5d0d984bcb87cf218a0d93a035569 WHIRLPOOL d881cad5492c042539b78e9640ef4ca6de6ca20ab8877fec25ad81058a36929d60c3b8ee2828121a036855542983fee5c3b49153ea8dfcae9f1e0b5bef3d65f5
diff --git a/net-misc/openssh/files/openssh-7.2_p1-x509-warnings.patch b/net-misc/openssh/files/openssh-7.2_p1-x509-warnings.patch
new file mode 100644
index 00000000..9e51f6cd
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.2_p1-x509-warnings.patch
@@ -0,0 +1,22 @@
+--- sshconnect2.c.dist	2016-07-16 12:24:22.784369522 +0100
++++ sshconnect2.c	2016-07-16 12:29:42.459637342 +0100
+@@ -1456,7 +1456,7 @@ pubkey_cleanup(Authctxt *authctxt)
+ static int
+ get_allowed_keytype(Key *k) {
+ 	char *pattern;
+-	char *alg;
++	const char *alg;
+ 
+ 	if (k->type == KEY_RSA1 || k->type == KEY_UNSPEC)
+ 		return KEY_UNSPEC;
+--- x509_nm_cmp.c.dist	2016-07-16 12:27:40.188114003 +0100
++++ x509_nm_cmp.c	2016-07-16 12:27:43.298067968 +0100
+@@ -166,7 +166,7 @@ ssh_ASN1_STRING_to_UTF8(unsigned char **
+ 
+ 	tag = ASN1_STRING_type(in);
+ 	if (tag != V_ASN1_UTF8STRING) {
+-		return(ASN1_STRING_to_UTF8(out, in));
++		return(ASN1_STRING_to_UTF8(out, (ASN1_STRING *) in));
+ 	}
+ 
+ 	l = ASN1_STRING_length(in);
diff --git a/net-misc/openssh/openssh-7.2_p2-r1.ebuild b/net-misc/openssh/openssh-7.2_p2-r1.ebuild
new file mode 100644
index 00000000..8918f6f9
--- /dev/null
+++ b/net-misc/openssh/openssh-7.2_p2-r1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: 282823eb3a85723e252eb5abc11543c4d8045f34 $
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+#HPN_PATCH="${PARCH}-hpnssh14v10.tar.xz"
+LDAP_PATCH="${PN}-lpk-7.2p2-0.3.14.patch.xz"
+X509_VER="8.9" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	mirror://gentoo/${PN}-7.2_p1-sctp.patch.xz
+	${HPN_PATCH:+hpn? (
+		mirror://gentoo/${HPN_PATCH}
+		mirror://sourceforge/hpnssh/${HPN_PATCH}
+	)}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos ldap ldns libedit libressl -libseccomp livecd pam +pie sctp selinux skey ssh1 +ssl static X X509 abi_x86_x32"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap ssl )"
+
+LIB_DEPEND="
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit[static-libs(+)] )
+	libseccomp? ( sys-libs/libseccomp )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-0.9.8f:0[bindist=]
+			dev-libs/openssl:0[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+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" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "This version of OpenSSH does not yet have all previous functionality enabled"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use libseccomp; then
+		epatch "${FILESDIR}"/${PN}-6.9_p1-libseccomp.patch
+	fi
+	if use X509 ; then
+		pushd .. >/dev/null
+		if use hpn ; then
+			pushd ${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
+			popd >/dev/null
+		fi
+		epatch "${FILESDIR}"/${PN}-7.2_p1-sctp-x509-glue.patch
+		popd >/dev/null
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+		#epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
+		epatch "${FILESDIR}"/${PN}-7.2_p1-x509-warnings.patch
+		#save_version X509
+	fi
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+	epatch "${FILESDIR}"/${PN}-7.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${WORKDIR}"/${PN}-7.2_p1-sctp.patch
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"/var/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+		$(use_with libseccomp sandbox libseccomp_filter)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	if use abi_x86_x32 && ! use libseccomp; then
+		ewarn "The default 'seccomp' sandbox does not work correctly on x32, and so - without"
+		ewarn "experimental libseccomp support at least - it is required that this build"
+		ewarn "fallback to the basic 'rlimit' sandbox, where a child process is prevented from"
+		ewarn "forking or opening new network connections by having setrlimit() called to reset"
+		ewarn "its hard-limit of file descriptors and processes to zero.  As such, this is a"
+		ewarn "very basic fallback choice where no better alternative is available."
+		myconf+=( --with-sandbox=rlimit )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+	keepdir /var/empty
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	# Allow root password logins for live-cds
+	if use livecd ; then
+		sed -i \
+			-e "/PermitRootLogin/c\\
+\\
+# By popular demand, we're allowing root login with password on livecds\\
+PermitRootLogin Yes\\
+" "${ED}"/etc/ssh/sshd_config
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t tests skipped failed passed shell
+	tests="interop-tests compat-tests"
+	skipped=""
+	shell=$(egetshell ${UID})
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite"
+		elog "requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped="${skipped} tests"
+	else
+		tests="${tests} tests"
+	fi
+	# It will also attempt to write to the homedir .ssh
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in ${tests} ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed="${passed}${t} " \
+			|| failed="${failed}${t} "
+	done
+	einfo "Passed tests: ${passed}"
+	ewarn "Skipped tests: ${skipped}"
+	if [[ -n ${failed} ]] ; then
+		ewarn "Failed tests: ${failed}"
+		die "Some tests failed: ${failed}"
+	else
+		einfo "Failed tests: ${failed}"
+		return 0
+	fi
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/openssh/openssh-7.2_p2.ebuild b/net-misc/openssh/openssh-7.2_p2.ebuild
index 67be6e0e..56399367 100644
--- a/net-misc/openssh/openssh-7.2_p2.ebuild
+++ b/net-misc/openssh/openssh-7.2_p2.ebuild
@@ -132,7 +132,7 @@ src_prepare() {
 		popd >/dev/null
 		epatch "${WORKDIR}"/${X509_PATCH%.*}
 		#epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
-		epatch "${FILESDIR}"/${PN}-6.9_p1-x509-warnings.patch
+		epatch "${FILESDIR}"/${PN}-7.2_p1-x509-warnings.patch
 		#save_version X509
 	fi
 	if use ldap ; then