From 673225f18e1fdac6004118a44251e2b8a454b38afa746462fecb7c5d1fdc33a0 Mon Sep 17 00:00:00 2001 From: Darragh O'Reilly Date: Wed, 19 Jan 2022 10:01:52 +0000 Subject: [PATCH] Accepting request 947309 from home:jzerebecki:branches:devel:kubic:ignition - Update to version 5.2.0: * providers: log message when SSH key is removed * providers: limit hostname file output value to HOST_NAME_MAX bytes * Consistently un-capitalize log messages * Explicitly log the hostname we write * providers/microsoft: allow unused fields in goal state structs * providers: only log we wrote SSH keys when we actually did - Update to version 5.1.0: * Add PowerVS provider * cli: correctly print version when --version specified * cli: don't report an error when --help or --version is specified * providers/packet: access metadata service over HTTPS * providers/gcp: access GCP metadata service by IP address * minimum supported rust version is now 1.49.0 * Refresh fix-authorized-keys-location.patch OBS-URL: https://build.opensuse.org/request/show/947309 OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/afterburn?expand=0&rev=16 --- _service | 6 ++---- _servicedata | 2 +- afterburn-5.0.0.tar.xz | 3 --- afterburn-5.2.0.tar.xz | 3 +++ afterburn.changes | 19 +++++++++++++++++++ afterburn.spec | 6 +++--- fix-authorized-keys-location.patch | 10 ++++++---- vendor.tar.xz | 4 ++-- 8 files changed, 36 insertions(+), 17 deletions(-) delete mode 100644 afterburn-5.0.0.tar.xz create mode 100644 afterburn-5.2.0.tar.xz diff --git a/_service b/_service index 07157cc..4025b3f 100644 --- a/_service +++ b/_service @@ -1,12 +1,10 @@ - - https://github.com/JanZerebecki/afterburn.git + https://github.com/coreos/afterburn.git git .git afterburn - - origin/for-5.0 + v5.2.0 @PARENT_TAG@ v(.*) enable diff --git a/_servicedata b/_servicedata index aa204a6..a9e1d66 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/coreos/afterburn.git - 8c366ef408e755f557aaead99c74bfc35c1c5bf5 + 43dc76d7c38921d8eb0dc24d3b0b18787fa8ee07 https://github.com/JanZerebecki/afterburn.git 104ec25049bf429578c60877c0ea503ee96354e4 \ No newline at end of file diff --git a/afterburn-5.0.0.tar.xz b/afterburn-5.0.0.tar.xz deleted file mode 100644 index 1bcb5f7..0000000 --- a/afterburn-5.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25a4b23a2a7015fbb77fbd194d3fc72aaad593874e4dd9285bed617d5acc13a3 -size 10990668 diff --git a/afterburn-5.2.0.tar.xz b/afterburn-5.2.0.tar.xz new file mode 100644 index 0000000..6391bec --- /dev/null +++ b/afterburn-5.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0db0e2f1c75728a74a2255e79cb89b74eef4ea41c873d210fcc6bb206857c3f8 +size 70804 diff --git a/afterburn.changes b/afterburn.changes index 646cb8b..e573c1c 100644 --- a/afterburn.changes +++ b/afterburn.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jan 18 21:12:09 UTC 2022 - jan.suse@zerebecki.de + +- Update to version 5.2.0: + * providers: log message when SSH key is removed + * providers: limit hostname file output value to HOST_NAME_MAX bytes + * Consistently un-capitalize log messages + * Explicitly log the hostname we write + * providers/microsoft: allow unused fields in goal state structs + * providers: only log we wrote SSH keys when we actually did +- Update to version 5.1.0: + * Add PowerVS provider + * cli: correctly print version when --version specified + * cli: don't report an error when --help or --version is specified + * providers/packet: access metadata service over HTTPS + * providers/gcp: access GCP metadata service by IP address + * minimum supported rust version is now 1.49.0 +* Refresh fix-authorized-keys-location.patch + ------------------------------------------------------------------- Thu Jan 13 19:05:51 UTC 2022 - jan.suse@zerebecki.de diff --git a/afterburn.spec b/afterburn.spec index 77e2ed1..3a237bb 100644 --- a/afterburn.spec +++ b/afterburn.spec @@ -21,7 +21,7 @@ %global dracutmodulesdir %(pkg-config --variable=dracutmodulesdir dracut || echo '/usr/lib/dracut/modules.d') Name: afterburn -Version: 5.0.0 +Version: 5.2.0 Release: 0 Summary: A cloud provider agent License: Apache-2.0 @@ -36,7 +36,7 @@ Patch3: no-network-args.patch ExcludeArch: %ix86 s390x ppc64le BuildRequires: cargo -BuildRequires: rust >= 1.44.0 +BuildRequires: rust >= 1.49.0 BuildRequires: pkgconfig(openssl) %description @@ -54,7 +54,7 @@ to run in the initramfs on boot. %prep %autosetup -N -a1 -%patch1 -p0 +%patch1 -p1 %patch2 -p0 %patch3 -p0 diff --git a/fix-authorized-keys-location.patch b/fix-authorized-keys-location.patch index 03fecb0..c508198 100644 --- a/fix-authorized-keys-location.patch +++ b/fix-authorized-keys-location.patch @@ -1,6 +1,8 @@ ---- src/providers/mod.rs.orig -+++ src/providers/mod.rs -@@ -87,8 +87,8 @@ fn write_ssh_keys(user: User, ssh_keys: +diff --git a/src/providers/mod.rs b/src/providers/mod.rs +index f684d22..153d473 100644 +--- a/src/providers/mod.rs ++++ b/src/providers/mod.rs +@@ -98,8 +98,8 @@ fn write_ssh_keys(user: User, ssh_keys: Vec) -> Result<()> { .context("failed to switch user/group")?; // get paths @@ -10,4 +12,4 @@ + let file_name = "authorized_keys"; let file_path = &dir_path.join(file_name); - if !ssh_keys.is_empty() { + // stringify for logging diff --git a/vendor.tar.xz b/vendor.tar.xz index 0b70f6b..bbbecd2 100644 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f150176b8003f12b8351a19b052b71d976eb032f733cb73c7e3900e2969cebb6 -size 10884232 +oid sha256:9ac09aafb73a7d740ee13375cba62a4ed8c6d6fb49572fc56681cfc2b2c3784a +size 11169696