gentoo auto-resync : 04:10:2023 - 23:52:39

7 files changed, 393 insertions, 10 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b1973ad1745e..b8d3242f48e1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 62decfc75c66..c60ae333c823 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-gui-2.2.41.tar.gz 5046775 BLAKE2B 8ca83ed58312bd2cf0c0e854cebe6001121bf21e9f26804b779fc81ec06689c154d704b9cf2e7a5d57608519c3fbe724b07437b64c5840dd2ad6119f38669a29 SHA512 b86e23808c6158d6811a51901aff3f10c9722ca51389c2d241c6d174992299c83529014e6a098a2d5777fabda212ffb2731025843cc317f8560868bcb8cb2195
 DIST gns3-gui-2.2.42.tar.gz 5048413 BLAKE2B 19c4f1977797af0a3c2bbed926cc8f9361840658dbdc25ad9a2972bec21749c84d5cdc477079f01b8c354e21e9663b27bcbc09f974c914c188f98ec151b7bd67 SHA512 19940857308da3810047cec9285c34b0011e4dc44a1316bf2fe5042e0f255546e8e3d2d4788a1f70baedb498a295223916633f4950ef9dbfa19b8e72c7545176
-EBUILD gns3-gui-2.2.41.ebuild 1023 BLAKE2B 2abaa2a68590c5d4af192a3985c9ee308d251526128e67f1ac8d3b54df6883b6ed52821f2af4e397b261c5b7f20744d29444e0c5d9a70649d3b2fc2f0b3255eb SHA512 9d2cd8f7cae33354db2efca81f8562ff9aaabf18dc190e1daa218dd94b432e9dc0a9d49f19b2be94dab92d3de4ee27a8880bd9484e693aab247f47d4a826766e
+DIST gns3-gui-2.2.43.tar.gz 5055465 BLAKE2B 21e21d1b1e77151d385d210270dc909e3ed938c2220360e038820d9e30a1ca126122ccfe0f582e392143aeac364274bc96dbed1a3ea23cd29e0d9dbc858af5a5 SHA512 167961caa13e7bc7abea3753c69e883e864e5fbf543f12117a0653f203ef92d46214f083c715c1fad3ab4a52504fa714a2901d0caa4c0048e26cae9fa7ee5a31
 EBUILD gns3-gui-2.2.42.ebuild 1023 BLAKE2B 05bc8d725680f39ec70a3ff2e47a6de85a2889d7250868035bb008902d5f54a5d26e73f8ea8bec6855e20835ff1a899b38e95a9c44170d8949072d60ff772415 SHA512 e152326027221e8f2189ef758ae107ab0a7f08f88eedc2ea2d94e609836d1e12b131c3bf795ace96cac410cdf26b1ffcd0faa93f91124c3c4039e2332b486e97
+EBUILD gns3-gui-2.2.43.ebuild 1023 BLAKE2B 1065a2e4a9f394d6bec5c90a79cc2d467e602e328bae11b17a00938474c7605f2913b61af9e9c7d9ce0ddef751c86bfaa2893068c9e8491486e7c33a632f15c2 SHA512 9621aa392c413f3c1422da18c90ca45a8f6aae69ab0d60fff2e67e108afab83ca6f949ce025615f8d8122af3bf6ea43c3cc3b1a95e8c8f7163d78435b160cdd8
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-gui/gns3-gui-2.2.41.ebuild b/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild
index 50f98a4b6407..0dfa014133d2 100644
--- a/net-misc/gns3-gui/gns3-gui-2.2.41.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.2.43.ebuild
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 17ad681422da..be14b9db4903 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,5 +1,5 @@
-DIST gns3-server-2.2.41.tar.gz 10736066 BLAKE2B c2ab5c99a67a8cd79a898e244a77eea13477c6030b5b11a63c1747802ff309dc77ee62a6ad7191c7d8bf84d62badecf924379eb58afb4d4f111a9d34380d4aec SHA512 ec34bb81e96034a36f4bc7aeadaf5ae221be23069612477e5af9c908e3764e44029d22115eac602e0a26fedc99d67d4ed64cbf5da12c6a89bf00c3cd99d2ab7b
 DIST gns3-server-2.2.42.tar.gz 10735078 BLAKE2B 424f73fcb7377a518873b4880b77b6e057d8293fb96073eca59224b0e5e5c1e50114f30c564b861e91769380d9d15b3c2c28a8f4cec3358282902af09eeccd30 SHA512 9982fabcdd587b090833b9137124a0accb2990cee91ca5d19d8ee691f807d547670a38b2168d0f71465088a3971eac73e101cc284922732b5132ac47b84d84f6
-EBUILD gns3-server-2.2.41.ebuild 2072 BLAKE2B b5a22cb7db512bc74025283831eca8bbf3790c48f3e971cd2c74c9ce9fc98bd9b3be2c89ca827a05ef2d8bf31811318ffcf1f39154f3acce4dd9285942f31917 SHA512 c97a356ca55651f573b199f94e9b698bd717c98bf06bb06eb95f598f87c359d04d715107494c1ab7bac6484a17267213d238f2c49202d113435e6bcc8ed039e3
+DIST gns3-server-2.2.43.tar.gz 10734029 BLAKE2B c417557823c94bb62a08ab2401e7d6a6e46ea83961cfee87f5b134139f7f0237ff5c214661a2abd30d62a8806c1ea556db9fa9d7ff1e608cfa84142409315832 SHA512 3b086f6c14b4258f4f0eb72e9839c6499530b6f0866ba6adc72a8fd301c99919bf4fc36b7d64e61035d81f193faee8b161c304f1a445a2cab5ca9c42739796f4
 EBUILD gns3-server-2.2.42.ebuild 2072 BLAKE2B 9428fb0e2675cde7eeb39762397ecb25afed1d32c8ea59a7fd2ea80e8925a7aca2d9171335a78c4bfdfd071691b73489031aebaa70280505f96e982c779cd89f SHA512 3984ffc2c982c52a6909a449fa299260aee31c36cf5810456f8d5c77f7f659915bca175ce698193e2c04e71d3796d2a6a5c353d1d039e711a020c31aa14a353a
+EBUILD gns3-server-2.2.43.ebuild 2072 BLAKE2B 3e4e1e27b23d1badd9f15ed0cba1227319cd38d8a1dee1b13f94a79aefb3215f49b7ab4e3590376392eff8b63966456e7e4c83806a7adb994407c555d1948a27 SHA512 2b4402ca763ff77a0103a7dacf53a2aca3fdc54b8984f5ee6569be382a33ceca2a63aeeddea8b052dcce0a583dd2e6849239638f0b72d39d9cd72eec2afada77
 MISC metadata.xml 598 BLAKE2B 6fa3ab1fa771c772843ffc886170f11acfeadcca71d8bf198daa0da6aaca8e12becb430d289418da214537f5723a6a5d5784745a3c93655e6044ec4f3b975b93 SHA512 a5d11697dd82a2c99288f1acdcb9300402570853572995f4af53f2c2e844ecddbed334da72be91f9863725ff5cd7f676509a1f2b01c2b0cde834e62f142bec49
diff --git a/net-misc/gns3-server/gns3-server-2.2.41.ebuild b/net-misc/gns3-server/gns3-server-2.2.43.ebuild
index 174ef962de0c..c76329a46375 100644
--- a/net-misc/gns3-server/gns3-server-2.2.41.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.2.43.ebuild
@@ -20,16 +20,16 @@ RDEPEND="
 	acct-group/gns3
 	acct-user/gns3
 	app-emulation/dynamips
-	>=dev-python/aiofiles-22.1.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-3.8.4[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-23.2.1[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-3.8.5[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.8.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-4.17.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.5[${PYTHON_USEDEP}]
 	>=dev-python/py-cpuinfo-9.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.17.0[${PYTHON_USEDEP}]
+	>=dev-python/sentry-sdk-1.31.0[${PYTHON_USEDEP}]
 	net-misc/ubridge
 	sys-apps/busybox[static]
 "
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 030dc193e6c2..5518a635cfd5 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -18,7 +18,10 @@ DIST openssh-9.3p2.tar.gz 1835850 BLAKE2B 38f8d4ada263112b318fafccabf0a33a004d82
 DIST openssh-9.3p2.tar.gz.asc 833 BLAKE2B cfba3867d7f97cb2c904bd3ae111bd63e8a050464b66e3f3f22390839a153d57ef5819182f8ad99a6b520f27881143552dc64fccfc33dcc0483ffe1ef33a5a47 SHA512 759e512a36a3a62264803b517298a65c83e1daebd9867e28ea1ca4999c38539368815ccda86540a4f5d45fa79c539d8242995ba55f2918baf2a7404c105e337a
 DIST openssh-9.4p1.tar.gz 1845094 BLAKE2B d13d758129cce947d3f12edb6e88406aad10de6887b19ffa3ebd8e382b742a05f2a692a8824aec99939f6c7e13fbccc3bb14e5ee112f9a9255d4882eb87dcf53 SHA512 0aaedeced7dbc70419c7245eb0e9db4ef570e0e7739b890ebae04d56da5fe8d147e8e150f3c943f60730976569e3ac6cc8da62ec7e2a78e2ef47d295ca0b1d25
 DIST openssh-9.4p1.tar.gz.asc 833 BLAKE2B 95eedd9356766e5d0ea1261da3dc4c7869f054b418c626fb35815a0aa655b1ddbf54436b437d98c4344b05c9196c8fa1f592eac07b3ccf08bd3e980f8b6955af SHA512 983b4ebaa3b98e70831ce686cb503270926c065163a2510eef0c5102ef50b6e665b889ee15ea8c0bd7c4bbddb19270f036e1d554a8212ef2c292f9c682c8631a
+DIST openssh-9.5p1.tar.gz 1843001 BLAKE2B 55dbb0a2792b0046c943a19ca0966660e6e378e77856e94823a1bbbafaa0da94357403765c4c028aebf6543049a0f9bbe0019629be3f92cdadfac1be56def796 SHA512 e183fdf7477fd986215b889eea4a945d71385e35305746ccb164e757ecc28166f429c70890a237d8ef4cdcae5132935ba2ecb3b2a658eb73a6afcf6f42277b9c
+DIST openssh-9.5p1.tar.gz.asc 833 BLAKE2B abec3d14d9a880008db202be00ed446ccc0a98ce77c16a9e6d6492feac07c8f3284f9cd24f6ee1d904a55f9f23d5cce8a716916975c179a38ef6bde1d36e0acf SHA512 2b6de653420ba02eb99c7e6fba09af3bacfe9c701f3dfc3c94f41a3539c0414954fc5c64cce63c488c5ccd5d4ddb42d3f2184ff7f323342c885c47bf7d426ca1
 EBUILD openssh-9.3_p1-r1.ebuild 13455 BLAKE2B c45a4531688d14c3ed766f721dcb5d9603e1594526cbfa3782b491c515313567db1b60cfaafce1360f52e191c72d85d1dc2ea84bcc6f89aba6eab13b6498380a SHA512 d55d36cd0737dedc7d32321c93bbea1ce31d3b50db006f42e25073e5b4d356dc5ebd0ea652fd501be724745d8a9e0771a9d79d61ea9c822525eabbd4498434e9
 EBUILD openssh-9.3_p2.ebuild 13579 BLAKE2B d14f223e710380fef225829f0b08cadb407571143b3d46a7ea2ab9b8c4fb003a6897c1138ce749c24b1b0bed896af83f35dd81d84d8d9bc52b903124d71ef5fe SHA512 47a05c7b8962891ede466c24f2e2bc635fa42317932fd0c6c857dbd80a835d196f7fd08ae3272507cfa16daa49bc2ba667dd4a1b35b36d4f039b9045c8b0353a
 EBUILD openssh-9.4_p1.ebuild 13460 BLAKE2B afabbccdb249e44e3c85503967b3640214d94b2115571f769c60f88dabbefdefb173f7b66d1fd70a9b5f305d65551d6be9aa3b9060eb476851a1878a19b0362a SHA512 0daa0f528d715543c010b8721de201236f5c5ef26c8403e987c7542725ffe977bcb02d9e331235f92a771e12cd15797f605685d733ee7fda4cc807b9180426c4
+EBUILD openssh-9.5_p1.ebuild 13409 BLAKE2B d067d0b20771b4e1e8a3e807b72785ac8785ef090a63109a0b73997b186873b49969cee2690bd145b8c0cf430a1d527d327954a19f36a48ecb4471fd23df6acc SHA512 4102d0bec500270c15c8645ba75c06015fa325a9b0e49874c28ae099cab539cc4fbbe3c2ad9c9a46348954dd9acd9727be8015183c4d2b8785ecacb017a7c852
 MISC metadata.xml 1788 BLAKE2B d04d3030f70f3615522672fa56e684acaa67ddce8d16cce86ba8911fb8fc11ed152be012ecf560427d271868c4841a7422aaa644305947302d3ebab62bdb577d SHA512 bd328e3a33ce04b989149333db5f774f1b52540f12ef83b08b7fcf136ae2a3a9c83bef42c28991d3536249098ca0b9ffd21e583d93599580510d8619e9fd01ca
diff --git a/net-misc/openssh/openssh-9.5_p1.ebuild b/net-misc/openssh/openssh-9.5_p1.ebuild
new file mode 100644
index 000000000000..ec36f3445783
--- /dev/null
+++ b/net-misc/openssh/openssh-9.5_p1.ebuild
@@ -0,0 +1,380 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit user-info flag-o-matic autotools pam systemd toolchain-funcs verify-sig
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="https://www.openssh.com/"
+SRC_URI="
+	mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	verify-sig? ( mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openssh.org.asc
+S="${WORKDIR}/${PARCH}"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit debug kerberos ldns libedit livecd pam +pie security-key selinux +ssl static test X xmss"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	ldns? ( ssl )
+	pie? ( !static )
+	static? ( !kerberos !pam )
+	xmss? ( ssl  )
+	test? ( ssl )
+"
+
+# tests currently fail with XMSS
+REQUIRED_USE+="test? ( !xmss )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		net-libs/ldns[ecdsa(+),ssl(+)]
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	security-key? ( >=dev-libs/libfido2-1.5.0:=[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	ssl? ( >=dev-libs/openssl-1.1.1l-r1:0=[static-libs(+)] )
+	virtual/libcrypt:=[static-libs(+)]
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]
+"
+RDEPEND="
+	acct-group/sshd
+	acct-user/sshd
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( sys-libs/pam )
+	kerberos? ( virtual/krb5 )
+"
+DEPEND="${RDEPEND}
+	virtual/os-headers
+	kernel_linux? ( !prefix-guest? ( >=sys-kernel/linux-headers-5.1 ) )
+	static? ( ${LIB_DEPEND} )
+"
+RDEPEND="${RDEPEND}
+	!net-misc/openssh-contrib
+	pam? ( >=sys-auth/pambase-20081028 )
+	!prefix? ( sys-apps/shadow )
+	X? ( x11-apps/xauth )
+"
+# Weird dep construct for newer gcc-config for bug #872416
+BDEPEND="
+	sys-devel/autoconf
+	virtual/pkgconfig
+	|| (
+		>=sys-devel/gcc-config-2.6
+		>=sys-devel/clang-toolchain-symlinks-14-r1:14
+		>=sys-devel/clang-toolchain-symlinks-15-r1:15
+		>=sys-devel/clang-toolchain-symlinks-16-r1:*
+	)
+	verify-sig? ( sec-keys/openpgp-keys-openssh )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.3_p1-GSSAPI-dns.patch" #165444 integrated into gsskex
+	"${FILESDIR}/${PN}-9.3_p1-openssl-ignore-status.patch"
+	"${FILESDIR}/${PN}-9.3_p1-disable-conch-interop-tests.patch"
+	"${FILESDIR}/${PN}-9.3_p1-fix-putty-tests.patch"
+	"${FILESDIR}/${PN}-9.3_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch"
+)
+
+pkg_pretend() {
+	local i enabled_eol_flags disabled_eol_flags
+	for i in hpn sctp X509; do
+		if has_version "net-misc/openssh[${i}]"; then
+			enabled_eol_flags+="${i},"
+			disabled_eol_flags+="-${i},"
+		fi
+	done
+
+	if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then
+		# Skip for binary packages entirely because of environment saving, bug #907892
+		[[ ${MERGE_TYPE} == binary ]] && return
+
+		ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore."
+		ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality,"
+		ewarn "since these USE flags required third-party patches that often trigger bugs"
+		ewarn "and are of questionable provenance."
+		ewarn
+		ewarn "If you must continue relying on this functionality, switch to"
+		ewarn "net-misc/openssh-contrib. You will have to remove net-misc/openssh from your"
+		ewarn "world file first: 'emerge --deselect net-misc/openssh'"
+		ewarn
+		ewarn "In order to prevent loss of SSH remote login access, we will abort the build."
+		ewarn "Whether you proceed with disabling the USE flags or switch to the -contrib"
+		ewarn "variant, when re-emerging you will have to set"
+		ewarn
+		ewarn "  OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
+
+		die "Building net-misc/openssh[${disabled_eol_flags%,}] without OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING=yes"
+	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
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	eapply -- "${PATCHES[@]}"
+
+	[[ -d ${WORKDIR}/patches ]] && eapply "${WORKDIR}"/patches
+
+	eapply_user #473004
+
+	# These tests are currently incompatible with PORTAGE_TMPDIR/sandbox
+	sed -e '/\t\tpercent \\/ d' \
+		-i regress/Makefile || die
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+	use xmss && append-cflags -DWITH_XMSS
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# Solaris' glob.h doesn't have things like GLOB_TILDE, configure
+		# doesn't check for this, so force the replacement to be put in
+		# place
+		append-cppflags -DBROKEN_GLOB
+	fi
+
+	# use replacement, RPF_ECHO_ON doesn't exist here
+	[[ ${CHOST} == *-darwin* ]] && export ac_cv_func_readpassphrase=no
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/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
+		--with-hardening
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use_with selinux)
+		$(use_with security-key security-key-builtin)
+		$(use_with ssl openssl)
+		$(use_with ssl ssl-engine)
+	)
+
+	if use elibc_musl; then
+		# musl defines bogus values for UTMP_FILE and WTMP_FILE
+		# https://bugs.gentoo.org/753230
+		myconf+=( --disable-utmp --disable-wtmp )
+	fi
+
+	# Workaround for Clang 15 miscompilation with -fzero-call-used-regs=all
+	# bug #869839 (https://github.com/llvm/llvm-project/issues/57692)
+	tc-is-clang && myconf+=( --without-hardening )
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local tests=( compat-tests )
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		ewarn "user, so we will run a subset only."
+		tests+=( interop-tests )
+	else
+		tests+=( tests )
+	fi
+
+	local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1
+	mkdir -p "${HOME}"/.ssh || die
+	emake -j1 "${tests[@]}" </dev/null
+}
+
+# Gentoo tweaks to default config files.
+tweak_ssh_configs() {
+	local locale_vars=(
+		# These are language variables that POSIX defines.
+		# http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_02
+		LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+		# These are the GNU extensions.
+		# https://www.gnu.org/software/autoconf/manual/html_node/Special-Shell-Variables.html
+		LANGUAGE LC_ADDRESS LC_IDENTIFICATION LC_MEASUREMENT LC_NAME LC_PAPER LC_TELEPHONE
+	)
+
+	dodir /etc/ssh/ssh_config.d /etc/ssh/sshd_config.d
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config || die
+	Include "${EPREFIX}/etc/ssh/ssh_config.d/*.conf"
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config || die
+	Include "${EPREFIX}/etc/ssh/sshd_config.d/*.conf"
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo.conf || die
+	# Send locale environment variables (bug #367017)
+	SendEnv ${locale_vars[*]}
+
+	# Send COLORTERM to match TERM (bug #658540)
+	SendEnv COLORTERM
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config.d/9999999gentoo-security.conf || die
+	RevokedHostKeys "${EPREFIX}/etc/ssh/ssh_revoked_hosts"
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_revoked_hosts || die
+	# https://github.blog/2023-03-23-we-updated-our-rsa-ssh-host-key/
+	ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+	EOF
+
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo.conf || die
+	# Allow client to pass locale environment variables (bug #367017)
+	AcceptEnv ${locale_vars[*]}
+
+	# Allow client to pass COLORTERM to match TERM (bug #658540)
+	AcceptEnv COLORTERM
+	EOF
+
+	if use pam ; then
+		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-pam.conf || die
+		UsePAM yes
+		# This interferes with PAM.
+		PasswordAuthentication no
+		# PAM can do its own handling of MOTD.
+		PrintMotd no
+		PrintLastLog no
+		EOF
+	fi
+
+	if use livecd ; then
+		cat <<-EOF >> "${ED}"/etc/ssh/sshd_config.d/9999999gentoo-livecd.conf || die
+		# Allow root login with password on livecds.
+		PermitRootLogin Yes
+		EOF
+	fi
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd-r1.initd sshd
+	newconfd "${FILESDIR}"/sshd-r1.confd sshd
+
+	if use pam; then
+		newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	fi
+
+	tweak_ssh_configs
+
+	doman contrib/ssh-copy-id.1
+	dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+	rmdir "${ED}"/var/empty || die
+
+	systemd_dounit "${FILESDIR}"/sshd.socket
+	systemd_newunit "${FILESDIR}"/sshd.service.1 sshd.service
+	systemd_newunit "${FILESDIR}"/sshd_at.service.1 'sshd@.service'
+}
+
+pkg_preinst() {
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]"; then
+		show_ssl_warning=1
+	fi
+}
+
+pkg_postinst() {
+	local old_ver
+	for old_ver in ${REPLACING_VERSIONS}; do
+		if ver_test "${old_ver}" -lt "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 ver_test "${old_ver}" -lt "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 ver_test "${old_ver}" -lt "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 ver_test "${old_ver}" -lt "7.6_p1"; then
+			elog "Starting with openssh-7.6p1, openssh upstream has removed ssh1 support entirely."
+			elog "Furthermore, rsa keys with less than 1024 bits will be refused."
+		fi
+		if ver_test "${old_ver}" -lt "7.7_p1"; then
+			elog "Starting with openssh-7.7p1, we no longer patch openssh to provide LDAP functionality."
+			elog "Install sys-auth/ssh-ldap-pubkey and use OpenSSH's \"AuthorizedKeysCommand\" option"
+			elog "if you need to authenticate against LDAP."
+			elog "See https://wiki.gentoo.org/wiki/SSH/LDAP_migration for more details."
+		fi
+		if ver_test "${old_ver}" -lt "8.2_p1"; then
+			ewarn "After upgrading to openssh-8.2p1 please restart sshd, otherwise you"
+			ewarn "will not be able to establish new sessions. Restarting sshd over a ssh"
+			ewarn "connection is generally safe."
+		fi
+		if ver_test "${old_ver}" -lt "9.2_p1-r1" && systemd_is_booted; then
+			ewarn "From openssh-9.2_p1-r1 the supplied systemd unit file defaults to"
+			ewarn "'Restart=on-failure', which causes the service to automatically restart if it"
+			ewarn "terminates with an unclean exit code or signal. This feature is useful for most users,"
+			ewarn "but it can increase the vulnerability of the system in the event of a future exploit."
+			ewarn "If you have a web-facing setup or are concerned about security, it is recommended to"
+			ewarn "set 'Restart=no' in your sshd unit file."
+		fi
+	done
+
+	if [[ -n ${show_ssl_warning} ]]; 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
+}