CVS commit: pkgsrc/net/torsocks

["Leonardo Taccari" <leot%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   leot
Date:           Tue Nov 20 23:42:59 UTC 2018

Modified Files:
        pkgsrc/net/torsocks: Makefile distinfo
Added Files:
        pkgsrc/net/torsocks/patches: patch-src_lib_torsocks.c
Removed Files:
        pkgsrc/net/torsocks/patches: patch-src_bin_torsocks.in

Log Message:
torsocks: Update net/torsocks to 2.3.0

pkgsrc changes:
 - Update MASTER_SITES to avoid MASTER_SITE_DEBIAN

Changes:
2018-11-19 torsocks 2.3.0
 * Fix a bunch of stuff in the wrapper script, #24967
 * gethostbyaddr_r: always assign result
 * log: Remove log line when logging is stopped
 * gethostbyaddr_r: Don't put garbage in data->hostname
 * gethostbyaddr_r: Populate h_addrtype field
 * log: Avoid crash or file corruption when closing logs
 * connect: Always pass .onion IP cookie to connection object
 * Merge remote-tracking branch 'yawning/bug23715'
 * Make torsocks always connect to the configured Tor port
 * test: Make getpeername test connect to moria1
 * socks5: Always use ATYP 0x03 for CONNECT command
 * Merge remote-tracking branch 'upstream/master'
 * doc: Clarify the libc limitation in README
 * accept4: Initialize libc symbol early
 * Bug 23715: Support memfd_create(2).
 * test: Detect if tor is running in test_fd_passing
 * No tab in the README
 * Merge remote-tracking branch 'debian/bugfix/typo-subsytem'
 * Merge remote-tracking branch 'debian/bugfix/typo-catched'
 * Merge remote-tracking branch 'debian/bugfix/typo-conect'
 * doc: Add autogen.sh step to README
 * Add a -q/--quiet to torsocks
 * tests: Add a check for a running Tor
 * Make cpp conditional for definition of handle_mmap match use
 * utils: Add useful function for later use
 * man: Some words were missing
 * Remove clang warnings
 * Add missing quotes to variable in torsocks.in
 * Fix check_addr() to return either 0 or 1
 * Ignore stderr for getcap command
 * syscall: Add seccomp, gettimeofday, clock_gettime, fork
 * Fix typo: conect -> connect.
 * Fix typo: subsytem -> subsystem.
 * Fix typo: catched -> caught.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/torsocks/Makefile \
    pkgsrc/net/torsocks/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/net/torsocks/patches/patch-src_bin_torsocks.in
cvs rdiff -u -r0 -r1.1 pkgsrc/net/torsocks/patches/patch-src_lib_torsocks.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/torsocks/Makefile
diff -u pkgsrc/net/torsocks/Makefile:1.1 pkgsrc/net/torsocks/Makefile:1.2
--- pkgsrc/net/torsocks/Makefile:1.1    Mon Feb 26 13:19:55 2018
+++ pkgsrc/net/torsocks/Makefile        Tue Nov 20 23:42:59 2018
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/02/26 13:19:55 leot Exp $
+# $NetBSD: Makefile,v 1.2 2018/11/20 23:42:59 leot Exp $
 
-DISTNAME=      torsocks_2.2.0.orig
-PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
+DISTNAME=      torsocks-2.3.0
 CATEGORIES=    net
-MASTER_SITES=  ${MASTER_SITE_DEBIAN:=pool/main/t/torsocks/}
+MASTER_SITES=  https://people.torproject.org/~dgoulet/torsocks/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -11,8 +10,6 @@ HOMEPAGE=     https://gitweb.torproject.org/
 COMMENT=       Library to torify applications
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 
Index: pkgsrc/net/torsocks/distinfo
diff -u pkgsrc/net/torsocks/distinfo:1.1 pkgsrc/net/torsocks/distinfo:1.2
--- pkgsrc/net/torsocks/distinfo:1.1    Mon Feb 26 13:19:55 2018
+++ pkgsrc/net/torsocks/distinfo        Tue Nov 20 23:42:59 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2018/02/26 13:19:55 leot Exp $
+$NetBSD: distinfo,v 1.2 2018/11/20 23:42:59 leot Exp $
 
-SHA1 (torsocks_2.2.0.orig.tar.xz) = 53d8cb45b487571d39ab226e25cb538976a195a1
-RMD160 (torsocks_2.2.0.orig.tar.xz) = a16adc2120da9c846d4801ece60a43758a25f2e6
-SHA512 (torsocks_2.2.0.orig.tar.xz) = 89eb1263bfb0079ca5cb7fcc3a6fa1ecde1327df9ea98de48babfff1f8947b1e9db8407ead747fef0190671e7fff502025dcfcd9b6cba97abbaf25b5a575c62a
-Size (torsocks_2.2.0.orig.tar.xz) = 309916 bytes
-SHA1 (patch-src_bin_torsocks.in) = 724a4a3f1e72347907c887d4a00a9308beeb2803
+SHA1 (torsocks-2.3.0.tar.xz) = 18dcef8b7f0a9b63f9c7b5f8159d96ca122f1377
+RMD160 (torsocks-2.3.0.tar.xz) = f8ca8158424b0befd272a136cd3f97416dff76dd
+SHA512 (torsocks-2.3.0.tar.xz) = 4888caaffdcfebf3673e14f3491eae6aa84ca0a4a2a812ba7bdac2abb471307e89a3c5cffe7691fb6f190c7bd9ea455ee9a223d909a39152be8524f590be2031
+Size (torsocks-2.3.0.tar.xz) = 313072 bytes
+SHA1 (patch-src_lib_torsocks.c) = 18b7aa88c0d455a7a53e1d1db1ec19a7f1324290

Added files:

Index: pkgsrc/net/torsocks/patches/patch-src_lib_torsocks.c
diff -u /dev/null pkgsrc/net/torsocks/patches/patch-src_lib_torsocks.c:1.1
--- /dev/null   Tue Nov 20 23:42:59 2018
+++ pkgsrc/net/torsocks/patches/patch-src_lib_torsocks.c        Tue Nov 20 23:42:59 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_lib_torsocks.c,v 1.1 2018/11/20 23:42:59 leot Exp $
+
+LIBC_ACCEPT4_* is defined only on Linux.
+
+--- src/lib/torsocks.c.orig    2018-04-20 15:41:42.000000000 +0000
++++ src/lib/torsocks.c
+@@ -234,9 +234,15 @@ 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);
++#ifdef LIBC_ACCEPT4_NAME_STR
+       tsocks_libc_accept4 = dlsym(libc_ptr, LIBC_ACCEPT4_NAME_STR);
++#endif
+       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
++#ifdef LIBC_ACCEPT4_NAME_STR
++                      || !tsocks_libc_accept4
++#endif
++                      ) {
+               ERR("Unable to lookup symbols in " LIBC_NAME "(%s)", dlerror());
+               goto error;
+       }