[Pkg-privacy-commits] [Git][pkg-privacy-team/obfs4proxy][master] 7 commits: Standards-Version 4.7.0.
Simon Josefsson (@jas)
gitlab at salsa.debian.org
Wed Dec 11 07:54:36 GMT 2024
Simon Josefsson pushed to branch master at Privacy Maintainers / obfs4proxy
Commits:
33403f18 by Simon Josefsson at 2024-12-11T08:22:12+01:00
Standards-Version 4.7.0.
- - - - -
10b91578 by Simon Josefsson at 2024-12-11T08:23:11+01:00
Silence lintian update-debian-copyright.
- - - - -
61914aa3 by Simon Josefsson at 2024-12-11T08:24:58+01:00
Mention forward URL for remove_git.diff.
- - - - -
904499fc by Simon Josefsson at 2024-12-11T08:28:13+01:00
Drop lunar from Uploaders. Closes: #1087257.
- - - - -
ae693559 by Simon Josefsson at 2024-12-11T08:28:34+01:00
Run wrap-and-sort -satbk.
- - - - -
647285fd by Simon Josefsson at 2024-12-11T08:39:51+01:00
Fix goptlib>1.6.0 namespace (remove_git.diff).
- - - - -
425476c3 by Simon Josefsson at 2024-12-11T08:40:59+01:00
Update changelog for 0.0.14-2 release
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/patches/remove_git.diff
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,21 @@
+obfs4proxy (0.0.14-2) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Debian Janitor ]
+ * Remove constraints unnecessary since buster (oldstable)
+
+ [ Simon Josefsson ]
+ * Drop no longer used Build-Depends on golang-ed25519-dev.
+ * Standards-Version 4.7.0.
+ * Silence lintian update-debian-copyright.
+ * Mention forward URL for remove_git.diff.
+ * Drop lunar from Uploaders. Closes: #1087257.
+ * Run wrap-and-sort -satbk.
+ * Fix goptlib>1.6.0 namespace (remove_git.diff).
+
+ -- Simon Josefsson <simon at josefsson.org> Wed, 11 Dec 2024 08:40:57 +0100
+
obfs4proxy (0.0.14-1) unstable; urgency=high
[ Micah Anderson ]
=====================================
debian/control
=====================================
@@ -1,24 +1,23 @@
Source: obfs4proxy
Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
Uploaders:
- Jérémy Bobbio <lunar at debian.org>,
Ximin Luo <infinity0 at debian.org>,
Ana Custura <ana at netstat.org.uk>,
Micah Anderson <micah at debian.org>,
- Ruben Pollan <meskio at sindominio.net>
+ Ruben Pollan <meskio at sindominio.net>,
Section: net
Priority: optional
Build-Depends:
debhelper-compat (= 13),
dh-golang,
+ golang-filippo-edwards25519-dev (>= 1.0.0~rc1+git20210721),
+ golang-gitlab-yawning-edwards25519-extra-dev,
golang-go,
golang-golang-x-crypto-dev,
golang-golang-x-net-dev,
- golang-goptlib-dev,
+ golang-goptlib-dev (>> 1.6.0-1~),
golang-siphash-dev,
- golang-gitlab-yawning-edwards25519-extra-dev,
- golang-filippo-edwards25519-dev (>= 1.0.0~rc1+git20210721)
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Vcs-Git: https://salsa.debian.org/pkg-privacy-team/obfs4proxy.git
Vcs-Browser: https://salsa.debian.org/pkg-privacy-team/obfs4proxy
XS-Go-Import-Path: gitlab.com/yawning/obfs4.git
=====================================
debian/copyright
=====================================
@@ -60,6 +60,7 @@ License: BSD-3-clause
Files: debian/*
Copyright: © 2014 Jérémy Bobbio <lunar at debian.org>
+ 2024 Simon Josefsson <simon at josefsson.org>
License: permissive
Copying and distribution of this package, with or without
modification, are permitted in any medium without royalty
=====================================
debian/patches/remove_git.diff
=====================================
@@ -2,6 +2,7 @@ Description: Remove .git suffix from imports
The package install path does not include the .git suffix,
and so to preserve imports this needs to be removed.
Author: Ana Custura <ana at netstat.org.uk>
+Forwarded: https://gitlab.com/yawning/obfs4/-/commit/19f5a37fe427b40b2d201ad2d1b4be8b8b1a3094
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/common/ntor/ntor_test.go
@@ -26,3 +27,185 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
// The corrected version of this that solves the implementation errors
+diff --git a/common/socks5/args.go b/common/socks5/args.go
+index a5efb43..3b398d3 100644
+--- a/common/socks5/args.go
++++ b/common/socks5/args.go
+@@ -29,7 +29,7 @@ package socks5
+
+ import (
+ "fmt"
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ )
+
+ // parseClientParameters takes a client parameter string formatted according to
+diff --git a/common/socks5/args_test.go b/common/socks5/args_test.go
+index d9d3f22..8683e8c 100644
+--- a/common/socks5/args_test.go
++++ b/common/socks5/args_test.go
+@@ -5,7 +5,7 @@ package socks5
+ import (
+ "testing"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ )
+
+ func stringSlicesEqual(a, b []string) bool {
+diff --git a/common/socks5/socks5.go b/common/socks5/socks5.go
+index 7630d3d..a619256 100644
+--- a/common/socks5/socks5.go
++++ b/common/socks5/socks5.go
+@@ -46,7 +46,7 @@ import (
+ "syscall"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ )
+
+ const (
+diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
+index f295926..3fca9a0 100644
+--- a/obfs4proxy/obfs4proxy.go
++++ b/obfs4proxy/obfs4proxy.go
+@@ -41,7 +41,7 @@ import (
+ "sync"
+ "syscall"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/log"
+ "gitlab.com/yawning/obfs4.git/common/socks5"
+ "gitlab.com/yawning/obfs4.git/transports"
+diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go
+index 18bc2df..6c2cca5 100644
+--- a/obfs4proxy/pt_extras.go
++++ b/obfs4proxy/pt_extras.go
+@@ -35,7 +35,7 @@ import (
+ "os"
+ "strconv"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ )
+
+ // This file contains things that probably should be in goptlib but are not
+diff --git a/transports/base/base.go b/transports/base/base.go
+index bc6e025..0c37d05 100644
+--- a/transports/base/base.go
++++ b/transports/base/base.go
+@@ -32,7 +32,7 @@ package base // import "gitlab.com/yawning/obfs4.git/transports/base"
+ import (
+ "net"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ )
+
+ type DialFunc func(string, string) (net.Conn, error)
+diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go
+index e9d8ca1..0f21509 100644
+--- a/transports/meeklite/base.go
++++ b/transports/meeklite/base.go
+@@ -36,7 +36,7 @@ import (
+ "fmt"
+ "net"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/transports/base"
+ )
+
+diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
+index 17c7a67..36e8ec1 100644
+--- a/transports/meeklite/meek.go
++++ b/transports/meeklite/meek.go
+@@ -44,7 +44,7 @@ import (
+ "sync"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/transports/base"
+ )
+
+diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
+index 531bcd4..cc07a37 100644
+--- a/transports/obfs2/obfs2.go
++++ b/transports/obfs2/obfs2.go
+@@ -40,7 +40,7 @@ import (
+ "net"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/csrand"
+ "gitlab.com/yawning/obfs4.git/transports/base"
+ )
+diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go
+index 42bdd90..aed5b09 100644
+--- a/transports/obfs3/obfs3.go
++++ b/transports/obfs3/obfs3.go
+@@ -40,7 +40,7 @@ import (
+ "net"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/csrand"
+ "gitlab.com/yawning/obfs4.git/common/uniformdh"
+ "gitlab.com/yawning/obfs4.git/transports/base"
+diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
+index 9723735..7503a9b 100644
+--- a/transports/obfs4/obfs4.go
++++ b/transports/obfs4/obfs4.go
+@@ -42,7 +42,7 @@ import (
+ "syscall"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/drbg"
+ "gitlab.com/yawning/obfs4.git/common/ntor"
+ "gitlab.com/yawning/obfs4.git/common/probdist"
+diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go
+index cbf1d6e..8ebab9a 100644
+--- a/transports/obfs4/statefile.go
++++ b/transports/obfs4/statefile.go
+@@ -37,7 +37,7 @@ import (
+ "strconv"
+ "strings"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/csrand"
+ "gitlab.com/yawning/obfs4.git/common/drbg"
+ "gitlab.com/yawning/obfs4.git/common/ntor"
+diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go
+index 655ad7a..0462452 100644
+--- a/transports/scramblesuit/base.go
++++ b/transports/scramblesuit/base.go
+@@ -33,7 +33,7 @@ import (
+ "fmt"
+ "net"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/transports/base"
+ )
+
+diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go
+index cc18e18..22a79ab 100644
+--- a/transports/scramblesuit/conn.go
++++ b/transports/scramblesuit/conn.go
+@@ -42,7 +42,7 @@ import (
+ "net"
+ "time"
+
+- "git.torproject.org/pluggable-transports/goptlib.git"
++ "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/goptlib"
+ "gitlab.com/yawning/obfs4.git/common/csrand"
+ "gitlab.com/yawning/obfs4.git/common/drbg"
+ "gitlab.com/yawning/obfs4.git/common/probdist"
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/obfs4proxy/-/compare/1073f77ee3a48e341a68fd8f715d562e756a0e51...425476c3610bca91681a17c7ae06665c70253fc7
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/obfs4proxy/-/compare/1073f77ee3a48e341a68fd8f715d562e756a0e51...425476c3610bca91681a17c7ae06665c70253fc7
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/20241211/8654c4db/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list