[packages/jfsutils] Fix build with -Werror=format-security and add missing include

megabajt megabajt at pld-linux.org
Sat Feb 16 12:26:24 CET 2013


commit 6c6c732eaafa0c06bebdfa815d49c9d6da93cbfe
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Sat Feb 16 12:24:12 2013 +0100

    Fix build with -Werror=format-security and add missing include

 jfsutils-format-security.patch | 37 +++++++++++++++++++++++++++++++++++++
 jfsutils-includes.patch        | 11 +++++++++++
 jfsutils.spec                  |  4 ++++
 3 files changed, 52 insertions(+)
---
diff --git a/jfsutils.spec b/jfsutils.spec
index ce46dec..08c2086 100644
--- a/jfsutils.spec
+++ b/jfsutils.spec
@@ -12,6 +12,8 @@ Group:		Applications/System
 Source0:	http://jfs.sourceforge.net/project/pub/%{name}-%{version}.tar.gz
 # Source0-md5:	8809465cd48a202895bc2a12e1923b5d
 Patch0:		%{name}-am.patch
+Patch1:		%{name}-format-security.patch
+Patch2:		%{name}-includes.patch
 URL:		http://jfs.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -30,6 +32,8 @@ Programy do zarządzania systemem plików JFS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 %{!?with_fsck:cp Makefile.am Makefile.am.tmp}
 %{!?with_fsck:sed -e 's/ fsck / /' Makefile.am.tmp > Makefile.am}
 
diff --git a/jfsutils-format-security.patch b/jfsutils-format-security.patch
new file mode 100644
index 0000000..9a15bc4
--- /dev/null
+++ b/jfsutils-format-security.patch
@@ -0,0 +1,37 @@
+--- jfsutils-1.1.15/fscklog/display.c.formatsec	2013-02-16 12:14:55.373045011 +0100
++++ jfsutils-1.1.15/fscklog/display.c	2013-02-16 12:15:17.429592187 +0100
+@@ -182,7 +182,7 @@ void dump_service_log()
+ 				} else {
+ 					/* the record looks ok */
+ 					msg_txt = &log_entry[log_entry_pos];
+-					printf(msg_txt);
++					fputs(msg_txt, stdout);
+ 					/*
+ 					 * set up for the next record
+ 					 */
+--- jfsutils-1.1.15/fscklog/fscklog.c.formatsec	2013-02-16 12:14:10.863286141 +0100
++++ jfsutils-1.1.15/fscklog/fscklog.c	2013-02-16 12:14:47.609753735 +0100
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	fputs(msg_string, stdout);
++	fputs(debug_detail, stdout);
+ 
+ 	return 0;
+ }
+--- jfsutils-1.1.15/logdump/helpers.c.formatsec	2013-02-16 12:21:02.697721709 +0100
++++ jfsutils-1.1.15/logdump/helpers.c	2013-02-16 12:21:25.810929827 +0100
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const c
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	fputs(msg_string, stdout);
++	fputs(debug_detail, stdout);
+ 
+ 	return 0;
+ }
diff --git a/jfsutils-includes.patch b/jfsutils-includes.patch
new file mode 100644
index 0000000..6c5c826
--- /dev/null
+++ b/jfsutils-includes.patch
@@ -0,0 +1,11 @@
+--- jfsutils-1.1.15/libfs/devices.h.includes	2013-02-16 12:19:05.908354452 +0100
++++ jfsutils-1.1.15/libfs/devices.h	2013-02-16 12:19:25.818246550 +0100
+@@ -18,6 +18,8 @@
+ #ifndef H_DEVICES
+ #define H_DEVICES
+ 
++#include <stdint.h>
++
+ #define GET	0
+ #define PUT	1
+ #define VRFY	2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jfsutils.git/commitdiff/6c6c732eaafa0c06bebdfa815d49c9d6da93cbfe



More information about the pld-cvs-commit mailing list