From nilesh at debian.org  Mon Oct  6 18:52:53 2025
From: nilesh at debian.org (Nilesh Patra (@nilesh))
Date: Mon, 06 Oct 2025 17:52:53 -0000
Subject: [Pkg-privacy-commits] [Git][pkg-privacy-team/snowflake][debian/sid]
 3 commits: Update and add new Build-Depends
Message-ID: <68e401f2eb60a_3a02b47b4451815429db@godard.mail>



Nilesh Patra pushed to branch debian/sid at Privacy Maintainers / snowflake


Commits:
7f715fcc by Nilesh Patra at 2025-10-06T22:05:19+05:30
Update and add new Build-Depends

- - - - -
d3b8e269 by Nilesh Patra at 2025-10-06T22:05:50+05:30
symlink new golang-snowflake-dev to older path

- - - - -
40551b4e by Nilesh Patra at 2025-10-06T23:22:25+05:30
[ci skip] Add patch to fixup some tests

- - - - -


4 changed files:

- debian/control
- + debian/golang-snowflake-dev.links
- + debian/patches/0002-fixup-test-compareing-slices.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -14,6 +14,9 @@ Build-Depends: debhelper-compat (= 13),
                golang-github-miekg-dns-dev,
                golang-github-prometheus-client-golang-dev,
                golang-github-prometheus-client-model-dev,
+               golang-github-realclientip-realclientip-go-dev,
+               golang-github-pion-stun-v3-dev,
+               golang-github-txthinking-socks5-dev,
                golang-github-smartystreets-goconvey-dev,
                golang-github-stretchr-testify-dev,
                golang-github-xtaci-kcp-dev,
@@ -65,6 +68,9 @@ Depends: golang-github-google-uuid-dev,
          golang-github-prometheus-client-golang-dev,
          golang-github-prometheus-client-model-dev,
          golang-github-smartystreets-goconvey-dev,
+         golang-github-realclientip-realclientip-go-dev,
+         golang-github-pion-stun-v3-dev,
+         golang-github-txthinking-socks5-dev,
          golang-github-xtaci-kcp-dev,
          golang-github-xtaci-smux-dev,
          golang-golang-x-crypto-dev,


=====================================
debian/golang-snowflake-dev.links
=====================================
@@ -0,0 +1 @@
+usr/share/gocode/src/gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snowflake/v2 usr/share/gocode/src/git.torproject.org/pluggable-transports/snowflake.git


=====================================
debian/patches/0002-fixup-test-compareing-slices.patch
=====================================
@@ -0,0 +1,45 @@
+Description: goconvey does not work with ShouldEqual in slices
+ This is mentioned in https://github.com/smartystreets/goconvey/issues/128#issuecomment-33227844 along
+ with a hint to instead use `ShouldResemble`
+Author: Nilesh Patra <nilesh at debian.org>
+Last-Update: 2025-10-06
+--- a/client/lib/rendezvous_test.go
++++ b/client/lib/rendezvous_test.go
+@@ -83,7 +83,7 @@
+ 			So(err, ShouldBeNil)
+ 			So(rend.brokerURL, ShouldNotBeNil)
+ 			So(rend.brokerURL.Host, ShouldResemble, "test.broker")
+-			So(rend.fronts, ShouldEqual, []string{})
++			So(rend.fronts, ShouldResemble, []string{})
+ 			So(rend.transport, ShouldEqual, transport)
+ 		})
+ 
+@@ -334,7 +334,7 @@
+ 
+ 			answer, err := sqsRendezvous.Exchange(fakeEncPollResp)
+ 
+-			So(answer, ShouldEqual, []byte("answer"))
++			So(answer, ShouldResemble, []byte("answer"))
+ 			So(err, ShouldBeNil)
+ 		})
+ 
+@@ -384,7 +384,7 @@
+ 
+ 			answer, err := sqsRendezvous.Exchange(fakeEncPollResp)
+ 
+-			So(answer, ShouldEqual, []byte{})
++			So(answer, ShouldResemble, []byte{})
+ 			So(err, ShouldBeNil)
+ 		})
+ 	})
+--- a/common/util/util_test.go
++++ b/common/util/util_test.go
+@@ -64,7 +64,7 @@
+ 			"a=candidate:3769337065 1 udp 2122260223 129.97.124.15 56688 typ host\r\n" +
+ 			"a=candidate:3769337065 1 udp 2122260224 129.97.124.16 56688 typ host\r\n" + offerEnd
+ 
+-		So(GetCandidateAddrs(sdp), ShouldEqual, []net.IP{
++		So(GetCandidateAddrs(sdp), ShouldResemble, []net.IP{
+ 			net.ParseIP("129.97.124.16"),
+ 			net.ParseIP("129.97.124.15"),
+ 			net.ParseIP("8.8.8.8"),


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 0001-Adapt-tests-to-work-with-devian-version-of-goconvey.patch
+0002-fixup-test-compareing-slices.patch



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/snowflake/-/compare/e594bcde56436ac9dc9cc3aeb96eefdbfe4945a0...40551b4eae85ddf82741ba8346719aad0bbd465f

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/snowflake/-/compare/e594bcde56436ac9dc9cc3aeb96eefdbfe4945a0...40551b4eae85ddf82741ba8346719aad0bbd465f
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20251006/66ec8385/attachment-0001.htm>

From nilesh at debian.org  Mon Oct  6 20:29:42 2025
From: nilesh at debian.org (Nilesh Patra (@nilesh))
Date: Mon, 06 Oct 2025 19:29:42 -0000
Subject: [Pkg-privacy-commits] [Git][pkg-privacy-team/snowflake][debian/sid]
 3 commits: Update patch
Message-ID: <68e418a28c4ba_3a02b48ac730015704e1@godard.mail>



Nilesh Patra pushed to branch debian/sid at Privacy Maintainers / snowflake


Commits:
8503a720 by Nilesh Patra at 2025-10-07T00:33:05+05:30
Update patch

- - - - -
a35b058a by Nilesh Patra at 2025-10-07T00:33:05+05:30
Update 0001-Adapt-tests-to-work-with-devian-version-of-goconvey.patch in accordance with new tests

- - - - -
32fb64a1 by Nilesh Patra at 2025-10-07T00:55:47+05:30
[ci skip] Tighten B-D on webrtc.v3

- - - - -


3 changed files:

- debian/control
- debian/patches/0001-Adapt-tests-to-work-with-devian-version-of-goconvey.patch
- debian/patches/0002-fixup-test-compareing-slices.patch


Changes:

=====================================
debian/control
=====================================
@@ -27,7 +27,7 @@ Build-Depends: debhelper-compat (= 13),
                golang-goptlib-dev (>= 1.2.0),
                golang-refraction-networking-utls-dev,
                golang-ptutil-dev,
-               golang-github-pion-webrtc.v3-dev (>= 3.1.56-1~)
+               golang-github-pion-webrtc.v3-dev (>= 3.1.56-4~)
 Standards-Version: 4.6.2
 Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/snowflake
 Vcs-Git: https://salsa.debian.org/pkg-privacy-team/snowflake.git
@@ -78,7 +78,7 @@ Depends: golang-github-google-uuid-dev,
          golang-google-protobuf-dev,
          golang-goptlib-dev (>= 1.2.0),
          golang-refraction-networking-utls-dev,
-         golang-github-pion-webrtc.v3-dev (>= 3.1.56-1~),
+         golang-github-pion-webrtc.v3-dev (>= 3.1.56-4~),
          ${misc:Depends},
 Description: WebRTC pluggable transport for Tor (library)
  Snowflake helps users circumvent censorship by making a WebRTC


=====================================
debian/patches/0001-Adapt-tests-to-work-with-devian-version-of-goconvey.patch
=====================================
@@ -7,11 +7,18 @@ Subject: Adapt tests to work with devian version of goconvey
  client/lib/lib_test.go | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/client/lib/lib_test.go b/client/lib/lib_test.go
-index 6140e0b..5d8a750 100644
 --- a/client/lib/lib_test.go
 +++ b/client/lib/lib_test.go
-@@ -289,7 +289,8 @@ func TestICEServerParser(t *testing.T) {
+@@ -190,7 +190,7 @@
+ 			length int
+ 		}{
+ 			{
+-				[]string{"stun:stun.l.google.com:19302", "stun:stun.ekiga.net"},
++				[]string{"stun:stun.l.google.com:19302", "stun:stun.ekiga.net:3478"},
+ 				[][]string{[]string{"stun:stun.l.google.com:19302"}, []string{"stun:stun.ekiga.net:3478"}},
+ 				2,
+ 			},
+@@ -212,7 +212,8 @@
  			So(len(servers), ShouldEqual, test.length)
  
  			for _, server := range servers {


=====================================
debian/patches/0002-fixup-test-compareing-slices.patch
=====================================
@@ -23,6 +23,15 @@ Last-Update: 2025-10-06
  			So(err, ShouldBeNil)
  		})
  
+@@ -356,7 +356,7 @@
+ 
+ 			So(answer, ShouldBeNil)
+ 			So(err, ShouldNotBeNil)
+-			So(err, ShouldEqual, errors.New("test error"))
++			So(err, ShouldResemble, errors.New("test error"))
+ 		})
+ 
+ 		Convey("sqsRendezvous.Exchange does not receive answer", func() {
 @@ -384,7 +384,7 @@
  
  			answer, err := sqsRendezvous.Exchange(fakeEncPollResp)
@@ -32,6 +41,23 @@ Last-Update: 2025-10-06
  			So(err, ShouldBeNil)
  		})
  	})
+@@ -425,7 +425,7 @@
+ 
+ 		answerSdpReturned, err := brokerChannel.Negotiate(offerSdp)
+ 		So(err, ShouldBeNil)
+-		So(answerSdpReturned, ShouldEqual, answerSdp)
++		So(answerSdpReturned, ShouldResemble, answerSdp)
+ 
+ 		body := <-requestBodyChan
+ 		pollReq, err := messages.DecodeClientPollRequest(body)
+@@ -434,6 +434,6 @@
+ 		So(pollReq.NAT, ShouldEqual, nat.NATRestricted)
+ 		requestSdp, err := util.DeserializeSessionDescription(pollReq.Offer)
+ 		So(err, ShouldBeNil)
+-		So(requestSdp, ShouldEqual, offerSdp)
++		So(requestSdp, ShouldResemble, offerSdp)
+ 	})
+ }
 --- a/common/util/util_test.go
 +++ b/common/util/util_test.go
 @@ -64,7 +64,7 @@



View it on GitLab: https://salsa.debian.org/pkg-privacy-team/snowflake/-/compare/40551b4eae85ddf82741ba8346719aad0bbd465f...32fb64a1876d6ae08ea5af93e3346cd9b9bf8438

-- 
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/snowflake/-/compare/40551b4eae85ddf82741ba8346719aad0bbd465f...32fb64a1876d6ae08ea5af93e3346cd9b9bf8438
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20251006/565ea979/attachment-0001.htm>