Merge ~michal-maloszewski99/ubuntu/+source/simplestreams:lp-2013081-gpg-keys-jammyr into ubuntu/+source/simplestreams:ubuntu/jammy-devel

[Michał Małoszewski]

PPA: https://launchpad.net/~michal-maloszewski99/+archive/ubuntu/lp-2013-jammy-gpg-keys-build-fail-ppa

[Michał Małoszewski (michal-maloszewski99)]

No autopkgtests there

[Michał Małoszewski (michal-maloszewski99)]

Made a mistake but quickly changed into ..0ubuntu1.1 (changelog).
The PPA was based on ubuntu2.1 but anyway it was the higher version and it worked.

[Lucas Kanashiro (lucaskanashiro)]

I think it is a good idea in general to also add a review slot for canonical-server.

I added an inline comment regarding your changelog entry, same for your commit message. It also applies to the MPs targeting the other releases.

Regarding the SRU bug description, the error message you added to Test Plan is kind of useless:

dpkg-buildpackage: error: debian/rules build subprocess returned exit status 2

This is a generic error, it does not show what is the real issue. Please fix that.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

We have switched to canonical-server-reporter as the review slot quite a while ago.
That was to avoid being auto-consumed whenever we do a vote.
IMHO - no need to add canonical-server slot.

Everything else is right and Michal will clean it up for you to reconsider and sponsor.

[Lucas Kanashiro (lucaskanashiro)]

I know we moved to canonical-server-reporter for that reason, but I still like to receive emails about updates and canonical-server-reporter does not provide that AFAIK. Anyway, not mandatory but still useful IMHO. I usually add slots for both.

[Michał Małoszewski (michal-maloszewski99)]

Made single changes on each branch and it's ready to be re-reviewed (and sponsored if applicable).

[Lucas Kanashiro (lucaskanashiro)]

I small comment regarding the changelog. Just a nitpick, I wouldn't add the LP bug reference to the changelog commit, you usually add the bug reference to the commit fixing it, and in this case it is the previous one.

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

Thanks for a comment. Fixed on all branches.

[Lucas Kanashiro (lucaskanashiro)]

Thanks! The package changes LGTM now. I have a comment about your Test Plan in the bug description, if I blindly follow the steps there the package will not build because there will be no upstream tarball in the parent directory, could you update that? You could use pull-lp-source for that and not use git-ubuntu for instance.

review: Needs Fixing

[Michał Małoszewski (michal-maloszewski99)]

Thanks for the hint! Changes applied, can be re-considered.

[Lucas Kanashiro (lucaskanashiro)]

Thanks for updating it Michal. It is a bit more than what I was expecting but I think it works :) I'll be sponsoring the uploads.

review: Approve

[Michał Małoszewski (michal-maloszewski99)]

Thank you :)

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

Approvers: lucaskanashiro, michal-maloszewski99
Uploaders: lucaskanashiro
MP auto-approved

review: Approve

[Lucas Kanashiro (lucaskanashiro)]

Package uploaded:

Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1.dsc
Uploading simplestreams_0.1.0-48-gb936edd4.orig.tar.gz
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1.debian.tar.xz
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1_source.buildinfo
Uploading simplestreams_0.1.0-48-gb936edd4-0ubuntu1.1_source.changes

diff --git a/debian/changelog b/debian/changelog
index 7963d90..8677d59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+simplestreams (0.1.0-48-gb936edd4-0ubuntu1.1) jammy; urgency=medium
+
+  * d/p/lp2013081-build-fails-gpg-key-expired-jammy.patch: dh_auto_test
+    failed. The test gpg key expired. The patch is to replace the
+    expired gpg key with a new one to get rid of that problem.
+    (LP: #2013081)
+
+ -- Michal Maloszewski <[e-mail]>  Wed, 24 May 2023 10:32:43 +0200
+
 simplestreams (0.1.0-48-gb936edd4-0ubuntu1) jammy; urgency=medium
 
   * New upstream snapshot.
diff --git a/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch b/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch
new file mode 100644
index 0000000..ff88098
--- /dev/null
+++ b/debian/patches/lp2013081-build-fails-gpg-key-expired-jammy.patch
@@ -0,0 +1,82 @@
+From 68414193c3fe27538cec757bafbfe3ce83f0ce80 Mon Sep 17 00:00:00 2001
+From: Dominik <[e-mail]>
+Date: Tue, 28 Mar 2023 17:47:46 +0300
+Subject: [PATCH] test: rotate example gpg keys
+
+Origin: upstream, https://git.launchpad.net/simplestreams/commit/?id=68414193c3fe27538cec757bafbfe3ce83f0ce80
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/simplestreams/+bug/2013081
+Last-Update: 2023-05-24
+---
+ examples/keys/example.pub | 20 ++++++++++----------
+ examples/keys/example.sec | 36 ++++++++++++++++++------------------
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+--- a/examples/keys/example.pub
++++ b/examples/keys/example.pub
+@@ -1,14 +1,14 @@
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+-Version: GnuPG v1.4.11 (GNU/Linux)
+ 
+-mI0EUSw66gEEAM6AjeB/KtvuLbkbn6F0Whew2sYx5O2j2smSgwJ0oevnlRzneyXh
+-kUIR+wH5KBDIz5Ikp35ZrZFYoP++7VMALDTp9l+OOlrbz4rQzwI8HvXumkhT+BgE
+-lfN10eu0rBkVNxqt9lXuMNYwgJJtfBPzXVBQju6QDYx5Uodxk9C9TXapABEBAAG0
++mI0EZCL9pgEEALjMscvUXnyoFeP9McF+0yW4SFQsl8WwpXosSae3DSInIJSoEOG7
++HBewSS3dOK0lHIYnDZLtA0kSuC/a43mzgRLnY2paGKRL/cC/M2z66Dib83kZgOG8
++phVZH2HEMJxhb9XLibfTeIUvSgYLSnE4a00xLmlUjI11mCk36RYh4xhhABEBAAG0
+ XFNpbXBsZSBTdHJlYW1zIFRlc3QgVXNlciAoVGVzdCBVc2FnZSBPbmx5LiBEbyBO
+-b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iL4E
+-EwECACgFAlEsOuoCGy8FCRLMAwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ
+-EKlxSiA5Z1NuK0ID/R8iBwVt/9tqFy7eeJzCDK0O7QcpmhvKyjPLLmsUhysx8kC7
+-S89yuWyr6iQcjAoAMK6EkOZgRoFfOIA+hZkFC0blFHLCrdSghSQQm6hL/XJuWtkf
+-HBdu7yKudGzGyYmpGYYG69zz+he5EZUtY1fR9PSGSM+ZwCLznHdCJix7bNi0
+-=HEJL
++b3QgSW1wb3J0LikgPHNpbXBsZXN0cmVhbXNAYm9ndXMuZXhhbXBsZS5jb20+iM4E
++EwEKADgWIQQkk5C2cpQTdyB9ZpY4cK3qoW5CfAUCZCL9pgIbLwULCQgHAgYVCgkI
++CwIEFgIDAQIeAQIXgAAKCRA4cK3qoW5CfP9KBACxeVNSRzLHOLvthMxvqoqB/775
++AmJOPH2OiEfQOAr9C04zcW4FseBDXTS+6vydk5WsG3M7QA7p+zPiKy1atXhUOHY1
++VySd2AAB0u2RWUAWgg2DaQfbzfuxztqGBqlxPsGXgpobvumXf2pNehoBH9J9T4W4
++8NH75blul5zZaFvkmA==
++=C/S4
+ -----END PGP PUBLIC KEY BLOCK-----
+--- a/examples/keys/example.sec
++++ b/examples/keys/example.sec
+@@ -1,21 +1,21 @@
+ -----BEGIN PGP PRIVATE KEY BLOCK-----
+-Version: GnuPG v1.4.11 (GNU/Linux)
+ 
+-lQHXBFEsOuoBBADOgI3gfyrb7i25G5+hdFoXsNrGMeTto9rJkoMCdKHr55Uc53sl
+-4ZFCEfsB+SgQyM+SJKd+Wa2RWKD/vu1TACw06fZfjjpa28+K0M8CPB717ppIU/gY
+-BJXzddHrtKwZFTcarfZV7jDWMICSbXwT811QUI7ukA2MeVKHcZPQvU12qQARAQAB
+-AAP2KSNzIEY1Q5svgLEAHCoRyKZy7wkBklYSQBXwA404tMZt7lQvNFy7k24Bk2MP
+-mEhpEbQ7qfAzo8EEUe63WNGv/H6yl37pcS2rKxGdar9/dFV2t/TbJaehKotIvG9D
+-x1CvuT/7DQRj9rGWrDrhx2XIz8hpD21bxrDb2TEF5WjfAQIA05tN+7zxTXSKq7Wt
+-215ba4kBhKKuvrYMN5m871O/cNJfVh9ABea4xRFOOTkcpXsHAl1JPV52wRlHpBoe
+-b36goQIA+dMapApF9zYflJ5rp3RLCwH0YwmY55+MBL5OTN7PM6DFs61rQG1ZO3x8
+-VJ1GNvpVhEuIBUmsD2O4BVYekDsxCQIAuqMgVMVDfj7P2MeMKZ888XphQuYeJdIq
+-IckpdKnZSKSU0oXKiB9y0AyptB1Aih8IhF00EIURWjMI//19JkBXuJNetFxTaW1w
+-bGUgU3RyZWFtcyBUZXN0IFVzZXIgKFRlc3QgVXNhZ2UgT25seS4gRG8gTm90IElt
+-cG9ydC4pIDxzaW1wbGVzdHJlYW1zQGJvZ3VzLmV4YW1wbGUuY29tPoi+BBMBAgAo
+-BQJRLDrqAhsvBQkSzAMABgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCpcUog
+-OWdTbitCA/0fIgcFbf/bahcu3nicwgytDu0HKZobysozyy5rFIcrMfJAu0vPcrls
+-q+okHIwKADCuhJDmYEaBXziAPoWZBQtG5RRywq3UoIUkEJuoS/1yblrZHxwXbu8i
+-rnRsxsmJqRmGBuvc8/oXuRGVLWNX0fT0hkjPmcAi85x3QiYse2zYtA==
+-=svaP
++lQHYBGQi/aYBBAC4zLHL1F58qBXj/THBftMluEhULJfFsKV6LEmntw0iJyCUqBDh
++uxwXsEkt3TitJRyGJw2S7QNJErgv2uN5s4ES52NqWhikS/3AvzNs+ug4m/N5GYDh
++vKYVWR9hxDCcYW/Vy4m303iFL0oGC0pxOGtNMS5pVIyNdZgpN+kWIeMYYQARAQAB
++AAP9HOQzr9BF7WtB8OD21G+Fh1ImTLKkD84sMMuXwFbIANzpJRSZfxEHtVRkPH1n
++jPpOWVLltmDDsLryfNjV04MS3KOtCHnfM9poK+CdlLcrH6pg5QyATgktAQZdR6qA
++fWZY7aKoO43bWkpj7iKg1F/eGNA//WJehZLRyZzZSQ/cvyECANFfzcJ/BlFOVrho
++9s92JjGQDLVjYjrgSyGhqQr1NZptpBWbCXyaSPqCJJ+ulRz/W7/JKF1RBHdaw0Ug
+++sjcB3UCAOHz6sYUs60hSlNPQCH0hk9j4y/DFm51O2qNtiFqxrNDDn3eVdbFPwLN
++9r5vqR6bpe2z3eoxSuVe0V6Ylj8/W70CAI4ecsC4cBJkT83yiqWuNwndGZ1zt8+q
++12THqYUZ6KSBRHrCYOt8LT5QKFzvAzAJ6oNwYk+DMbMX24mpYo+0eQ6gxbRcU2lt
++cGxlIFN0cmVhbXMgVGVzdCBVc2VyIChUZXN0IFVzYWdlIE9ubHkuIERvIE5vdCBJ
++bXBvcnQuKSA8c2ltcGxlc3RyZWFtc0Bib2d1cy5leGFtcGxlLmNvbT6IzgQTAQoA
++OBYhBCSTkLZylBN3IH1mljhwreqhbkJ8BQJkIv2mAhsvBQsJCAcCBhUKCQgLAgQW
++AgMBAh4BAheAAAoJEDhwreqhbkJ8/0oEALF5U1JHMsc4u+2EzG+qioH/vvkCYk48
++fY6IR9A4Cv0LTjNxbgWx4ENdNL7q/J2TlawbcztADun7M+IrLVq1eFQ4djVXJJ3Y
++AAHS7ZFZQBaCDYNpB9vN+7HO2oYGqXE+wZeCmhu+6Zd/ak16GgEf0n1Phbjw0fvl
++uW6XnNloW+SY
++=uILn
+ -----END PGP PRIVATE KEY BLOCK-----
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3dab588
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+lp2013081-build-fails-gpg-key-expired-jammy.patch