From 41d024c52427f6c578178fe2bb0f086879d80722 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 22 Feb 2016 21:00:11 -0500 Subject: [PATCH] New upstream version --- ...barchive-Fix-a-32-bit-format-warning.patch | 26 +++++++++++++++++++ ostree.spec | 1 + 2 files changed, 27 insertions(+) create mode 100644 0001-libarchive-Fix-a-32-bit-format-warning.patch diff --git a/0001-libarchive-Fix-a-32-bit-format-warning.patch b/0001-libarchive-Fix-a-32-bit-format-warning.patch new file mode 100644 index 0000000..dbe13f5 --- /dev/null +++ b/0001-libarchive-Fix-a-32-bit-format-warning.patch @@ -0,0 +1,26 @@ +From 88ae6f1b9e64926c47e5c1dae36027b8c46816f7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 22 Feb 2016 20:52:33 -0500 +Subject: [PATCH] libarchive: Fix a 32 bit format warning + +This is actually an error by default with our default CFLAGS. +--- + src/libostree/ostree-repo-libarchive.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libostree/ostree-repo-libarchive.c b/src/libostree/ostree-repo-libarchive.c +index 82c8dd5..b21e222 100644 +--- a/src/libostree/ostree-repo-libarchive.c ++++ b/src/libostree/ostree-repo-libarchive.c +@@ -640,7 +640,7 @@ write_directory_to_libarchive_recurse (OstreeRepo *self, + if (r != bytes_read) + { + propagate_libarchive_error (error, a); +- g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", bytes_read, r); ++ g_prefix_error (error, "Failed to write %" G_GUINT64_FORMAT " bytes (code %" G_GUINT64_FORMAT"): ", (guint64)bytes_read, r); + goto out; + } + } +-- +1.8.3.1 + diff --git a/ostree.spec b/ostree.spec index 347233f..df65635 100644 --- a/ostree.spec +++ b/ostree.spec @@ -37,6 +37,7 @@ Requires: /usr/bin/gpgv2 Requires: systemd-units Patch2: 0001-ostree-remount-Explicitly-set-tmp-to-01777.patch +Patch3: 0001-libarchive-Fix-a-32-bit-format-warning.patch %description OSTree is a tool for managing bootable, immutable, versioned