Bug#927797: unblock: debian-archive-keyring/2019.1

2019-04-25 Thread Cyril Brulebois 
Hi Niels,

Niels Thykier  (2019-04-23):
> Package: release.debian.org
> Severity: normal
> Tags: d-i
> User: release.debian@packages.debian.org
> Usertags: unblock
> 
> Please unblock package debian-archive-keyring, which includes the new
> signing keys for buster.
> 
> """
> debian-archive-keyring (2019.1) unstable; urgency=medium
> 
>   [ Adam D. Barratt ]
>   * Ensure separated keyrings for Wheezy's keys are removed.  Thanks
> to Sven Joachim.
> (Closes: #912214)
> 
>   [ Jonathan Wiltshire ]
>   * Add my own key to the team-members keyring
>   * Add Debian Stable Release key (10/buster) (ID: DCC9EFBF77E11517)
> (Closes: #917536)
>   * Add Debian Archive Automatic Signing Key (10/buster)
> (ID: BCDDDC30D7C23CBBABEE) and Debian Security Archive Automatic
> Signing Key (10/buster) (ID: C5FF4DFAB270CAA96DFA)
> (Closes: #917535)
>   * Refresh the signature over keyrings/debian-archive-keyring.gpg
> 
>   [ Niels Thykier ]
>   * Add myself as uploader (Closes: #927765)
> 
>  -- Niels Thykier   Tue, 23 Apr 2019 13:42:28 +0200
> """
> 
> A diffstat:
> 
> """
> 
> $ diffstat debian-archive-keyring.debdiff
>  active-keys/add-buster-automatic  |  179 +++
>  active-keys/add-buster-security-automatic |  179 +++
>  active-keys/add-buster-stable |   58 
>  active-keys/index |3 
>  active-keys/index.gpg |   21 +
>  debian/changelog  |   22 +
>  debian/control|1 
>  debian/debian-archive-keyring.maintscript |2 
>  keyrings/debian-archive-keyring.gpg.asc   |   21 +
>  team-members/add-5394479DD3524C51 |  357 
> ++
>  team-members/index|1 
>  team-members/index.gpg|   21 +
>  12 files changed, 841 insertions(+), 24 deletions(-)
> """

That'd be the usual source debdiff, but that doesn't account for this
change in the udeb (which I wasn't expecting from the changelog
entries):

$ debdiff debian-archive-keyring-udeb_2018.1_all.udeb 
debian-archive-keyring-udeb_2019.1_all.udeb
[…]
Files in second .deb but not in first
-
-rw-r--r--  root/root 
/usr/share/keyrings/debian-archive-buster-automatic.gpg
-rw-r--r--  root/root 
/usr/share/keyrings/debian-archive-buster-security-automatic.gpg
-rw-r--r--  root/root /usr/share/keyrings/debian-archive-buster-stable.gpg
[…]

Having those extra files around shouldn't hurt (and doesn't seem to,
based on some quick tests using a brand new netboot-gtk image built
against sid), but I thought I'd mention it anyway.


No objections, feel free to unblock.


Cheers,
-- 
Cyril Brulebois (k...@debian.org)
D-I release manager -- Release team member -- Freelance Consultant


signature.asc
Description: PGP signature

Bug#927797: unblock: debian-archive-keyring/2019.1

2019-04-23 Thread Niels Thykier 
Package: release.debian.org
Severity: normal
Tags: d-i
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package debian-archive-keyring, which includes the new
signing keys for buster.

I have taken the liberty of X-Debbugs-CC'ing Kibi for a d-i ack as
well.

"""
debian-archive-keyring (2019.1) unstable; urgency=medium

  [ Adam D. Barratt ]
  * Ensure separated keyrings for Wheezy's keys are removed.  Thanks
to Sven Joachim.
(Closes: #912214)

  [ Jonathan Wiltshire ]
  * Add my own key to the team-members keyring
  * Add Debian Stable Release key (10/buster) (ID: DCC9EFBF77E11517)
(Closes: #917536)
  * Add Debian Archive Automatic Signing Key (10/buster)
(ID: BCDDDC30D7C23CBBABEE) and Debian Security Archive Automatic
Signing Key (10/buster) (ID: C5FF4DFAB270CAA96DFA)
(Closes: #917535)
  * Refresh the signature over keyrings/debian-archive-keyring.gpg

  [ Niels Thykier ]
  * Add myself as uploader (Closes: #927765)

 -- Niels Thykier   Tue, 23 Apr 2019 13:42:28 +0200

"""

A diffstat:

"""

$ diffstat debian-archive-keyring.debdiff
 active-keys/add-buster-automatic  |  179 +++
 active-keys/add-buster-security-automatic |  179 +++
 active-keys/add-buster-stable |   58 
 active-keys/index |3 
 active-keys/index.gpg |   21 +
 debian/changelog  |   22 +
 debian/control|1 
 debian/debian-archive-keyring.maintscript |2 
 keyrings/debian-archive-keyring.gpg.asc   |   21 +
 team-members/add-5394479DD3524C51 |  357 ++
 team-members/index|1 
 team-members/index.gpg|   21 +
 12 files changed, 841 insertions(+), 24 deletions(-)
"""

Note that the majority of the changes are due to keyring changes,
which are base64 encoded and hench is included as a "textual" change
rather than a binary file change.  This inflates the diff size
considerably.

unblock debian-archive-keyring/2019.1

Thanks,
~Niels
Base version: debian-archive-keyring_2018.1 from testing
Target version: debian-archive-keyring_2019.1 from unstable

Hints in place:
==> freeze
  # These udebs can be handled directly by britney
  # but are currently blocked at the d-i RM's request
  block-udeb debian-archive-keyring

Excuses:



Filter applied (not reflected in the diffstat):
  filterdiff -x **/*.po -x **/*.pot

 active-keys/add-buster-automatic  |  179 +++
 active-keys/add-buster-security-automatic |  179 +++
 active-keys/add-buster-stable |   58 
 active-keys/index |3 
 active-keys/index.gpg |   21 +
 debian/changelog  |   22 +
 debian/control|1 
 debian/debian-archive-keyring.maintscript |2 
 keyrings/debian-archive-keyring.gpg.asc   |   21 +
 team-members/add-5394479DD3524C51 |  357 ++
 team-members/index|1 
 team-members/index.gpg|   21 +
 12 files changed, 841 insertions(+), 24 deletions(-)

gpgv: unknown type of key resource 'trustedkeys.kbx'
gpgv: keyblock resource '/home/nthykier/.gnupg/trustedkeys.kbx': General error
gpgv: Signature made 2018-10-28T17:26:50 UTC
gpgv:using RSA key F1FF5D0D7E002DF0FE55FB0CA65B78DBE67C7AAC
gpgv:issuer "ni...@thykier.net"
gpgv: Can't check signature: No public key
dpkg-source: warning: failed to verify signature on 
/tmp/tmpodpid684/debian-archive-keyring_2018.1.dsc
gpgv: unknown type of key resource 'trustedkeys.kbx'
gpgv: keyblock resource '/home/nthykier/.gnupg/trustedkeys.kbx': General error
gpgv: Signature made 2019-04-23T11:49:10 UTC
gpgv:using RSA key F1FF5D0D7E002DF0FE55FB0CA65B78DBE67C7AAC
gpgv: Can't check signature: No public key
dpkg-source: warning: failed to verify signature on 
/tmp/tmpodpid684/debian-archive-keyring_2019.1.dsc
diff -Nru debian-archive-keyring-2018.1/active-keys/add-buster-automatic 
debian-archive-keyring-2019.1/active-keys/add-buster-automatic
--- debian-archive-keyring-2018.1/active-keys/add-buster-automatic  
1970-01-01 00:00:00.0 +
+++ debian-archive-keyring-2019.1/active-keys/add-buster-automatic  
2019-04-23 11:40:11.0 +
@@ -0,0 +1,179 @@
+Comment: add buster automatic key
+Date: Mon, 22 Apr 2019 13:57:10 +0100
+Action: import
+Data: 
+  -BEGIN PGP PUBLIC KEY BLOCK-
+  
+  mQINBFyy5ecBEACxXGKUyi5dFjPhEFoz3IwKlVfDxySVg+hlhcUEO657UHf/7Ba5
+  wr9eHxjlbpxetAymSNnptgh8oaJWcokr9UjeaTbKrYGpRra7Wd1W+f++9tF7BVvV
+  +AWBaltD5NDuq+eQ7kj72oeMa7KAr4702ZokLgiTsS9dPeDAodx3/jMuV9VxlJ7q
+  w07bAoUdzhlPBcII3MOCMfQmtwIg27/qqekeOnrGtNwscugwVqcBATxRZ1wNAebJ
+  60FH9FQOtPZJnuv/q3KXqoneuSMKiBKferQhLXDG/1fUyojNF9Dcae+HmHAZmVsV
+