4 files changed, 65 insertions, 6 deletions
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index f5412071152d..968c0962e304 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -1,5 +1,7 @@
 DIST socat-1.7.4.4.tar.bz2 522127 BLAKE2B 221b1c7c1ef0ac9c2402a6917ce7740a7ed857ceae4f4c346ed3c69c261fd0f9ca667e21cab5f97427d3947b06fdb0ac6d090852465878db968a24b8ece587ad SHA512 3eedfbf599ecf1d6fd391d03d710044bc5e18a762395bc4cb151b96fe673d405a6630da3070ecddd5ac558126b56aa65feaa74d528eeb755a04aa0ec61690651
 DIST socat-1.8.0.0.tar.bz2 564066 BLAKE2B b0b3e8c46f746b1aaff7390bbf9521cca8c421f3c20cd7a7f7d8ffd3d7b5e5e881e2477642f7d29247ee5a9d9edf6c8370a43c5f2757e456966b17e3ba08a58a SHA512 dd15c31204f2843ab473a30aa841e960e7c00ac7487e2265d69f9e8ea0afde3841d57cfcb99084f03935d7223da65cee27166837f2f9b3a20c834bc161af802b
-EBUILD socat-1.7.4.4-r1.ebuild 1215 BLAKE2B d650c69de5b77fde6e1811fde09cbb13febb47b9a226bd02b95a4e6e43c5b87f2a71c86ba4fb197aa9f01305460be265ed7ba71dae43431fa8147c9183ec0e8e SHA512 ebebc0d7b51cb197768148a5c42a90fab872be7f1dd69aa8537c277d2c81a3b80379aaf8060652598e2c78cab7fb5073739c87832848d2c8b1ccdc64da51456a
-EBUILD socat-1.8.0.0.ebuild 1338 BLAKE2B c15ea537a94c2dc1827466dca9fbab2451b66f5aca55d4179e92b8a3cdc9629803fc6aae26729b8077ec48cc2048732798b5e63af7aba23fdbe2d349e753efbd SHA512 7cb6e6404ac1cbaa00c5186502d38477b24643bd9be4bb30ba2a217bec0909f2ffc8482d39b76ff5c5262bedcbecb28c9560b667b0dfb1062b99a1f8711d36fe
+DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 0af65b18dc6fec28e59d75048b1e1c4f442f134d87bc6a9b5ea7b3032a0c5519e0d042ae760d451006eacf368870a0a47465d9ec2d5f2fe8d41efcd639ef58c5 SHA512 ce8147df545f74d4b6e1d3d0dae2dcea58c4c7e6ccd1cb2eec68c29ead2c3a818e9851b30a5e5f1456d70463c31b13ab1c5b350293359419a583ed693a917231
+EBUILD socat-1.7.4.4-r1.ebuild 1209 BLAKE2B 4e63b10678302ef5ad6dee0af7f041806d4963b5d218e02e9a3c0035ae1c90eac0b34f5dc31ae965ed1bd337dc5e02f2bb62ec7131e02b389e0eb197694be04b SHA512 0cc2ef381c48ef9f8c2380ad7cd4e88c401bccc14709518e1ccf7e70758a878356dde18e039d39daf15f70da58006b32d005ae053a3e6718c11820bb51f11f41
+EBUILD socat-1.8.0.0.ebuild 1436 BLAKE2B 2104f758c85150611862331a5f0f17613980b50f331d342a27b5bd0adebe16e3a5a8858b06f8f049dc93610191697054692e0a368a4e48e9381c9df1b60d3b59 SHA512 23e8e14be9bab9ffc76020ae34e70245407cf5ba0aebca391047a5129aa25e975f73607d4cb650017902a46f1f5ab679c0674af06770a9fea34105f64388a44e
+EBUILD socat-1.8.0.1.ebuild 1297 BLAKE2B 4034c6cb05c705065152dd252dcfb1502f3dc67e5d2f54611f759062b07a3e1a0e295b7a8f06a73df8a7c7bbe5c29b263f69c7c73ec4cd5b71ede32265e9e72e SHA512 2b12d0418a2e5a88e26aeb0ef1add14250b2a75a92e3e8b9f3cef9560c55aab249d389ac3440f99df904478045ccdc2604f88c0eba22e6e916f9ca63df910ad0
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.7.4.4-r1.ebuild b/net-misc/socat/socat-1.7.4.4-r1.ebuild
index 56c0a04850d6..a4f9e4264807 100644
--- a/net-misc/socat/socat-1.7.4.4-r1.ebuild
+++ b/net-misc/socat/socat-1.7.4.4-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="ssl? ( >=dev-libs/openssl-3:0= )
diff --git a/net-misc/socat/socat-1.8.0.0.ebuild b/net-misc/socat/socat-1.8.0.0.ebuild
index ca3d608643a5..e058ec5fe1dc 100644
--- a/net-misc/socat/socat-1.8.0.0.ebuild
+++ b/net-misc/socat/socat-1.8.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="
@@ -47,7 +47,9 @@ src_configure() {
 }
 
 src_test() {
-	edo ./test.sh -v --expect-fail 217,311,313,410,478,528
+	# Most tests are skipped because they need network access or a TTY
+	# 518 519 need extra permissions
+	edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
 }
 
 src_install() {
diff --git a/net-misc/socat/socat-1.8.0.1.ebuild b/net-misc/socat/socat-1.8.0.1.ebuild
new file mode 100644
index 000000000000..c95a08a93750
--- /dev/null
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo flag-o-matic toolchain-funcs
+
+MY_P=${P/_beta/-b}
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/ https://repo.or.cz/socat.git"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="ipv6 readline ssl tcpd"
+
+DEPEND="
+	ssl? ( >=dev-libs/openssl-3:= )
+	readline? ( sys-libs/readline:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY )
+
+src_configure() {
+	# bug #293324
+	filter-flags '-Wno-error*'
+
+	tc-export AR
+
+	local myeconfargs=(
+		$(use_enable ssl openssl)
+		$(use_enable readline)
+		$(use_enable ipv6 ip6)
+		$(use_enable tcpd libwrap)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Most tests are skipped because they need network access or a TTY
+	# 518 519 need extra permissions
+	edo ./test.sh -v --expect-fail 217,311,313,410,478,518,519,528
+}
+
+src_install() {
+	default
+
+	docinto html
+	dodoc doc/*.html doc/*.css
+}