Merge ~athos-ribeiro/ubuntu/+source/unbound:merge-lp1971332-kinetic into ubuntu/+source/unbound:debian/sid

[Athos Ribeiro]

This is a staged merge for unbound. It shows that this can be a sync instead.

As shown in the changelog, the current delta can be dropped for the following reasons:

- DNS-over-HTTPS support has been included since Debian's 1.15.0-2
- Compatibility with OpenSSL 3 is provided upstream since 1.13.2
- Python 3.10 compatibility issues have been fixed upstream since 1.13.2

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp1971332-merge-unbound-kinetic/+packages

While the DEP8 tests for this package have a "needs-internet" restriction and will not be able to run in our infrastructure, there are unrelated errors regarding permissions to read or write the temporary configuration and pid files generated for the tests.

Although this should be fixed, we can still sync the package and propose the fix to Debian to avoid carrying a delta for the sole purpose of fixing a DEP8 test that cannot run in our infra.

The fix would be to either disable (or edit) the apparmor profile before running the test, or to create the configuration and pid files under directories allowed by the apparmor profile.

[Christian Ehrhardt  (paelzer)]

Thank,
I agree to propose autpkgtest fixes to Debian directly and make this a sync as-is.
There are a lot of changes landing in Debian, with every month we hold this back it will be a bigger impact when we finally sync - so let us do it now.

Synce, please track migration

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, athos-ribeiro
Uploaders: paelzer
MP auto-approved

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 80e1236..f12c444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+unbound (1.16.0-2ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian unstable (LP: #1971332). Remaining changes:
+  * Dropped Changes:
+    - Enable DNS-over-HTTPS support:
+      + d/control: add Build-Depends on libnghttp2-dev.
+      + d/rules: compile with libnghttp2.
+      [ Included in 1.15.0-2 ]
+    - debian/patches/openssl3.patch: compatibility with OpenSSL 3.
+      [ Fixed upstream in 1.13.2 ]
+    - Cherry-pick upstream commits for Python 3.10 compatibility.
+      [ Fixed upstream in 1.13.2 ]
+
+ -- Athos Ribeiro <[e-mail]>  Wed, 06 Jul 2022 16:46:39 -0300
+
 unbound (1.16.0-2) unstable; urgency=medium
 
   * revert the python path change in previous upload, and set python
@@ -244,6 +259,38 @@ unbound (1.13.1-1.1) unstable; urgency=medium
 
  -- Sebastian Ramacher <[e-mail]>  Wed, 06 Apr 2022 21:37:02 +0200
 
+unbound (1.13.1-1ubuntu5) jammy; urgency=medium
+
+  * Cherry-pick upstream commits for Python 3.10 compatibility
+
+ -- Rico Tzschichholz <[e-mail]>  Tue, 01 Feb 2022 15:23:57 +0100
+
+unbound (1.13.1-1ubuntu4) jammy; urgency=medium
+
+  * No-change rebuild with Python 3.10 as default version
+
+ -- Graham Inggs <[e-mail]>  Thu, 13 Jan 2022 20:38:08 +0000
+
+unbound (1.13.1-1ubuntu3) jammy; urgency=medium
+
+  * debian/patches/openssl3.patch: compatibility with OpenSSL 3.
+
+ -- Steve Langasek <[e-mail]>  Thu, 09 Dec 2021 20:51:29 +0000
+
+unbound (1.13.1-1ubuntu2) jammy; urgency=medium
+
+  * No-change rebuild against libssl3
+
+ -- Steve Langasek <[e-mail]>  Thu, 09 Dec 2021 00:22:14 +0000
+
+unbound (1.13.1-1ubuntu1) impish; urgency=medium
+
+  * Enable DNS-over-HTTPS support (LP: #1927877)
+    - d/control: add Build-Depends on libnghttp2-dev
+    - d/rules: compile with libnghttp2
+
+ -- Athos Ribeiro <[e-mail]>  Thu, 01 Jul 2021 11:16:26 -0300
+
 unbound (1.13.1-1) unstable; urgency=medium
 
   * New upstream version 1.13.1
diff --git a/debian/control b/debian/control
index 3cb5ddb..3486aa1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: unbound
 Section: net
 Priority: optional
-Maintainer: unbound packagers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: unbound packagers <[e-mail]>
 Uploaders:
  Robert Edmonds <[e-mail]>,
  Michael Tokarev <[e-mail]>,