git master snapshot for HMAC path fix for FIPS

https://github.com/coreos/rpm-ostree/pull/1934

We need this in COSA since the path scrubbing magic happens at compose
time.

.gitignore

@@ -79,3 +79,4 @@
 /rpm-ostree-2019.5.tar.xz
 /rpm-ostree-2019.5.7.gcac5aa41.tar.xz
 /rpm-ostree-2019.6.tar.xz
+/rpm-ostree-2019.6.24.gfec61ce5.tar.xz

0001-app-status-Fix-printf-format-string-for-32-bit.patch

@@ -1,35 +0,0 @@
-From 08c98eda94381f0147af5783960121574043fa5a Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jonathan@jlebon.com>
-Date: Wed, 25 Sep 2019 12:42:59 -0400
-Subject: [PATCH] app/status: Fix printf format string for 32-bit
-
-Hit this when compiling in Koji.
----
- src/app/rpmostree-builtin-status.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/app/rpmostree-builtin-status.c b/src/app/rpmostree-builtin-status.c
-index 2bc2c4b5..8b38fc83 100644
---- a/src/app/rpmostree-builtin-status.c
-+++ b/src/app/rpmostree-builtin-status.c
-@@ -1119,7 +1119,7 @@ fetch_history_deployment_gvariant (RORHistoryEntry  *entry,
-                                    GError          **error)
- {
-   g_autofree char *fn =
--    g_strdup_printf ("%s/%lu", RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
-+    g_strdup_printf ("%s/%" PRIu64, RPMOSTREE_HISTORY_DIR, entry->deploy_timestamp);
- 
-   *out_deployment = NULL;
- 
-@@ -1165,7 +1165,7 @@ print_history_entry (RORHistoryEntry  *entry,
-       print_timestamp_and_relative ("BootTimestamp", entry->last_boot_timestamp);
-       if (entry->boot_count > 1)
-         {
--          g_print ("%s BootCount: %lu; first booted on ",
-+          g_print ("%s BootCount: %" PRIu64 "; first booted on ",
-                    libsd_special_glyph (TREE_RIGHT), entry->boot_count);
-           print_timestamp_and_relative (NULL, entry->first_boot_timestamp);
-         }
--- 
-2.21.0
-

rpm-ostree.spec

@@ -3,7 +3,7 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2019.6
+Version: 2019.6.24.gfec61ce5
 Release: 1%{?dist}
 #VCS: https://github.com/cgwalters/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -12,8 +12,6 @@ Source0: rpm-ostree-%{version}.tar.xz
 License: LGPLv2+
 URL: https://github.com/projectatomic/rpm-ostree
 
-Patch0: 0001-app-status-Fix-printf-format-string-for-32-bit.patch
-
 ExclusiveArch: %{rust_arches}
 
 %if 0%{?fedora}
@@ -180,6 +178,10 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Thu Oct 31 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6.24.gfec61ce5-1
+- git master snapshot for HMAC path fix for FIPS:
+  https://github.com/coreos/rpm-ostree/pull/1934
+
 * Wed Sep 25 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.6-1
 - New upstream version
 

sources

@@ -1 +1 @@
-SHA512 (rpm-ostree-2019.6.tar.xz) = 955e22aaaf78f7441df8f1574e897ceacfffa417e7709900035333115dfb22243ca53550ca4dd88c5f170950f23be077a31bf1e4c78a91465054704f0387010f
+SHA512 (rpm-ostree-2019.6.24.gfec61ce5.tar.xz) = d17e5ece5e433caa763638a32230091db6be18b7e550db0b6c9218b3285a82a76e8c2a90b94bf4285a775c9e13e2aaa009fc1c2afd9960827df559928edb348b