6 files changed, 95 insertions, 3 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a4c293967525..d810adbcabac 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 96fbe655277c..806b5178a5ab 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1,5 +1,7 @@
 AUX mosh-1.2.5-git-version.patch 547 BLAKE2B 2cf6ab1643f0328ebfb02145242639e905b98209e668b17a1e08abd23aee704a52111a94b34150e6fcee1a4de3df065dc1cabdbfb37e2c852dc7e7595ee613e1 SHA512 1a6fc6292595090d7493a05b96b482b8f7e0f485b9f5aa40de2b572265c4f820058923f2f6224864a1471d2fe9fafd0b2f025c99f1513e0c6d8f1b8f71d2814d
 AUX mosh-1.3.2-bind-misinterpret.patch 432 BLAKE2B 81bda9f9a2d63ed2f5298b399ec92435db12b1e2c57906a6a38267df2dc525d209ec8cb72591627dd58d0c0c79e5c878345d52976df7b3b8d7893447f34574a5 SHA512 d9068c169f5ecc7c64d424490bbe9c03bdd5ecf184ad4a28fe106c68cbf228641ad39e3cf4da061b1693318e5bb3b4f91365203693537021ed75b67fc494b7f8
 DIST mosh-1.3.2.tar.gz 359574 BLAKE2B 0b7290da0c5e5af0bfed58594095cb2649fec049fda7c495df326742176033d1716752451d2a9f11ba2c2957e8b8fecd5caa4e8962c8597e8dd67d1de7582ec5 SHA512 f400e8fe7ba2ab7362311fc12a00ec69587505f901988aeee500fc68d38a388218500a3f602111c883ff23a9d43572114fcf0a8bf505df203691e5b597615769
+DIST mosh-1.4.0-rc1.tar.gz 386364 BLAKE2B e9dee52f0a0d934c85efbcfd7c6b857ad1b6e3d5a7ed13730e1a79ef286331ef1828292ebc71731572af94c03bae37b7227ff569669c01b6885984b15220693e SHA512 82affca6a596a0475f32a944e23c879f625215ea8311cd29cef56f5af57d88a377420ba7addeb53c9bd30d1583654897baf939618e706d1928d57e83cc87ce9c
 EBUILD mosh-1.3.2-r2.ebuild 1495 BLAKE2B 37b69dd27d145709d283351072318f9c121d9d0b291138c8e65deb75af2f30956bbb1172497fa6e109511d19829e1e589fceacf0d9d25e3448aae416e5d3cfe0 SHA512 5ab027e930195649efbfeda59f32ab06513880fec2e54b85d8104c31b3620a2b49d81eff887bd79319a413b688230748493e4f7f3530ea09c9281c66e6b3ed0a
-MISC metadata.xml 1104 BLAKE2B 9da21afbf989104205fd3c8d8b9b0f597496efe9e175f1577c6c5e1866ca6dbfa9353ef03bfd72c850cd21fa2067be9146a82a261d2bd68ebe64cd49deff8e94 SHA512 4fd1d994fb0ca6bacc07a6c3a970edffc3a2e70bcca7cd6ecc74687794ba7ec6212994cb5997712946c555b3e66063caa36c8656ae737ac193031bf997ec7e13
+EBUILD mosh-1.4.0_rc1-r1.ebuild 1948 BLAKE2B e3f6f6023572ddeedf50183a9c5afd42ee37ebbc8db08f0c59ba680296e0eb0e18e83268fb7dfcde83777b9c8d8dccb691af667d773c6a223ed97d6f7390762d SHA512 7e3bc45e8c1fd255eb4b961fa53fc5abbe4923bf340bf56f0e6f75f4a862facc43bbb69b520d59156333d792f7383c27de092b11cfb0ad6012cbc6d0dd0635cd
+MISC metadata.xml 1291 BLAKE2B b31514cebb1e3737374756887ffad688e469dbd3135eee366987abf327252bbc1aa53eb6d4315fa246a6f7c71efb8d2baf32d97125463581e058c85b3aa0673c SHA512 ca82bbf4b4b57ad3af3cffcd048644e5e7d57463d651ffd8df5da747b67c0701608908bfb9892155eac70e3477cfdc4a0f7d95110e897e73c78dfdd81236ef55
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 065a0d495315..a93f5b0b0cb1 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="client">Build network client</flag>
 		<flag name="examples">Include example scripts</flag>
 		<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag>
+		<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for some cryptographic functions instead of <pkg>dev-libs/openssl</pkg>. With Nettle, some of mosh's own code is used for OCB.</flag>
 		<flag name="server">Build network server</flag>
 		<flag name="ufw">Install net-firewall/ufw rule set</flag>
 		<flag name="utempter">Include libutempter support</flag>
diff --git a/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
new file mode 100644
index 000000000000..849159872ea4
--- /dev/null
+++ b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+MY_P=${PN}-${PV/_/-}
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="https://mosh.org"
+#SRC_URI="https://mosh.org/${P}.tar.gz"
+SRC_URI="https://github.com/mobile-shell/mosh/releases/download/${MY_P}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+fi
+IUSE="+client examples +hardened nettle +server syslog ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:=
+	sys-libs/ncurses:=
+	sys-libs/zlib
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	!nettle? ( dev-libs/openssl:= )
+	nettle? ( dev-libs/nettle:= )
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+QA_CONFIGURE_OPTIONS="--disable-static"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	MAKEOPTS+=" V=1"
+
+	local myeconfargs=(
+		# We install it ourselves in src_install
+		--disable-completion
+
+		$(use_enable client)
+		$(use_enable server)
+		$(use_enable examples)
+		$(use_enable hardened hardening)
+		$(use_enable ufw)
+		$(use_enable syslog)
+		$(use_with utempter)
+
+		# We default to OpenSSL as upstream do
+		--with-crypto-library=$(usex nettle nettle openssl-with-openssl-ocb)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	for myprog in $(find src/examples -type f -perm /0111) ; do
+		newbin ${myprog} ${PN}-$(basename ${myprog})
+		elog "${myprog} installed as ${PN}-$(basename ${myprog})"
+	done
+
+	# bug #477384
+	dobashcomp conf/bash-completion/completions/mosh
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index b5babad1adb2..6c2cbfdead0e 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -9,6 +9,6 @@ DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f8
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r6.ebuild 4882 BLAKE2B fd5d58d7dd02d4b423dccf057d9e36e4292a441a9251b417305fac0a7d17d54fbac9d07a3ae0bc28ca889e59ad8cd8ebd31840da9075f4382744f444c9e1daa6 SHA512 c277bc658ae9c3449a81981c7265bab9926a36a4d9620de7da808800a7cfa840c97af6b8fe2370db38f8778b17f773fd09e9f4759b46bf95a7a01b746ddda285
-EBUILD tigervnc-1.12.0-r7.ebuild 4720 BLAKE2B 9a628baca4950ae89df4d82f83698b4d0bc40ae89bc4f62c78caf9ecde0f178c5e32e2b214e8b23ec5345f80665b0af38733546702d347345f0df5421d5eb962 SHA512 b9f1800320cd9c3a8cb36361b519518733cc30d8fdf6e9d1fe2052760d154c8168e589b4eb54382135ba303b1ada2aa1e0f46e88052da6ed42896e6fc7148632
+EBUILD tigervnc-1.12.0-r7.ebuild 4718 BLAKE2B 14fa86d2c0179bd54b77cf00b0c4628c5efbe1d4129fbd94fc15fc5349bfa276676d1d994daccae333d7718d5727989d7fb8a4165b16f1e1a232af80d4437e2d SHA512 80f8a667c86ff49a66efccc1ebd744ed098bcc28a106f09c98185674d4049d164e56fb78aa408446c4e5603d96db2aea4afe711bd07ad2af4c345a03f2793a0b
 EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
 MISC metadata.xml 651 BLAKE2B a2729d5a950c4bcc38bdf9b80da2563b1f140c6f3311f8a8b817199d3efae7a4fe1f2b6ac8bba87d3b858e6c5d98176ab6873ae0273ea1d416dafcb7e9c7703b SHA512 e0a9a4f66f75df32532c1bb055db8e8ae9fe2aff5503a3f1806531806c596f812403a92d6a9c717872321ddac2043e41da7376048bf89bca52d8746acd5f1b15
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 93ca0f1495e4..8a87e2df69b6 100644
--- a/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
 REQUIRED_USE="
 	dri3? ( drm )