Pier Angelo Vendrame pushed to branch maint-14.5 at The Tor Project / Applications / tor-browser-build Commits: a4bb31a5 by Nicolas Vigier at 2025-07-28T18:08:52+02:00 Bug 41515: Remove projects/conjure/conjure-pr-267.patch With the latest conjure update, github.com/refraction-networking/conjure version has been updated from v0.7.10 to v0.9.1. The patch conjure-pr-267.patch was included in v0.7.11 according to https://github.com/refraction-networking/conjure/issues/287. - - - - - 3 changed files: - projects/conjure/build - projects/conjure/config - − projects/conjure/conjure-pr-267.patch Changes: ===================================== projects/conjure/build ===================================== @@ -19,11 +19,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_ta cd /var/tmp/build/[% project %]-[% c('version') %] tar -xf $rootdir/[% c('input_files_by_name/go_vendor') %] -[% IF c("var/windows") -%] - pushd vendor/github.com/refraction-networking/conjure - patch -p1 < $rootdir/conjure-pr-267.patch - popd -[% END -%] cd client go build -ldflags '-s[% IF c("var/android") %] -checklinkname=0[% END %]' -tags 'protoreflect' ===================================== projects/conjure/config ===================================== @@ -22,9 +22,5 @@ steps: sha256sum: d43631d17d8b6f78152bb4341f867bb22ad4444fec5573be1d34dac968202cda target_replace: '^torbrowser-(?!testbuild).*': 'torbrowser-linux-x86_64' - # https://github.com/refraction-networking/conjure/pull/267 - # Remove this once the depdency is updated. - - filename: conjure-pr-267.patch - enable: '[% c("var/windows") %]' - name: go-licenses project: go-licenses ===================================== projects/conjure/conjure-pr-267.patch deleted ===================================== @@ -1,79 +0,0 @@ -From e5968e71e3ce40e24a5108d2dea7a9bc1d050559 Mon Sep 17 00:00:00 2001 -From: Rod Hynes <rod-hynes@users.noreply.github.com> -Date: Mon, 29 Jan 2024 13:34:44 -0500 -Subject: [PATCH] Fix Windows build - ---- - pkg/transports/connecting/dtls/nat.go | 5 ++--- - pkg/transports/connecting/dtls/setsockopt_other.go | 12 ++++++++++++ - pkg/transports/connecting/dtls/setsockopt_windows.go | 12 ++++++++++++ - 3 files changed, 26 insertions(+), 3 deletions(-) - create mode 100644 pkg/transports/connecting/dtls/setsockopt_other.go - create mode 100644 pkg/transports/connecting/dtls/setsockopt_windows.go - -diff --git a/pkg/transports/connecting/dtls/nat.go b/pkg/transports/connecting/dtls/nat.go -index 8860316b..ab3716b9 100644 ---- a/pkg/transports/connecting/dtls/nat.go -+++ b/pkg/transports/connecting/dtls/nat.go -@@ -5,7 +5,6 @@ import ( - "fmt" - "net" - "os" -- "syscall" - "time" - - "github.com/pion/stun" -@@ -58,7 +57,7 @@ func openUDPLimitTTL(ctx context.Context, laddr, addr string, dialer dialFunc) e - defer fd.Close() - - // Set the TTL -- err = syscall.SetsockoptInt(int(fd.Fd()), syscall.IPPROTO_IP, syscall.IP_TTL, ttl) -+ err = setSocketTTL(fd, ttl) - if err != nil { - return err - } -@@ -70,7 +69,7 @@ func openUDPLimitTTL(ctx context.Context, laddr, addr string, dialer dialFunc) e - } - - // reset TTL -- err = syscall.SetsockoptInt(int(fd.Fd()), syscall.IPPROTO_IP, syscall.IP_TTL, defaultTTL) -+ err = setSocketTTL(fd, defaultTTL) - if err != nil { - return err - } -diff --git a/pkg/transports/connecting/dtls/setsockopt_other.go b/pkg/transports/connecting/dtls/setsockopt_other.go -new file mode 100644 -index 00000000..eeba1ed6 ---- /dev/null -+++ b/pkg/transports/connecting/dtls/setsockopt_other.go -@@ -0,0 +1,12 @@ -+//go:build !windows -+ -+package dtls -+ -+import ( -+ "os" -+ "syscall" -+) -+ -+func setSocketTTL(f *os.File, ttl int) error { -+ return syscall.SetsockoptInt(int(f.Fd()), syscall.IPPROTO_IP, syscall.IP_TTL, ttl) -+} -diff --git a/pkg/transports/connecting/dtls/setsockopt_windows.go b/pkg/transports/connecting/dtls/setsockopt_windows.go -new file mode 100644 -index 00000000..6ab835ea ---- /dev/null -+++ b/pkg/transports/connecting/dtls/setsockopt_windows.go -@@ -0,0 +1,12 @@ -+//go:build windows -+ -+package dtls -+ -+import ( -+ "os" -+ "syscall" -+) -+ -+func setSocketTTL(f *os.File, ttl int) error { -+ return syscall.SetsockoptInt(syscall.Handle(f.Fd()), syscall.IPPROTO_IP, syscall.IP_TTL, ttl) -+} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a4... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a4... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (＠pierov)