6 files changed, 80 insertions, 52 deletions

diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index c58d3de7205c..4ae394ff4a4f 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -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-extensions.txt
 
 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)."
diff --git a/net/torsocks/distinfo b/net/torsocks/distinfo
index a5ef040e8792..48be8fe96021 100644
--- a/net/torsocks/distinfo
+++ b/net/torsocks/distinfo
@@ -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
diff --git a/net/torsocks/files/patch-compatibility-2.0.0 b/net/torsocks/files/patch-compatibility-2.0.0
deleted file mode 100644
index 0e5b704be8b1..000000000000
--- a/net/torsocks/files/patch-compatibility-2.0.0
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.ac
-+++ 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])
---- src/common/compat.h.orig	2014-08-11 09:44:46.000000000 -0700
-+++ src/common/compat.h	2015-03-24 15:19:54.396135000 -0700
-@@ -95,6 +95,10 @@
- #define TSOCKS_NR_CLOSE     SYS_close
- #define TSOCKS_NR_MMAP      SYS_mmap
- #define TSOCKS_NR_MUNMAP    SYS_munmap
-+#if defined(__FreeBSD__)
-+#define TSOCKS_NR_GETPID    SYS_getpid
-+#define TSOCKS_NR_FORK      SYS_fork
-+#endif
- 
- #endif /* __FreeBSD__, __FreeBSD_kernel__, __darwin__, __NetBSD__ */
- 
---- src/lib/syscall.c	2014-08-11 09:44:46.000000000 -0700
-+++ src/lib/syscall.c	2015-03-24 15:24:10.695024000 -0700
-@@ -156,6 +156,14 @@
- 	case TSOCKS_NR_MUNMAP:
- 		ret = handle_munmap(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:
- 		/*
- 		 * Deny call since we have no idea if this call can leak or not data
diff --git a/net/torsocks/files/patch-configure.ac b/net/torsocks/files/patch-configure.ac
new file mode 100644
index 000000000000..31e34a85009a
--- /dev/null
+++ b/net/torsocks/files/patch-configure.ac
@@ -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])
diff --git a/net/torsocks/files/patch-src_common_compat.h b/net/torsocks/files/patch-src_common_compat.h
new file mode 100644
index 000000000000..b34ab054e0b3
--- /dev/null
+++ b/net/torsocks/files/patch-src_common_compat.h
@@ -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__ */
+ 
diff --git a/net/torsocks/files/patch-src_lib_syscall.c b/net/torsocks/files/patch-src_lib_syscall.c
new file mode 100644
index 000000000000..60546a70920f
--- /dev/null
+++ b/net/torsocks/files/patch-src_lib_syscall.c
@@ -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