Date: Wed, 6 Mar 2019 05:00:28 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494775 - in head/net/torsocks: . files Message-ID: <201903060500.x2650Sc2080129@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Mar 6 05:00:27 2019 New Revision: 494775 URL: https://svnweb.freebsd.org/changeset/ports/494775 Log: net/torsocks: Fix unsupported syscall errors in version 2.3.0 PR: 233736 Submitted by: Stefan Ehmann <shoesoft@gmx.net> Added: head/net/torsocks/files/patch-src_lib_syscall.c (contents, props changed) Modified: head/net/torsocks/Makefile Modified: head/net/torsocks/Makefile ============================================================================== --- head/net/torsocks/Makefile Wed Mar 6 04:56:56 2019 (r494774) +++ head/net/torsocks/Makefile Wed Mar 6 05:00:27 2019 (r494775) @@ -3,6 +3,7 @@ PORTNAME= torsocks DISTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= https://people.torproject.org/~dgoulet/${PORTNAME}/ Added: head/net/torsocks/files/patch-src_lib_syscall.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/torsocks/files/patch-src_lib_syscall.c Wed Mar 6 05:00:27 2019 (r494775) @@ -0,0 +1,52 @@ +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 +@@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accep + return tsocks_accept(sockfd, addr, &addrlen); + } + +-#if !((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64)) ++#if defined(__FreeBSD__) + /* + * Handle mmap(2) syscall. + */ +@@ -457,7 +457,7 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon + ret = handle_close(args); + break; + case TSOCKS_NR_MMAP: +-#if (defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64) ++#if defined(badbadbad) + /* + * 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); + break; + #endif /* __linux__ */ ++#if defined(__FreeBSD__) ++ case TSOCKS_NR_FORK: ++ ret = tsocks_libc_syscall(TSOCKS_NR_FORK); ++ break; ++ case TSOCKS_NR_GETPID: ++ ret = tsocks_libc_syscall(TSOCKS_NR_GETPID); ++ 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 + */ + ret = handle_bsd_mmap(args); + break; ++#if defined(__FreeBSD__) ++ case TSOCKS_NR_FORK: ++ ret = tsocks_libc_syscall(TSOCKS_NR_FORK); ++ break; ++ case TSOCKS_NR_GETPID: ++ ret = tsocks_libc_syscall(TSOCKS_NR_GETPID); ++ break; ++#endif + default: + /* + * Because of the design of syscall(), we can't pass a va_list to it so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903060500.x2650Sc2080129>