Bug#925435: unblock: fwupd/1.2.5-2

2019-03-25 Thread Ansgar Burchardt
Steve McIntyre writes:
> Please unblock package fwupd

Please also unblock

  fwupd-amd64-signed/1.2.5+2
  fwupd-arm64-signed/1.2.5+2
  fwupd-armhf-signed/1.2.5+2
  fwupd-i386-signed/1.2.5+2

at the same time.

Ansgar



Bug#925435: unblock: fwupd/1.2.5-2

2019-03-24 Thread Steve McIntyre
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package fwupd

I've just made the last minor tweaks around the signing service json
setup needed for UEFI Secure Boot support in Debian. Here's the tiny
debdiff.

diff -Nru fwupd-1.2.5/debian/changelog fwupd-1.2.5/debian/changelog
--- fwupd-1.2.5/debian/changelog2019-02-26 22:30:52.0 +
+++ fwupd-1.2.5/debian/changelog2019-03-25 00:32:07.0 +
@@ -1,3 +1,13 @@
+fwupd (1.2.5-2) unstable; urgency=medium
+
+  * debian/gen_signing_json: Update the format of the json metadata to
+match new requirements:
++ Move all the data under a new top-level "packages" key
++ Add an empty "trusted_certs" key - our binaries do not do any
+  further verification with an embedded key.
+
+ -- Steve McIntyre <93...@debian.org>  Mon, 25 Mar 2019 00:32:07 +
+
 fwupd (1.2.5-1) unstable; urgency=medium
 
   * New upstream version (1.2.5)
diff -Nru fwupd-1.2.5/debian/gen_signing_json 
fwupd-1.2.5/debian/gen_signing_json
--- fwupd-1.2.5/debian/gen_signing_json 2019-02-26 22:29:28.0 +
+++ fwupd-1.2.5/debian/gen_signing_json 2019-03-08 23:33:13.0 +
@@ -16,9 +16,14 @@
 
 rm -f $OUT
 
-printf '{"%s": {\n' "${SOURCE}" >> $OUT
-printf '  "files": [ \n' >> $OUT
-printf '{"sig_type": "efi", "file": "%s"}\n' "${BINARY}" >> $OUT
-printf '  ]\n' >> $OUT
-printf '} }\n' >> $OUT
+printf '{\n' >> $OUT
+printf '  "packages": {\n' >> $OUT
+printf '"%s": {\n' "${SOURCE}" >> $OUT
+printf '  "trusted_certs": [],\n' >> $OUT
+printf '  "files": [ \n' >> $OUT
+printf '{"sig_type": "efi", "file": "%s"}\n' "${BINARY}" >> $OUT
+printf '  ]\n' >> $OUT
+printf '}\n' >> $OUT
+printf '  }\n' >> $OUT
+printf '}\n' >> $OUT
 


unblock fwupd/1.2.5-2

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), 
LANGUAGE=en_GB:en (charmap=UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled