gentoo auto-resync : 04:01:2023 - 12:06:28

6 files changed, 21 insertions, 148 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index a016e9914112..20500312697b 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest
index e4f1479d4e6c..027c1fe5aef0 100644
--- a/net-proxy/torsocks/Manifest
+++ b/net-proxy/torsocks/Manifest
@@ -1,6 +1,4 @@
-AUX torsocks-2.3.0-fix-syscall.patch 2687 BLAKE2B 2ef527aa1618af20da02e2b08ddc59d2f66322c63ac0ed6245e52367124b13122ad2d6686790ef0823022bce6de53c13e4127dc97bd37d329266fe1f562c6396 SHA512 4baf4f7d8a218d255fa23004ffb9669de8938caffcb1107ff182bf8fe7c466edc32171635adb4cf69896b7cd9f3afe2ca45efedb37c2afc188568925ae9a07d6
-DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114
-DIST torsocks-2.4.0.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e
-EBUILD torsocks-2.3.0.ebuild 1026 BLAKE2B b7ec706ca0d001952893f21983f26fcf7dae8a7e694b9966dfafde1f11038dc6169a47443d36c1b5190117976ba7992c2cf10f49f9ade06d081783257f043a22 SHA512 1721265f13357ada138dd0a6768754e0ece133ebbe952bc8b8144461d2bf0f03cbb03252bb53a5153640bfa06e2ea038254e34f3c2529550ccacb1a3530688da
-EBUILD torsocks-2.4.0.ebuild 999 BLAKE2B 9e36ba129140ed406977e5ed0743d832d7b9f2c3c194becf4dabe482dafb5fd2cac06943210e13a3db63875a7635e2416a3eb493e1c56bd7151b9e12bd480437 SHA512 b31f50cd6e18ac7195e49f800f3e664da82570841c79bd99777179b581c76ea8f222dc77adfb5be1e075657d7e0e3cd214f420775d241b52ac5baa97fa8681ca
+AUX torsocks-2.4.0-clang16.patch 643 BLAKE2B 83b1d794a2dceaad0ae1321092ce11cb41bdce27ded71c40ce6f7c50ae2c9cae405de4f55636019928dc395684a7614a0b2d7b7123c0d710aa785dee0ef1d50e SHA512 c40dff7ccca62f73e205a32e17090aa5a79de3a06424595fc8c18e969045b12611df73c8e272aa97e6e3708b4b96c0d82be035d0f9c389dcd332536b3ced7337
+DIST torsocks-2.4.0-r1.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e
+EBUILD torsocks-2.4.0-r1.ebuild 1053 BLAKE2B 35282749fc99a666acfbda545a902ea1d19977095812bccb9a683b0502cee72b2c424e9e47bed0a1fddab9563e2fdce864215143f98438ad505812a298a5e8ce SHA512 7d1330ecc459543129bf1baab395407f9a2a378f67951f6bd567b3d52e1b1553937a8bc1bf19d9e903b2df2e064b01f18390bbab37a846f47eba8b14c1a70bcd
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
diff --git a/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch b/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch
deleted file mode 100644
index 93eb7ad45379..000000000000
--- a/net-proxy/torsocks/files/torsocks-2.3.0-fix-syscall.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4c00ec8773fd63fa48ef49e1ccf2adac598427be Mon Sep 17 00:00:00 2001
-From: Alejandro Alvarado <44826516+seisvelas@users.noreply.github.com>
-Date: Mon, 17 Dec 2018 19:25:18 -0600
-Subject: Add getdents / getdents64 support re ticket 28861
-
----
- src/common/compat.h |  8 ++++++++
- src/lib/syscall.c   | 37 +++++++++++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+)
-
-diff --git a/src/common/compat.h b/src/common/compat.h
-index a9b73c2..d79301f 100644
---- a/src/common/compat.h
-+++ b/src/common/compat.h
-@@ -129,6 +129,12 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
- #ifndef __NR_memfd_create
- #define __NR_memfd_create -19
- #endif
-+#ifndef __NR_getdents
-+#define __NR_getdents -20
-+#endif
-+#ifndef __NR_getdents64
-+#define __NR_getdents64 -21
-+#endif
- 
- #define TSOCKS_NR_SOCKET    __NR_socket
- #define TSOCKS_NR_CONNECT   __NR_connect
-@@ -149,6 +155,8 @@ void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
- #define TSOCKS_NR_CLOCK_GETTIME __NR_clock_gettime
- #define TSOCKS_NR_FORK      __NR_fork
- #define TSOCKS_NR_MEMFD_CREATE __NR_memfd_create
-+#define TSOCKS_NR_GETDENTS __NR_getdents
-+#define TSOCKS_NR_GETDENTS64 __NR_getdents64
- 
- /*
-  * Despite glibc providing wrappers for these calls for a long time
-diff --git a/src/lib/syscall.c b/src/lib/syscall.c
-index 7fba580..f793da7 100644
---- a/src/lib/syscall.c
-+++ b/src/lib/syscall.c
-@@ -437,6 +437,37 @@ static LIBC_SYSCALL_RET_TYPE handle_memfd_create(va_list args)
- 
- 	return tsocks_libc_syscall(TSOCKS_NR_MEMFD_CREATE, name, flags);
- }
-+/*
-+ * Handle getdents(2) syscall.
-+ */
-+static LIBC_SYSCALL_RET_TYPE handle_getdents(va_list args)
-+{
-+	unsigned int fd;
-+	struct linux_dirent *dirp;
-+	unsigned int count;
-+
-+	fd = va_arg(args, __typeof__(fd));
-+	dirp = va_arg(args, __typeof__(dirp));
-+	count = va_arg(args, __typeof__(count));
-+
-+	return tsocks_libc_syscall(TSOCKS_NR_GETDENTS, fd, dirp, count);
-+}
-+/*
-+ * Handle getdents64(2) syscall.
-+ */
-+static LIBC_SYSCALL_RET_TYPE handle_getdents64(va_list args)
-+{
-+	unsigned int fd;
-+	struct linux_dirent64 *dirp;
-+	unsigned int count;
-+
-+	fd = va_arg(args, __typeof__(fd));
-+	dirp = va_arg(args, __typeof__(dirp));
-+	count = va_arg(args, __typeof__(count));
-+
-+	return tsocks_libc_syscall(TSOCKS_NR_GETDENTS64, fd, dirp, count);
-+}
-+
- #endif /* __linux__ */
- 
- /*
-@@ -558,6 +589,12 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, va_list args)
- 	case TSOCKS_NR_MEMFD_CREATE:
- 		ret = handle_memfd_create(args);
- 		break;
-+	case TSOCKS_NR_GETDENTS:
-+		ret = handle_getdents(args);
-+		break;
-+	case TSOCKS_NR_GETDENTS64:
-+		ret = handle_getdents64(args);
-+		break;
- #endif /* __linux__ */
- 	default:
- 		/*
--- 
-cgit v1.1
-
diff --git a/net-proxy/torsocks/files/torsocks-2.4.0-clang16.patch b/net-proxy/torsocks/files/torsocks-2.4.0-clang16.patch
new file mode 100644
index 000000000000..3bedd71dc736
--- /dev/null
+++ b/net-proxy/torsocks/files/torsocks-2.4.0-clang16.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/881077
+https://gitlab.torproject.org/tpo/core/torsocks/-/issues/40014
+https://lists.torproject.org/pipermail/tor-dev/2022-December/014790.html
+--- a/src/common/config-file.h
++++ b/src/common/config-file.h
+@@ -109,6 +109,7 @@ int conf_file_set_allow_inbound(const char *val, struct configuration *config);
+ int conf_file_set_allow_outbound_localhost(const char *val, struct
+ 		configuration *config);
+ int conf_file_set_isolate_pid(const char *val, struct configuration *config);
++int conf_file_set_enable_ipv6(const char *val, struct configuration *config);
+ 
+ int conf_apply_socks_auth(struct configuration *config);
+
diff --git a/net-proxy/torsocks/torsocks-2.3.0.ebuild b/net-proxy/torsocks/torsocks-2.3.0.ebuild
deleted file mode 100644
index 60d7ee656ce1..000000000000
--- a/net-proxy/torsocks/torsocks-2.3.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_PV="$(ver_rs 3 -)"
-MY_PF="${PN}-${MY_PV}"
-S=${WORKDIR}/${MY_PF}
-
-DESCRIPTION="Use most socks-friendly applications with Tor"
-HOMEPAGE="https://github.com/dgoulet/torsocks"
-SRC_URI="https://github.com/dgoulet/torsocks/archive/v${MY_PV}.tar.gz -> ${MY_PF}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="static-libs"
-
-# We do not depend on tor which might be running on a different box
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fix-syscall.patch )
-
-src_prepare() {
-	# Disable tests requiring network access.
-	local test
-	for test in dns fd_passing getpeername; do
-		sed -i -e "/^	test_${test} \\\\\$/d" tests/Makefile.am || \
-			die "failed to disable network tests"
-	done
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	# Remove libtool .la files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-proxy/torsocks/torsocks-2.4.0.ebuild b/net-proxy/torsocks/torsocks-2.4.0-r1.ebuild
index 94ad25e9ef98..7efc2f3d402c 100644
--- a/net-proxy/torsocks/torsocks-2.4.0.ebuild
+++ b/net-proxy/torsocks/torsocks-2.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,6 +21,10 @@ IUSE="static-libs"
 DEPEND=""
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-clang16.patch
+)
+
 src_prepare() {
 	# Disable tests requiring network access.
 	local test