Date: Wed, 28 Oct 2015 16:25:27 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400400 - in head/net/torsocks: . files Message-ID: <201510281625.t9SGPRta026091@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Wed Oct 28 16:25:27 2015 New Revision: 400400 URL: https://svnweb.freebsd.org/changeset/ports/400400 Log: Update to version 2.1.0 PR: 200503 Submitted by: maintainer Added: head/net/torsocks/files/patch-configure.ac (contents, props changed) head/net/torsocks/files/patch-src_common_compat.h (contents, props changed) head/net/torsocks/files/patch-src_lib_syscall.c (contents, props changed) Deleted: head/net/torsocks/files/patch-compatibility-2.0.0 Modified: head/net/torsocks/Makefile head/net/torsocks/distinfo Modified: head/net/torsocks/Makefile ============================================================================== --- head/net/torsocks/Makefile Wed Oct 28 16:05:02 2015 (r400399) +++ head/net/torsocks/Makefile Wed Oct 28 16:25:27 2015 (r400400) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= torsocks -PORTVERSION= 2.0.0 +PORTVERSION= 2.1.0 +DISTVERSIONPREFIX= v CATEGORIES= net security -MASTER_SITES= GH MAINTAINER= yuri@rawbw.com COMMENT= Easy way to make any app work through Tor @@ -14,7 +14,6 @@ LICENSE= GPLv2 USE_GITHUB= yes GH_ACCOUNT= dgoulet GH_PROJECT= torsocks -GH_TAGNAME= 96f7a0d GNU_CONFIGURE= yes USES= alias autoreconf gmake libtool @@ -27,10 +26,6 @@ PORTDOCS= ChangeLog DEBUG SOCKS5 socks-e OPTIONS_DEFINE= DOCS -post-patch: - ${REINPLACE_CMD} -e 's,(defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__))),defined(__FreeBSD__),' ${WRKSRC}/src/lib/syscall.c - ${REINPLACE_CMD} -e 's,(defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(__x86_64),defined(badbadbad),' ${WRKSRC}/src/lib/syscall.c - post-build: @${ECHO} @${ECHO} "Please run 'make check' (requires bash)." Modified: head/net/torsocks/distinfo ============================================================================== --- head/net/torsocks/distinfo Wed Oct 28 16:05:02 2015 (r400399) +++ head/net/torsocks/distinfo Wed Oct 28 16:25:27 2015 (r400400) @@ -1,2 +1,2 @@ -SHA256 (dgoulet-torsocks-2.0.0-96f7a0d_GH0.tar.gz) = 12d84d9a7c1a12555f39e5d9db3707307f39f3e1e7b9a8b3a8ecefaac8e8a599 -SIZE (dgoulet-torsocks-2.0.0-96f7a0d_GH0.tar.gz) = 96317 +SHA256 (dgoulet-torsocks-v2.1.0_GH0.tar.gz) = a72c3ea757f5fe81d1ab91e0d5f0d83f195e235aae66d4df2f88a20db7028104 +SIZE (dgoulet-torsocks-v2.1.0_GH0.tar.gz) = 106339 Added: head/net/torsocks/files/patch-configure.ac ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/torsocks/files/patch-configure.ac Wed Oct 28 16:25:27 2015 (r400400) @@ -0,0 +1,13 @@ +--- configure.ac.orig 2015-05-27 18:54:22 UTC ++++ configure.ac +@@ -126,6 +126,10 @@ AS_CASE([$host_os], + libc_name="libc.so.6" + fi + ], ++ [freebsd*], ++ [ ++ libc_name=`ldd /usr/bin/yes | grep 'libc\.' | cut -d ' ' -f 3 | tr -d '\t'` ++ ], + [libc_name="libc.so"] + ) + AC_DEFINE_UNQUOTED([LIBC_NAME],["${libc_name}"], [Description]) Added: head/net/torsocks/files/patch-src_common_compat.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/torsocks/files/patch-src_common_compat.h Wed Oct 28 16:25:27 2015 (r400400) @@ -0,0 +1,13 @@ +--- src/common/compat.h.orig 2015-05-27 18:54:22 UTC ++++ src/common/compat.h +@@ -187,6 +187,10 @@ void tsocks_once(tsocks_once_t *o, void + #define TSOCKS_NR_GETPEERNAME SYS_getpeername + #define TSOCKS_NR_LISTEN SYS_listen + #define TSOCKS_NR_RECVMSG SYS_recvmsg ++#if defined(__FreeBSD__) ++#define TSOCKS_NR_GETPID SYS_getpid ++#define TSOCKS_NR_FORK SYS_fork ++#endif + + #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */ + 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 Oct 28 16:25:27 2015 (r400400) @@ -0,0 +1,50 @@ +--- src/lib/syscall.c.orig 2015-05-27 18:54:22 UTC ++++ src/lib/syscall.c +@@ -84,7 +84,7 @@ static LIBC_ACCEPT_RET_TYPE handle_accep + return tsocks_accept(sockfd, addr, &addrlen); + } + +-#if (defined(__linux__) || defined(__darwin__) || (defined(__FreeBSD_kernel__) && defined(__i386__)) || defined(__NetBSD__)) ++#if defined(__FreeBSD__) + /* + * Handle mmap(2) syscall. + */ +@@ -372,7 +372,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. +@@ -456,6 +456,14 @@ LIBC_SYSCALL_RET_TYPE tsocks_syscall(lon + ret = handle_inotify_rm_watch(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 +@@ -530,6 +538,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?201510281625.t9SGPRta026091>