diff --git a/.files b/.files index f67af9c..c5b3dee 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 045b3bf..937c171 100644 --- a/.rev +++ b/.rev @@ -64,4 +64,12 @@ 947296 + + 8fc4b288d3fabf231c42f0a29633f6db + 5.2.0 + + dimstar_suse + + 947375 + diff --git a/.servicemark b/.servicemark index 4fc1b30..293594b 100644 --- a/.servicemark +++ b/.servicemark @@ -1 +1 @@ -f4ebd557352aaf3f435191dadd7a1bb4 +6f225de365a6510aa0205f3ee560edb2 diff --git a/_service b/_service index 64d2fab..08b62cc 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 377bc79..788d57d 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 120000 index 5093453..0000000 --- a/afterburn-5.0.0.tar.xz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiansqpxygt3km3i2rre7yln4fin52itg324kxrfktygeqkg3qioye \ No newline at end of file diff --git a/afterburn-5.2.0.tar.xz b/afterburn-5.2.0.tar.xz new file mode 120000 index 0000000..cab93af --- /dev/null +++ b/afterburn-5.2.0.tar.xz @@ -0,0 +1 @@ +/ipfs/bafkreianwdrpdr2xfctuuisv46olrg3u532ouqoiopjbb7ggxmqgqv6d7a \ No newline at end of file diff --git a/afterburn.changes b/afterburn.changes index de3065b..8e51e59 100644 --- a/afterburn.changes +++ b/afterburn.changes @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +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 - Update some dependencies diff --git a/afterburn.spec b/afterburn.spec index c4ac23a..b3ec632 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 3eed5f7..c57a960 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 6d08122..ce8af36 120000 --- a/vendor.tar.xz +++ b/vendor.tar.xz @@ -1 +1 @@ -/ipfs/bafybeiem4jglp66hffykmycekfiex76j33625cjmyi3kwn5jsaavml3aaq \ No newline at end of file +/ipfs/bafybeie74rwcocbb2uyp75xkxwz6defcxqomj4cyayrofcs6azezqvfwiu \ No newline at end of file