[packages/sharutils] - added format patch (fixes build with -Werror=format-security)

qboosh qboosh at pld-linux.org
Wed Apr 24 18:29:25 CEST 2013


commit c70d58aa46960fc1dba623fd7adebf3e1c752f47
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 24 18:29:23 2013 +0200

    - added format patch (fixes build with -Werror=format-security)

 sharutils-format.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++
 sharutils.spec         |  2 ++
 2 files changed, 76 insertions(+)
---
diff --git a/sharutils.spec b/sharutils.spec
index 1eebd4c..428dcda 100644
--- a/sharutils.spec
+++ b/sharutils.spec
@@ -18,6 +18,7 @@ Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 # Source1-md5:	336f405f69324d129a6ccd3b66f8eb6c
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-format.patch
 URL:		http://www.gnu.org/software/sharutils/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake >= 1:1.13
@@ -93,6 +94,7 @@ programlar üzerinden güvenli bir şekilde gönderilebilir.
 %setup -q -a1
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__rm} po/stamp-po
 
diff --git a/sharutils-format.patch b/sharutils-format.patch
new file mode 100644
index 0000000..1ace3ed
--- /dev/null
+++ b/sharutils-format.patch
@@ -0,0 +1,74 @@
+--- sharutils-4.13.5/src/shar.c.orig	2013-04-12 02:35:05.000000000 +0200
++++ sharutils-4.13.5/src/shar.c	2013-04-24 18:19:54.990797675 +0200
+@@ -461,7 +461,7 @@
+ 
+   if (stat (local_name, &struct_stat))
+     {
+-      error (0, errno, local_name);
++      error (0, errno, "%s", local_name);
+       return SHAR_EXIT_FILE_NOT_FOUND;
+     }
+ 
+@@ -470,7 +470,7 @@
+ 
+   if (directory = opendir (local_name), !directory)
+     {
+-      error (0, errno, local_name);
++      error (0, errno, "%s", local_name);
+       return SHAR_EXIT_CANNOT_OPENDIR;
+     }
+ 
+@@ -563,7 +563,7 @@
+ #else
+   if (closedir (directory))
+     {
+-      error (0, errno, local_name);
++      error (0, errno, "%s", local_name);
+       return SHAR_EXIT_CANNOT_OPENDIR;
+     }
+ #endif
+@@ -615,7 +615,7 @@
+ 
+     if (status != 0)
+       {
+-        error (0, errno, local_name_copy);
++        error (0, errno, "%s", local_name_copy);
+         status = SHAR_EXIT_FILE_NOT_FOUND;
+       }
+     else
+@@ -954,7 +954,7 @@
+         free (c_dir);
+       }
+     else
+-      error (0, errno, _("Cannot get current directory name"));
++      error (0, errno, "%s", _("Cannot get current directory name"));
+   }
+ }
+ 
+@@ -2134,7 +2134,7 @@
+        */
+       FILE * fp = freopen ("/dev/null", fwriteonly_mode, stderr);
+       if (fp != stderr)
+-        error (SHAR_EXIT_FAILED, errno,
++        error (SHAR_EXIT_FAILED, errno, "%s", 
+                _("reopening stderr to /dev/null"));
+     }
+ 
+@@ -2200,7 +2200,7 @@
+   if (HAVE_OPT(QUERY_USER))
+     {
+       if (HAVE_OPT(NET_HEADERS))
+-	error (0, 0, _("PLEASE avoid -X shars on Usenet or public networks"));
++	error (0, 0, "%s", _("PLEASE avoid -X shars on Usenet or public networks"));
+ 
+       fputs ("shar_wish=\n", output);
+     }
+@@ -2348,7 +2348,7 @@
+               optionLoadLine (&sharOptions, arg);
+             }
+           else
+-            error (0, errno, arg);
++            error (0, errno, "%s", arg);
+           continue;
+         }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sharutils.git/commitdiff/c70d58aa46960fc1dba623fd7adebf3e1c752f47



More information about the pld-cvs-commit mailing list