[gkrellm] Fix build with -Werror=format-security (#1037086).
Ville Skyttä
scop at fedoraproject.org
Fri Dec 6 21:05:41 UTC 2013
commit 76b0d2a98074e7d522ae06a792c98933146ac013
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Dec 6 23:05:35 2013 +0200
Fix build with -Werror=format-security (#1037086).
gkrellm-2.3.5-syslogfmt-1037086.patch | 12 ++++++++++++
gkrellm.spec | 8 +++++++-
2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/gkrellm-2.3.5-syslogfmt-1037086.patch b/gkrellm-2.3.5-syslogfmt-1037086.patch
new file mode 100644
index 0000000..3e0265a
--- /dev/null
+++ b/gkrellm-2.3.5-syslogfmt-1037086.patch
@@ -0,0 +1,12 @@
+diff -up gkrellm-2.3.5/server/main.c~ gkrellm-2.3.5/server/main.c
+--- gkrellm-2.3.5/server/main.c~ 2010-10-02 19:13:29.000000000 +0300
++++ gkrellm-2.3.5/server/main.c 2013-12-06 22:56:38.690534043 +0200
+@@ -187,7 +187,7 @@ static void gkrellmd_syslog_log(GLogLeve
+ if (log_level & G_LOG_LEVEL_CRITICAL)
+ facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
+
+- syslog(facility_priority, message);
++ syslog(facility_priority, "%s", message);
+ #endif // defined(WIN32)
+ } // gkrellmd_syslog_log()
+
diff --git a/gkrellm.spec b/gkrellm.spec
index ca36b85..4cd4167 100644
--- a/gkrellm.spec
+++ b/gkrellm.spec
@@ -2,7 +2,7 @@
Name: gkrellm
Version: 2.3.5
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: Multiple stacked system monitors in one process
License: GPLv3+
URL: http://www.gkrellm.net/
@@ -10,6 +10,8 @@ Source0: http://members.dslextreme.com/users/billw/gkrellm/%{name}-%{vers
Source1: gkrellmd.service
Source2: gkrellm.desktop
Source3: gkrellm.png
+# Sent upstream 2013-12-06
+Patch0: gkrellm-2.3.5-syslogfmt-1037086.patch
# The next time gkrellmd.conf changes after 2.3.5-5, remember to set it
# config(noreplace) again.
Patch1: gkrellm-2.3.5-config.patch
@@ -55,6 +57,7 @@ Development files for the GNU Krell Monitors.
%prep
%setup -q
+%patch0 -p1 -z .syslogfmt
%patch1 -p1 -z .config
%patch2 -p1 -z .sansfont
%patch3 -p1 -z .width
@@ -161,6 +164,9 @@ systemctl daemon-reload &>/dev/null
%changelog
+* Fri Dec 6 2013 Ville Skyttä <ville.skytta at iki.fi> - 2.3.5-15
+- Fix build with -Werror=format-security (#1037086).
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list