Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package goiardi
This 1 liner patch fixes chef client creation when using recent
chef tools, by allowing an extra element name.
unblock goiardi/0.11.9-3
Thank you!
The full source debdiff follows:
diff -Nru goiardi-0.11.9/debian/changelog goiardi-0.11.9/debian/changelog
--- goiardi-0.11.9/debian/changelog 2019-02-19 11:14:26.000000000 +0100
+++ goiardi-0.11.9/debian/changelog 2019-05-15 11:22:09.000000000 +0200
@@ -1,3 +1,10 @@
+goiardi (0.11.9-3) unstable; urgency=medium
+
+ * Add patch from upstream git to add "create_key" to the list
+ of valid elements, to fix client creation with newer chef tools.
+
+ -- Jordi Mallach <jo...@debian.org> Wed, 15 May 2019 11:22:09 +0200
+
goiardi (0.11.9-2) unstable; urgency=medium
* Drop Dependency on golang-golang-x-exp-dev from
diff -Nru goiardi-0.11.9/debian/patches/create_key_validelement.patch
goiardi-0.11.9/debian/patches/create_key_validelement.patch
--- goiardi-0.11.9/debian/patches/create_key_validelement.patch 1970-01-01
01:00:00.000000000 +0100
+++ goiardi-0.11.9/debian/patches/create_key_validelement.patch 2019-05-15
11:19:31.000000000 +0200
@@ -0,0 +1,19 @@
+commit a327416f516a6df7394951b539b04c49294ad020
+Author: ctdk <jbing...@gmail.com>
+Date: Mon May 13 08:12:32 2019 -0700
+
+ add 'create_key' to validElements for clients
+
+diff --git a/client/client.go b/client/client.go
+index d86bc08..5b338e0 100644
+--- a/client/client.go
++++ b/client/client.go
+@@ -368,7 +368,7 @@ func (c *Client) UpdateFromJSON(jsonActor
map[string]interface{}) util.Gerror {
+
+ /* Validations. */
+ /* Invalid top level elements */
+- validElements := []string{"name", "json_class", "chef_type",
"validator", "org_name", "orgname", "public_key", "private_key", "admin",
"certificate", "password", "node_name", "clientname"}
++ validElements := []string{"name", "json_class", "chef_type",
"validator", "org_name", "orgname", "public_key", "private_key", "admin",
"certificate", "password", "node_name", "clientname", "create_key"}
+ ValidElem:
+ for k := range jsonActor {
+ for _, i := range validElements {
diff -Nru goiardi-0.11.9/debian/patches/series
goiardi-0.11.9/debian/patches/series
--- goiardi-0.11.9/debian/patches/series 2018-06-05 00:32:28.000000000
+0200
+++ goiardi-0.11.9/debian/patches/series 2019-05-15 11:19:37.000000000
+0200
@@ -1 +1,2 @@
avoid_vault_import.patch
+create_key_validelement.patch
-- System Information:
Debian Release: 10.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (1,
'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.0.0-trunk-amd64 (SMP w/4 CPU cores)
Locale: LANG=ca_ES.UTF-8, LC_CTYPE=ca_ES.UTF-8 (charmap=UTF-8),
LANGUAGE=ca_ES:ca (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
