New Upstream Snapshot - golang-h12-socks

Ready changes

Summary

Merged new upstream version: 1.0.3+git20221017.1.dbaf06c (was: 1.0.2).

Resulting package

Built on 2022-10-21T13:06 (took 2m25s)

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots golang-h12-socks-dev

Lintian Result

Diff

diff --git a/README.md b/README.md
index c6bef34..72a36ff 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,9 @@ SOCKS
 
 [![GoDoc](https://godoc.org/h12.io/socks?status.svg)](https://godoc.org/h12.io/socks)
 
-SOCKS is a SOCKS4, SOCKS4A and SOCKS5 proxy package for Go.
+A SOCKS is a SOCKS4, SOCKS4A and SOCKS5 proxy package for Go.
+
+The package provides `socks.Dial` which returns a TCP dialing function from a socks proxy connection string. The returned dialing function can then be used to establish a TCP connection via the socks proxy or be used to initialize `http.Transport` for an HTTP connection.
 
 ## Quick Start
 ### Get the package
@@ -14,7 +16,7 @@ SOCKS is a SOCKS4, SOCKS4A and SOCKS5 proxy package for Go.
 
     import "h12.io/socks"
 
-### Create a SOCKS proxy dialling function
+### Create a SOCKS proxy dialing function
 
     dialSocksProxy := socks.Dial("socks5://127.0.0.1:1080?timeout=5s")
     tr := &http.Transport{Dial: dialSocksProxy}
diff --git a/debian/changelog b/debian/changelog
index 3fb42d7..c6c23f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+golang-h12-socks (1.0.3+git20221017.1.dbaf06c-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Fri, 21 Oct 2022 13:05:21 -0000
+
 golang-h12-socks (1.0.2-1) unstable; urgency=medium
 
   * New upstream release 1.0.2
diff --git a/debian/patches/0001-Disable-usage-of-socks5.patch b/debian/patches/0001-Disable-usage-of-socks5.patch
index d971e74..e1f688e 100644
--- a/debian/patches/0001-Disable-usage-of-socks5.patch
+++ b/debian/patches/0001-Disable-usage-of-socks5.patch
@@ -9,10 +9,9 @@ The dependency is not in debian yet:
  1 file changed, 119 deletions(-)
  delete mode 100644 socks5_test.go
 
-diff --git a/socks5_test.go b/socks5_test.go
-deleted file mode 100644
-index a874db6..0000000
---- a/socks5_test.go
+Index: golang-h12-socks.git/socks5_test.go
+===================================================================
+--- golang-h12-socks.git.orig/socks5_test.go
 +++ /dev/null
 @@ -1,119 +0,0 @@
 -package socks
diff --git a/socks4.go b/socks4.go
index 45900de..b65683d 100644
--- a/socks4.go
+++ b/socks4.go
@@ -11,7 +11,7 @@ func (cfg *config) dialSocks4(targetAddr string) (_ net.Conn, err error) {
 	proxy := cfg.Host
 
 	// dial TCP
-	conn, err := net.Dial("tcp", proxy)
+	conn, err := net.DialTimeout("tcp", proxy, cfg.Timeout)
 	if err != nil {
 		return nil, err
 	}
diff --git a/socks5.go b/socks5.go
index 07467e4..695f89d 100644
--- a/socks5.go
+++ b/socks5.go
@@ -9,7 +9,7 @@ func (cfg *config) dialSocks5(targetAddr string) (_ net.Conn, err error) {
 	proxy := cfg.Host
 
 	// dial TCP
-	conn, err := net.Dial("tcp", proxy)
+	conn, err := net.DialTimeout("tcp", proxy, cfg.Timeout)
 	if err != nil {
 		return nil, err
 	}

Debdiff

File lists identical (after any substitutions)

No differences were encountered in the control files

More details

Full run details