<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/254840fbc94b00dc2767f11885935ce667b76cb1">https://github.com/macports/macports-ports/commit/254840fbc94b00dc2767f11885935ce667b76cb1</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 254840fbc94 torsocks: Update to 2.4.0
</span>254840fbc94 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 254840fbc94b00dc2767f11885935ce667b76cb1
</span>Author: Ryan Carsten Schmidt <ryandesign@macports.org>
AuthorDate: Fri Aug 2 20:48:34 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> torsocks: Update to 2.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61631
</span>---
net/torsocks/Portfile | 30 +++++++++++++++++++-----------
net/torsocks/files/gethostbyaddr_r.patch | 20 ++++++++++++++++++++
net/torsocks/files/implicit.patch | 14 ++++++++++++++
net/torsocks/files/version.patch | 13 +++++++++++++
4 files changed, 66 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/torsocks/Portfile b/net/torsocks/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da8a5cc1e3d..f8842afa13b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/torsocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/torsocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,15 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup gitlab 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name torsocks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.instance https://gitlab.torproject.org/tpo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gitlab.setup core torsocks 2.4.0 v
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 667813c86c1309281aae37a11e12101e760cbc12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f428cacf231ca9d11706ad2c701effc2b5fb71e9bdbdce1bbe294e0679a6fb17 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 96854
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories net security
license GPL-2+
maintainers yopmail.com:sami.laine
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,27 +17,30 @@ maintainers yopmail.com:sami.laine
</span> description A transparent socks proxy for use with tor
long_description Torsocks is an application for Linux, BSD and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- OS X that allows you to use network applications \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macOS that allows you to use network applications \
</span> such as ssh and irssi with Tor. Torsocks allows you \
to use most socks-friendly applications in a safe \
way with Tor. It ensures that DNS requests are \
handled safely and explicitly rejects UDP traffic \
from the application you are using.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://git.torproject.org/torsocks.git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://people.torproject.org/~dgoulet/torsocks/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # See https://trac.torproject.org/projects/tor/ticket/28538
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# and https://gitlab.torproject.org/tpo/core/torsocks/-/issues/28538
</span> # This same patch is being used by the Homebrew torsocks formula
patchfiles 0001-Fix-macros-for-accept4-2.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f8ca8158424b0befd272a136cd3f97416dff76dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b9f1b981d6b3fd4e1820de1eee325f8a7038c84765d5a6cd9af12571d5cc3622 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 313072
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append implicit.patch gethostbyaddr_r.patch version.patch
</span>
depends_build path:libexec/coreutils/libstdbuf.so:coreutils
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure script in tarball.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./autogen.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:autoconf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:automake \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libtool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-silent-rules
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/torsocks/files/gethostbyaddr_r.patch b/net/torsocks/files/gethostbyaddr_r.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..309ee9130a2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/torsocks/files/gethostbyaddr_r.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'gethostbyaddr_r' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.torproject.org/tpo/core/torsocks/-/issues/40005#note_2720242
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Just declaring the function prototype like this without providing an
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+implementation should not work because macOS does not have this function,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+and yet the test suite passes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tests/test_dns.c.orig 2022-05-25 09:36:05.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tests/test_dns.c 2024-08-02 20:40:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,6 +26,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <tap/tap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int gethostbyaddr_r();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NUM_TESTS 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct test_host {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/torsocks/files/implicit.patch b/net/torsocks/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..70ecb3ce509
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/torsocks/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: implicit declaration of function 'conf_file_set_enable_ipv6' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.torproject.org/tpo/core/torsocks/-/commit/969d782ad3b560448325ff6e9aa29801d6276a3e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/common/config-file.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/common/config-file.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,6 +109,7 @@ int conf_file_set_allow_inbound(const char *val, struct configuration *config);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int conf_file_set_allow_outbound_localhost(const char *val, struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configuration *config);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int conf_file_set_isolate_pid(const char *val, struct configuration *config);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int conf_file_set_enable_ipv6(const char *val, struct configuration *config);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int conf_apply_socks_auth(struct configuration *config);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/torsocks/files/version.patch b/net/torsocks/files/version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..16d7a2ae101
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/torsocks/files/version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.torproject.org/tpo/core/torsocks/-/commit/47cf8b2caea0d9b42c1839eee9e09c92d1ce5f31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##############################################################################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Process this file with autoconf to produce a configure script.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_INIT([torsocks], [2.3.0],[dgoulet@torproject.org],[],[https://torproject.org])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_INIT([torsocks], [2.4.0],[dgoulet@torproject.org],[],[https://torproject.org])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CONFIG_AUX_DIR([config])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CANONICAL_TARGET
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Get hostname and other information.
</span></pre><pre style='margin:0'>
</pre>