From 37b18c77e0c5b7705f5f6a45ea99ba897a3c0d70 Mon Sep 17 00:00:00 2001
From: Yang Yang <geraint0923@gmail.com>
Date: Mon, 1 Nov 2021 10:27:05 -0700
Subject: net-misc/mosh: add patch to enable the compilation with clang

Fix is introduced to mosh official at:
https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0
Closes: https://github.com/gentoo/gentoo/pull/22787

Signed-off-by: Yang Yang <geraint0923@gmail.com>
Signed-off-by: Amy Liffey <amynka@gentoo.org>
---
 .../mosh/files/mosh-1.3.2-bind-misinterpret.patch  | 11 ++++
 net-misc/mosh/mosh-1.3.2-r1.ebuild                 | 70 ---------------------
 net-misc/mosh/mosh-1.3.2-r2.ebuild                 | 71 ++++++++++++++++++++++
 3 files changed, 82 insertions(+), 70 deletions(-)
 create mode 100644 net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch
 delete mode 100644 net-misc/mosh/mosh-1.3.2-r1.ebuild
 create mode 100644 net-misc/mosh/mosh-1.3.2-r2.ebuild

(limited to 'net-misc/mosh')

diff --git a/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch b/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch
new file mode 100644
index 000000000000..0203cfff6b23
--- /dev/null
+++ b/net-misc/mosh/files/mosh-1.3.2-bind-misinterpret.patch
@@ -0,0 +1,11 @@
+--- a/src/network/network.cc
++++ b/src/network/network.cc
+@@ -335,7 +335,7 @@ bool Connection::try_bind( const char *addr, int port_low, int port_high )
+       }
+     }
+ 
+-    if ( bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
++    if ( ::bind( sock(), &local_addr.sa, local_addr_len ) == 0 ) {
+       set_MTU( local_addr.sa.sa_family );
+       return true;
+     } else if ( i == search_high ) { /* last port to search */
diff --git a/net-misc/mosh/mosh-1.3.2-r1.ebuild b/net-misc/mosh/mosh-1.3.2-r1.ebuild
deleted file mode 100644
index 469c7b1f214b..000000000000
--- a/net-misc/mosh/mosh-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools bash-completion-r1
-
-DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-HOMEPAGE="https://mosh.org"
-SRC_URI="https://mosh.org/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="+client examples +mosh-hardening +server ufw +utempter"
-
-REQUIRED_USE="
-	|| ( client server )
-	examples? ( client )"
-
-RDEPEND="
-	dev-libs/protobuf:0=
-	sys-libs/ncurses:0=
-	virtual/ssh
-	client? (
-		dev-lang/perl
-		dev-perl/IO-Tty
-	)
-	dev-libs/openssl:0=
-	utempter? (
-		sys-libs/libutempter
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# [0] - avoid sandbox-violation calling git describe in Makefile.
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
-)
-
-src_prepare() {
-	MAKEOPTS+=" V=1"
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-completion \
-		$(use_enable client) \
-		$(use_enable server) \
-		$(use_enable examples) \
-		$(use_enable ufw) \
-		$(use_enable mosh-hardening hardening) \
-		$(use_with utempter)
-}
-
-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/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..710a8c1fe272
--- /dev/null
+++ b/net-misc/mosh/mosh-1.3.2-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
+HOMEPAGE="https://mosh.org"
+SRC_URI="https://mosh.org/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="+client examples +mosh-hardening +server ufw +utempter"
+
+REQUIRED_USE="
+	|| ( client server )
+	examples? ( client )"
+
+RDEPEND="
+	dev-libs/protobuf:0=
+	sys-libs/ncurses:0=
+	virtual/ssh
+	client? (
+		dev-lang/perl
+		dev-perl/IO-Tty
+	)
+	dev-libs/openssl:0=
+	utempter? (
+		sys-libs/libutempter
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+# [0] - avoid sandbox-violation calling git describe in Makefile.
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.5-git-version.patch
+	"${FILESDIR}"/${P}-bind-misinterpret.patch
+)
+
+src_prepare() {
+	MAKEOPTS+=" V=1"
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-completion \
+		$(use_enable client) \
+		$(use_enable server) \
+		$(use_enable examples) \
+		$(use_enable ufw) \
+		$(use_enable mosh-hardening hardening) \
+		$(use_with utempter)
+}
+
+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
+}
-- 
cgit v1.2.3-65-gdbad