Attachment 909564 Details for Bug 1037064 – fix

[patch] fix

0001-fix-syslog-calls-to-have-string-format.patch (text/plain), 3.04 KB, created by Marcin Juszkiewicz on 2014-06-17 12:08:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Juszkiewicz

Created: 2014-06-17 12:08:21 UTC

Size: 3.04 KB

patch

obsolete

>From 7cf89bd5ff019f485e0ad456b05d1432ea52edf6 Mon Sep 17 00:00:00 2001
>From: Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
>Date: Tue, 17 Jun 2014 14:03:09 +0200
>Subject: [PATCH] fix syslog() calls to have string format
>
>---
> flow-tools.spec       |  7 ++++++-
> flow-werror-fix.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 55 insertions(+), 1 deletion(-)
> create mode 100644 flow-werror-fix.patch
>
>diff --git a/flow-tools.spec b/flow-tools.spec
>index ccb219b..0245e0c 100644
>--- a/flow-tools.spec
>+++ b/flow-tools.spec
>@@ -7,13 +7,14 @@
> Version: 0.68.5.1
> Name: flow-tools
> Summary: Tool set for working with NetFlow data
>-Release: 13%{?dist}
>+Release: 14%{?dist}
> Group: Applications/System
> License: BSD 
> URL: http://code.google.com/p/%{name}/
> Source0: http://%{name}.googlecode.com/files/%{name}-%{version}.tar.bz2
> Source1: flow-capture.service
> Source2: flow-capture.sysconfig
>+Patch0:  flow-werror-fix.patch
> BuildRequires: openssl-devel mysql-devel postgresql-devel zlib-devel 
> BuildRequires: bison flex tcp_wrappers-devel
> BuildRequires: doxygen
>@@ -88,6 +89,7 @@ This package contains additional documentation, such as man pages in html format
> 
> %prep
> %setup -q
>+%patch0 -p1
> 
> %build
> %configure \
>@@ -213,6 +215,9 @@ exit 0
> %doc docs/*.html ChangeLog.old TODO INSTALL SECURITY
> 
> %changelog
>+* Tue Jun 17 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> - 0.68.5.1-14
>+- fix syslog() calls to have string format
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.68.5.1-13
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/flow-werror-fix.patch b/flow-werror-fix.patch
>new file mode 100644
>index 0000000..59b1349
>--- /dev/null
>+++ b/flow-werror-fix.patch
>@@ -0,0 +1,49 @@
>+diff --git a/lib/fterr.c b/lib/fterr.c
>+index 1bb5c89..5b47207 100644
>+--- a/lib/fterr.c
>++++ b/lib/fterr.c
>+@@ -112,7 +112,7 @@ void fterr_info(const char *fmt, ...)
>+     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 @@ void fterr_err(int code, const char *fmt, ...)
>+ 
>+   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 @@ void fterr_errx(int code, const char *fmt, ...)
>+   }
>+ 
>+   if (fterr_flags & FTERR_SYSLOG)
>+-    syslog(LOG_INFO, buf);
>++    syslog(LOG_INFO, "%s", buf);
>+ 
>+   if (fterr_exit)
>+     fterr_exit(code);
>+@@ -183,7 +183,7 @@ void fterr_warnx(const char *fmt, ...)
>+   }
>+ 
>+   if (fterr_flags & FTERR_SYSLOG)
>+-    syslog(LOG_INFO, buf);
>++    syslog(LOG_INFO, "%s", buf);
>+ 
>+ } /* fterr_warnx */
>+ 
>+@@ -205,7 +205,7 @@ void fterr_warn(const char *fmt, ...)
>+ 
>+   if (fterr_flags & FTERR_SYSLOG) {
>+     snprintf(buf2, 1024, "%s: %s", buf, strerror(errno));
>+-    syslog(LOG_INFO, buf2);
>++    syslog(LOG_INFO, "%s", buf2);
>+   }
>+ 
>+ } /* fterr_warn */
>-- 
>2.0.0
>

Actions: View | Diff

Attachments on bug 1037064: 909564