Merge ~paride/ubuntu/+source/simplestreams:simplestreams-sru-lp1908452-focal into ubuntu/+source/simplestreams:ubuntu/focal-devel

[Paride Legovini]

[dann frazier (dannf)]

Code looks good to me - however we'll need to also uploads for hirsute and groovy so that an upgrade is not a regression. That means we'll probably need to use a different version string for focal. I'd suggest the following stringe for hirsute, groovy and focal - respectively:

0.1.0-30-g3cc8988a-0ubuntu1.21.04.1
0.1.0-30-g3cc8988a-0ubuntu1.20.10.1
0.1.0-30-g3cc8988a-0ubuntu1.20.04.1

or, alternatively, if you'd like to treat it like a backport:

0.1.0-30-g3cc8988a-0ubuntu1.1 (hirsute)
0.1.0-30-g3cc8988a-0ubuntu1.1~20.10.1 (groovy)
0.1.0-30-g3cc8988a-0ubuntu1.1~20.04.1 (focal)
In this case, I'd suggest keeping the hirsute changelog entry in both the groovy/focal changelogs, but adding a new "Backport to {groovy, focal}" entry on top for the backport targets.

review: Needs Fixing

[dann frazier (dannf)]

Uploaded, cheers!

review: Approve

[Christian Ehrhardt  (paelzer)]

 simplestreams | 0.1.0-30-g3cc8988a-0ubuntu1.21.04.1 | hirsute-updates/universe | all
 simplestreams | 0.1.0-30-g3cc8988a-0ubuntu1.20.10.1 | groovy-updates/universe | all
 simplestreams | 0.1.0-30-g3cc8988a-0ubuntu1.20.04.1 | focal-updates/universe | all

Those are copmplete, setting them to "merged"

diff --git a/debian/changelog b/debian/changelog
index a0a278e..fbef426 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+simplestreams (0.1.0-30-g3cc8988a-0ubuntu1.20.04.1) focal; urgency=medium
+
+  * Add 10s timeout to out-going requests to avoid blocking.
+    - Via: d/patches/0001-Add-10s-timeout-to-out-going-requests.patch
+      Upstream cherry-pick. Thanks: Adam Collard. (LP: #1908452)
+
+ -- Paride Legovini <[e-mail]>  Fri, 11 Jun 2021 16:51:14 +0200
+
 simplestreams (0.1.0-30-g3cc8988a-0ubuntu1) focal; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/0001-Add-10s-timeout-to-out-going-requests.patch b/debian/patches/0001-Add-10s-timeout-to-out-going-requests.patch
new file mode 100644
index 0000000..0bbb5fd
--- /dev/null
+++ b/debian/patches/0001-Add-10s-timeout-to-out-going-requests.patch
@@ -0,0 +1,46 @@
+From: Adam Collard <[e-mail]>
+Date: Tue, 2 Feb 2021 17:31:06 +0000
+Origin: upstream, https://git.launchpad.net/simplestreams/commit/?id=f37d2ed20bbe65f561cfad61fdaf32a7f376edaf
+Bug: https://bugs.launchpad.net/ubuntu/+source/simplestreams/+bug/1908452
+Subject: [PATCH] Add 10s timeout to out-going requests to avoid blocking.
+
+Fixes LP:1908452
+---
+ simplestreams/contentsource.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/simplestreams/contentsource.py b/simplestreams/contentsource.py
+index 40bf9d0..b54e898 100644
+--- a/simplestreams/contentsource.py
++++ b/simplestreams/contentsource.py
+@@ -32,6 +32,7 @@ else:
+     urllib_error = urllib_request
+ 
+ READ_BUFFER_SIZE = 1024 * 10
++TIMEOUT = 10
+ 
+ try:
+     # We try to use requests because we can do gzip encoding with it.
+@@ -338,7 +339,7 @@ class Urllib2UrlReader(UrlReader):
+                 req.add_header('User-Agent', user_agent)
+             if offset is not None:
+                 req.add_header('Range', 'bytes=%d-' % offset)
+-            self.req = opener(req)
++            self.req = opener(req, timeout=TIMEOUT)
+         except urllib_error.HTTPError as e:
+             if e.code == 404:
+                 myerr = IOError("Unable to open %s" % url)
+@@ -378,7 +379,9 @@ class RequestsUrlReader(UrlReader):
+         if headers == {}:
+             headers = None
+ 
+-        self.req = requests.get(url, stream=True, auth=auth, headers=headers)
++        self.req = requests.get(
++            url, stream=True, auth=auth, headers=headers, timeout=TIMEOUT
++        )
+         self.r_iter = None
+         if buflen is None:
+             buflen = READ_BUFFER_SIZE
+-- 
+2.31.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..eca0699
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-10s-timeout-to-out-going-requests.patch