From cb471f71a7932450d2d626a56e4bcffb2822c31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 11 Jun 2014 09:52:44 +0200
Subject: [PATCH] - update for -Werror=format-security

---
 s390-tools-1.23.0-format.patch | 57 ++++++++++++++++++++++++++++++++++
 s390utils.spec                 |  7 ++++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 s390-tools-1.23.0-format.patch

diff --git a/s390-tools-1.23.0-format.patch b/s390-tools-1.23.0-format.patch
new file mode 100644
index 0000000..9fe8907
--- /dev/null
+++ b/s390-tools-1.23.0-format.patch
@@ -0,0 +1,57 @@
+diff -up s390-tools-1.23.0/tape390/tape390_display.c.format s390-tools-1.23.0/tape390/tape390_display.c
+--- s390-tools-1.23.0/tape390/tape390_display.c.format	2014-02-10 04:59:30.430126870 -0500
++++ s390-tools-1.23.0/tape390/tape390_display.c	2014-02-10 05:00:08.960127361 -0500
+@@ -175,7 +175,7 @@ int main(int argc, char *argv[]) {
+ 	) {
+ 		switch(c) {
+ 			case 'h':
+-				fprintf(stderr, help_text);
++				fprintf(stderr, "%s", help_text);
+ 				exit(0);
+ 			case 'b':
+ 				ds.cntrl.blink = 1;
+@@ -266,7 +266,7 @@ int main(int argc, char *argv[]) {
+ 		strchkcpy(ds.message1, argv[optind]);
+ 		pathname = argv[optind+1];
+ 	} else {
+-		fprintf(stderr, help_text);
++		fprintf(stderr, "%s", help_text);
+ 		exit(1);
+ 	}
+ 
+diff -up s390-tools-1.23.0/vmur/vmur.cpp.format s390-tools-1.23.0/vmur/vmur.cpp
+--- s390-tools-1.23.0/vmur/vmur.cpp.format	2014-02-10 05:00:32.430127965 -0500
++++ s390-tools-1.23.0/vmur/vmur.cpp	2014-02-10 05:00:47.900128212 -0500
+@@ -201,7 +201,7 @@ static char HELP_TEXT[] =
+ 
+ static void usage(void)
+ {
+-	printf(HELP_TEXT);
++	printf("%s", HELP_TEXT);
+ }
+ 
+ /*
+diff -up s390-tools-1.23.0/zdump/opts.c.format s390-tools-1.23.0/zdump/opts.c
+--- s390-tools-1.23.0/zdump/opts.c.format	2014-02-10 04:58:26.760125680 -0500
++++ s390-tools-1.23.0/zdump/opts.c	2014-02-10 04:58:45.510125937 -0500
+@@ -72,7 +72,7 @@ static void print_usage_exit(void)
+  */
+ static void print_help_exit(void)
+ {
+-	STDOUT(help_text);
++	STDOUT("%s", help_text);
+ 	zg_exit(0);
+ }
+ 
+diff -up s390-tools-1.23.0/zdump/zgetdump.c.format s390-tools-1.23.0/zdump/zgetdump.c
+--- s390-tools-1.23.0/zdump/zgetdump.c.format	2014-02-10 04:57:23.100124931 -0500
++++ s390-tools-1.23.0/zdump/zgetdump.c	2014-02-10 04:56:57.640124530 -0500
+@@ -95,7 +95,7 @@ static void kdump_select_check(void)
+ 		return;
+ 	if (!dfi_kdump_base())
+ 		return;
+-	ERR_EXIT(msg);
++	ERR_EXIT("%s", msg);
+ }
+ 
+ /*
diff --git a/s390utils.spec b/s390utils.spec
index a34428c..2a5590b 100644
--- a/s390utils.spec
+++ b/s390utils.spec
@@ -5,7 +5,7 @@ Name:           s390utils
 Summary:        Utilities and daemons for IBM System/z
 Group:          System Environment/Base
 Version:        1.23.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          2
 License:        GPLv2 and GPLv2+ and CPL
 ExclusiveArch:  s390 s390x
@@ -35,6 +35,7 @@ Source21:       normalize_dasd_arg
 
 Patch1:         s390-tools-1.23.0-fedora.patch
 Patch2:         s390-tools-1.23.0-hardening.patch
+Patch3:         s390-tools-1.23.0-format.patch
 
 Patch1000:      cmsfs-1.1.8-warnings.patch
 Patch1001:      cmsfs-1.1.8-kernel26.patch
@@ -65,6 +66,7 @@ be used together with the zSeries (s390) Linux kernel and device drivers.
 # Fedora/RHEL changes
 %patch1 -p1 -b .fedora
 %patch2 -p1 -b .hardening
+%patch3 -p1 -b .format
 
 #
 # cmsfs
@@ -734,6 +736,9 @@ User-space development files for the s390/s390x architecture.
 
 
 %changelog
+* Wed Jun 11 2014 Dan Horák <dan[at]danny.cz> - 2:1.23.0-12
+- update for -Werror=format-security
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:1.23.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild