From nobody Sat Jul 27 20:19:23 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WWbZ36pHxz5RcQG; Sat, 27 Jul 2024 20:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WWbZ34sG7z42X5; Sat, 27 Jul 2024 20:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722111563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DSMSkA9KO71Uqa+0X41FvmDEX/YUerhMjsyNeu7IMY=; b=hcbz8VZTumxGqX1cBSiowGkJ/7XpIjnWx4tzkXpX+utkejjZRDrlsPaSBayox8bpL9IzUq nfdpUK3GUiyiQ4UZIJREk+BIRbpsdf/N3XWdBNhEP//2wWZBybDL1hqhOu8vnqdPCJyfAn H9Zs35c0U8G/1li3QiHoSncZIAzGVwPCsIgtvWNoTm2LaeGNZt4+/A0s048ljW0kNoUHwB ZLO7JSdnxdqpXe6xHQJwuxbsJLXpVblPEEGBjrr7ouaSiEIqIbMUcDvfkM7okrYDklAo+c 3f1aS1oirji4UfOiWLK3TMSZR2gK02YViwYxpi2tmGLT45/gol7ovP1MyJsJ1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722111563; a=rsa-sha256; cv=none; b=CQ3A7wBEkyZG61lz/l/rthS5WYghtJgolm/DqEoR8K90a2sVj6yNQY/wVGCztZdwUIrRdm CG7uCN/2lRDAtP3dix+PnfBWD9haSAcGrv4EVXKX3rrcJ22CM+izxz3QzkjbtYkkXc4yno mqWTHpKDnTemJDQw7d4FqQ/wEIjLEIJ2zQMBTVtOVjCRRZ+tNL0WYoPWWKE8ZFfGK0UN8i Posh0qKYmADZkV2GjXrveDDNm+ozD7adH3Ub+Pt/zgloEiSw3wYlC1lYZXfNYErQUJLjPY Lud2vEDAe6lcwgLb8PJDJ+iq8HNN8tNwCmP1PITxbWFKCR25GzncGT0m2wOnjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722111563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2DSMSkA9KO71Uqa+0X41FvmDEX/YUerhMjsyNeu7IMY=; b=t8nwGJaFHfdJdhX9cMfvRrL5P5tjScGEqt+X2E2I53/KS/yJJAvAFQI5Ml6c8nxZjpeE4a eAnWfohEa1r7D3ouO7QGUJ9o1N6bVwiQVn5c9KM5hlPug6Q5azGoNBZsRjiNFBr6Z8n/lM bLEiZPzuZT0ydIggjHxFtvewiOeawIfkzOmNaUVUQQAlYq6jlRRe89LxpA47agA0PSHdoF a28lhGw4Duuwm4HminscOBGEAG+RAWCJIuAuLojDl1Y1bqu/Re9Kd/FeC+VfgolLa4Koy8 0ebQyyMbGlNhRu9meFrbNXNg4trWqaMcM2E1q5bdjxOySDc07Guy+3zLzYIumA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WWbZ340ZnzLv5; Sat, 27 Jul 2024 20:19:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46RKJNh9089439; Sat, 27 Jul 2024 20:19:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46RKJNuD089436; Sat, 27 Jul 2024 20:19:23 GMT (envelope-from git) Date: Sat, 27 Jul 2024 20:19:23 GMT Message-Id: <202407272019.46RKJNuD089436@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 97e12aa04d5d - main - net/torsocks: Fix build failure on 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97e12aa04d5dc00271ae925f01a4ec0432efb660 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=97e12aa04d5dc00271ae925f01a4ec0432efb660 commit 97e12aa04d5dc00271ae925f01a4ec0432efb660 Author: Yuri Victorovich AuthorDate: 2024-07-27 20:14:51 +0000 Commit: Yuri Victorovich CommitDate: 2024-07-27 20:19:17 +0000 net/torsocks: Fix build failure on 15 PR: 280467 Reported by: Dan Kotowski --- net/torsocks/files/patch-src_lib_getpeername.c | 14 +++++++------- net/torsocks/files/patch-src_lib_syscall.c | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/net/torsocks/files/patch-src_lib_getpeername.c b/net/torsocks/files/patch-src_lib_getpeername.c index 15bceb1ab32e..571d0ec47450 100644 --- a/net/torsocks/files/patch-src_lib_getpeername.c +++ b/net/torsocks/files/patch-src_lib_getpeername.c @@ -1,16 +1,16 @@ - workaround for https://gitlab.torproject.org/tpo/core/torsocks/-/issues/40023 ---- src/lib/getpeername.c.orig 2024-07-25 16:31:28 UTC +--- src/lib/getpeername.c.orig 2022-05-25 14:36:05 UTC +++ src/lib/getpeername.c -@@ -22,6 +22,8 @@ - - #include "torsocks.h" +@@ -92,6 +92,8 @@ libc: + return tsocks_libc_getpeername(LIBC_GETPEERNAME_ARGS); + } +#if __FreeBSD_cc_version < 1500000 + - /* getpeername(2) */ - TSOCKS_LIBC_DECL(getpeername, LIBC_GETPEERNAME_RET_TYPE, - LIBC_GETPEERNAME_SIG) + /* + * Libc hijacked symbol getpeername(2). + */ @@ -105,3 +107,5 @@ LIBC_GETPEERNAME_DECL return tsocks_getpeername(LIBC_GETPEERNAME_ARGS); diff --git a/net/torsocks/files/patch-src_lib_syscall.c b/net/torsocks/files/patch-src_lib_syscall.c index 4dc78c547a49..965612662ed3 100644 --- a/net/torsocks/files/patch-src_lib_syscall.c +++ b/net/torsocks/files/patch-src_lib_syscall.c @@ -1,8 +1,8 @@ Patch by Stefan Ehmann, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233736 ---- src/lib/syscall.c.orig 2018-04-20 15:41:42 UTC +--- src/lib/syscall.c.orig 2022-05-25 14:36:05 UTC +++ src/lib/syscall.c -@@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accep +@@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accept(va_list args return tsocks_accept(sockfd, addr, &addrlen); } @@ -11,7 +11,7 @@ Patch by Stefan Ehmann, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=23 /* * Handle mmap(2) syscall. */ -@@ -457,7 +457,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon +@@ -498,7 +498,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, ret = handle_close(args); break; case TSOCKS_NR_MMAP: @@ -20,8 +20,8 @@ Patch by Stefan Ehmann, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=23 /* * On an 64 bit *BSD system, __syscall(2) should be used for mmap(). * This is NOT suppose to happen but for protection we deny that call. -@@ -559,6 +559,14 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon - ret = handle_memfd_create(args); +@@ -606,6 +606,14 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(long int number, + ret = handle_getdents64(args); break; #endif /* __linux__ */ +#if defined(__FreeBSD__) @@ -33,9 +33,9 @@ Patch by Stefan Ehmann, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=23 + break; +#endif default: - /* - * Because of the design of syscall(), we can't pass a va_list to it so -@@ -633,6 +641,14 @@ LIBC___SYSCALL_RET_TYPE tsocks___syscall + DBG("[syscall] Unsupported __syscall number %ld. Passing through", + number); +@@ -675,6 +683,14 @@ LIBC___SYSCALL_RET_TYPE tsocks___syscall(quad_t number */ ret = handle_bsd_mmap(args); break;