From 86b25dbdb3dc386cb8c0d012b6a623ea622467b8 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Feb 10 2014 17:58:47 +0000
Subject: Fix format-security FTBFS.


---

diff --git a/zfs-fuse-printf-format.patch b/zfs-fuse-printf-format.patch
new file mode 100644
index 0000000..ed5dba8
--- /dev/null
+++ b/zfs-fuse-printf-format.patch
@@ -0,0 +1,20 @@
+--- src/cmd/zdb/zdb.c~	2012-01-09 02:31:29.000000000 -0600
++++ src/cmd/zdb/zdb.c	2014-02-10 10:42:59.775869701 -0600
+@@ -1483,7 +1483,7 @@
+ {
+ 	time_t timestamp = ub->ub_timestamp;
+ 
+-	(void) printf(header ? header : "");
++	(void) printf(header ? "%s", header : "%s", "");
+ 	(void) printf("\tmagic = %016llx\n", (u_longlong_t)ub->ub_magic);
+ 	(void) printf("\tversion = %llu\n", (u_longlong_t)ub->ub_version);
+ 	(void) printf("\ttxg = %llu\n", (u_longlong_t)ub->ub_txg);
+@@ -1495,7 +1495,7 @@
+ 		sprintf_blkptr(blkbuf, &ub->ub_rootbp);
+ 		(void) printf("\trootbp = %s\n", blkbuf);
+ 	}
+-	(void) printf(footer ? footer : "");
++	(void) printf(footer ? "%s", footer : "%s", "");
+ }
+ 
+ static void
diff --git a/zfs-fuse.spec b/zfs-fuse.spec
index 6a50410..b0f78d8 100644
--- a/zfs-fuse.spec
+++ b/zfs-fuse.spec
@@ -1,7 +1,7 @@
 %define _hardened_build 1
 Name:             zfs-fuse
 Version:          0.7.0
-Release:          15%{?dist}
+Release:          16%{?dist}
 Summary:          ZFS ported to Linux FUSE
 Group:            System Environment/Base
 License:          CDDL
@@ -13,6 +13,7 @@ Source03:         zfs-fuse.sysconfig
 Source04:         zfs-fuse-helper
 Patch0:           zfs-fuse-0.7.0-umem.patch
 Patch1:           zfs-fuse-0.7.0-stack.patch
+Patch2:           zfs-fuse-printf-format.patch
 BuildRequires:    fuse-devel libaio-devel scons zlib-devel openssl-devel libattr-devel prelink
 BuildRequires:    systemd-units
 Requires:         fuse >= 2.7.4-1
@@ -37,6 +38,7 @@ operating system.
 
 %patch0 -p0
 %patch1 -p1
+%patch2 -p0
 
 f=LICENSE
 %{__mv} $f $f.iso88591
@@ -140,6 +142,9 @@ fi
 %{_mandir}/man8/zstreamdump.8.gz
 
 %changelog
+* Mon Feb 10 2014 Jon Ciesla <limburgher@gmail.com> - 0.7.0-16
+- Fix format-security FTBFS, BZ 1037411.
+
 * Tue Aug 13 2013 Jon Ciesla <limburgher@gmail.com> - 0.7.0-15
 - ExcludeArch ARM, BZ 993168.