commit: 6322dc8cf0f9fb5c7dc487c271f50b855bc0e10b Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jan 4 03:46:34 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 4 04:31:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6322dc8c
net-proxy/torsocks: drop 2.3.0 Signed-off-by: Sam James <sam <AT> gentoo.org> net-proxy/torsocks/Manifest | 1 - .../files/torsocks-2.3.0-fix-syscall.patch | 94 ---------------------- net-proxy/torsocks/torsocks-2.3.0.ebuild | 48 ----------- 3 files changed, 143 deletions(-) diff --git a/net-proxy/torsocks/Manifest b/net-proxy/torsocks/Manifest index 7bed495316dd..b9bfe25373d6 100644 --- a/net-proxy/torsocks/Manifest +++ b/net-proxy/torsocks/Manifest @@ -1,2 +1 @@ -DIST torsocks-2.3.0.tar.gz 118033 BLAKE2B a4329ffa5e20204024c4f7dda8619ba2d3e2a5f370727acdc720527688bdb3f8735b0386dfa07758fe59e1890f9ce88bb148a1b0c401bbb5966d2fe17934ca61 SHA512 139f4cf60191632add8bc845b2d68d25a0285e9746988167d832e50cedb8083f2765571429d3a11350fa2d327a1ff0a0ead9b464dac90d897b13ab948f609114 DIST torsocks-2.4.0.tar.gz 118991 BLAKE2B e1817c3bbf10f83431292c644d7187e40b62c5f223784074b3f9c082d8d75243090e226ffebb6fd81805fbd887588790833adc4ab8923e8116585c0a29255ad0 SHA512 7d625ce3a4600f87b86ae9ac79dfd206e7709cb0bafe0b7afcf33a6f1825f968cc63ad3e23c584582b244647bdeafbfdbfc54f7c81e521b0a3d278a1483ce86e 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 <[email protected]> -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/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 -}
