[hercules] - fix build with -Werror=format-security (#1037121)

Dan Horák sharkcz at fedoraproject.org
Tue Dec 3 13:36:12 UTC 2013


commit 4281ffe5b0b8f8576f2d6872c9721acb20bdd99b
Author: Dan Horák <dan at danny.cz>
Date:   Tue Dec 3 14:36:07 2013 +0100

    - fix build with -Werror=format-security (#1037121)

 hercules-3.09-format.patch |   25 +++++++++++++++++++++++++
 hercules.spec              |    8 +++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/hercules-3.09-format.patch b/hercules-3.09-format.patch
new file mode 100644
index 0000000..a2dbc39
--- /dev/null
+++ b/hercules-3.09-format.patch
@@ -0,0 +1,25 @@
+From f7219cf0e63496b8919779b5981c3d4150a0e2e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Tue, 3 Dec 2013 14:29:18 +0100
+Subject: [PATCH] fix build with -Werror=format-security
+
+---
+ dasdcopy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dasdcopy.c b/dasdcopy.c
+index e14195e..c7a25b3 100644
+--- a/dasdcopy.c
++++ b/dasdcopy.c
+@@ -660,7 +660,7 @@ int syntax (char *pgm)
+ #endif
+             ,(sizeof(off_t) > 4) ? _( "     -lfs              output ckd file will be a single file\n" ) : ( "" )
+             );
+-    printf (usage);
++    printf ("%s", usage);
+     return -1;
+ } /* end function syntax */
+ 
+-- 
+1.8.1.4
+
diff --git a/hercules.spec b/hercules.spec
index 8f19a06..4a41db8 100644
--- a/hercules.spec
+++ b/hercules.spec
@@ -1,7 +1,7 @@
 Summary: Hercules S/370, ESA/390, and z/Architecture emulator
 Name: hercules
 Version: 3.09
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: QPL
 Group: Applications/Emulators
 URL: http://www.hercules-390.eu/
@@ -13,6 +13,8 @@ Source3: README-rpm
 Source4: generic.prm
 Patch0: %{name}-3.09-fedora.patch
 Patch1: %{name}-3.08.1-util.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1037121
+Patch2: %{name}-3.09-format.patch
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: libcap-devel
@@ -35,6 +37,7 @@ printer-keyboard, 3270 terminal, and 3287 printer devices.
 
 %patch0 -p1 -b .fedora
 %patch1 -p1 -b .util
+%patch2 -p1 -b .format
 
 rm autoconf/libtool.m4
 autoreconf -f -i
@@ -99,6 +102,9 @@ rm %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Tue Dec 03 2013 Dan Horák <dan[at]danny.cz> - 3.09-2
+- fix build with -Werror=format-security (#1037121)
+
 * Tue Jul 30 2013 Dan Horák <dan[at]danny.cz> - 3.09-1
 - updated to 3.09 (#989939)
 


More information about the scm-commits mailing list