net/torsocks: Update 2.2.0 -> 2.3.0

Reported by:	portscout

5 files changed, 20 insertions, 57 deletions

diff --git a/net/torsocks/Makefile b/net/torsocks/Makefile
index ed8f5f13452d..08f127219039 100644
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	torsocks
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+DISTVERSION=	2.3.0
 CATEGORIES=	net security
 MASTER_SITES=	https://people.torproject.org/~dgoulet/${PORTNAME}/
 
diff --git a/net/torsocks/distinfo b/net/torsocks/distinfo
index fde6654c9d74..74ecafe23045 100644
--- a/net/torsocks/distinfo
+++ b/net/torsocks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1530802906
-SHA256 (torsocks-2.2.0.tar.xz) = 29e8c8cefa677dfb493ea6f2449576a7a9abebd221547037f9381d9ed44bd92f
-SIZE (torsocks-2.2.0.tar.xz) = 309916
+TIMESTAMP = 1542734899
+SHA256 (torsocks-2.3.0.tar.xz) = b9f1b981d6b3fd4e1820de1eee325f8a7038c84765d5a6cd9af12571d5cc3622
+SIZE (torsocks-2.3.0.tar.xz) = 313072
diff --git a/net/torsocks/files/patch-src_common_compat.h b/net/torsocks/files/patch-src_common_compat.h
index b34ab054e0b3..8e832b9ce584 100644
--- a/net/torsocks/files/patch-src_common_compat.h
+++ b/net/torsocks/files/patch-src_common_compat.h
@@ -1,6 +1,6 @@
---- src/common/compat.h.orig	2015-05-27 18:54:22 UTC
+--- src/common/compat.h.orig	2018-04-20 15:41:42 UTC
 +++ src/common/compat.h
-@@ -187,6 +187,10 @@ void tsocks_once(tsocks_once_t *o, void 
+@@ -214,6 +214,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
diff --git a/net/torsocks/files/patch-src_lib_syscall.c b/net/torsocks/files/patch-src_lib_syscall.c
deleted file mode 100644
index 60546a70920f..000000000000
--- a/net/torsocks/files/patch-src_lib_syscall.c
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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
diff --git a/net/torsocks/files/patch-src_lib_torsocks.c b/net/torsocks/files/patch-src_lib_torsocks.c
new file mode 100644
index 000000000000..de0fb31b6ebe
--- /dev/null
+++ b/net/torsocks/files/patch-src_lib_torsocks.c
@@ -0,0 +1,14 @@
+--- src/lib/torsocks.c.orig	2018-11-20 17:48:42 UTC
++++ src/lib/torsocks.c
+@@ -234,9 +234,9 @@ static void init_libc_symbols(void)
+ 	tsocks_libc_socket = dlsym(libc_ptr, LIBC_SOCKET_NAME_STR);
+ 	tsocks_libc_syscall = dlsym(libc_ptr, LIBC_SYSCALL_NAME_STR);
+ 	tsocks_libc_execve = dlsym(libc_ptr, LIBC_EXECVE_NAME_STR);
+-	tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR);
++	tsocks_libc_accept = dlsym(libc_ptr, LIBC_ACCEPT_NAME_STR);
+ 	if (!tsocks_libc_connect || !tsocks_libc_close || !tsocks_libc_socket ||
+-			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept4) {
++			!tsocks_libc_syscall || !tsocks_libc_execve || ! tsocks_libc_accept) {
+ 		ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror());
+ 		goto error;
+ 	}