- fix format string errors

- rel 5

diff --git a/flow-tools.spec b/flow-tools.spec
index 1750a867855010d35b6dc7bafe2f71b22f3a348d..e291c01ba3fe425611082ce83a57c4dc8a6ff9e0 100644 (file)
--- a/flow-tools.spec
+++ b/flow-tools.spec
@@ -2,12 +2,13 @@ Summary:      Collecting and processing NetFlow data
 Summary(pl.UTF-8):     Gromadzenie i przetwarzanie informacji o przepływie w sieci
 Name:          flow-tools
 Version:       0.68.5
-Release:       4
+Release:       5
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://flow-tools.googlecode.com/files/%{name}-%{version}.tar.bz2
 # Source0-md5: 3c5e75da2822ab6b4947c928c09ea365
 Patch0:                %{name}-shebang.patch
+Patch1:                format-security.patch
 URL:           http://code.google.com/p/flow-tools/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -69,8 +70,8 @@ Statyczna biblioteka flow-tools.
 
 %prep
 %setup -q
-
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/format-security.patch b/format-security.patch
new file mode 100644 (file)
index 0000000..aa10cda
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,47 @@
+--- flow-tools-0.68.5/lib/fterr.c~     2008-01-27 21:48:49.000000000 +0100
++++ flow-tools-0.68.5/lib/fterr.c      2018-03-18 23:16:48.649159418 +0100
+@@ -112,7 +112,7 @@
+     fprintf(((fterr_file) ? fterr_file : stderr), "%s\n", buf2);
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s" ,buf);
+ 
+ } /* fterr_info */
+ 
+@@ -134,7 +134,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+   if (fterr_exit)
+@@ -159,7 +159,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+   if (fterr_exit)
+     fterr_exit(code);
+@@ -183,7 +183,7 @@
+   }
+ 
+   if (fterr_flags & FTERR_SYSLOG)
+-    syslog(LOG_INFO, buf);
++    syslog(LOG_INFO, "%s", buf);
+ 
+ } /* fterr_warnx */
+ 
+@@ -205,7 +205,7 @@
+ 
+   if (fterr_flags & FTERR_SYSLOG) {
+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
+-    syslog(LOG_INFO, buf2);
++    syslog(LOG_INFO, "%s", buf2);
+   }
+ 
+ } /* fterr_warn */