From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 14 Jul 2013 18:19:41 +0000 (+0200)
Subject: - fix format string error
X-Git-Tag: auto/th/apcupsd-3.14.10-3
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=4ed79b5588673f8281e41cc7a11245dfc08a09f4;p=packages%2Fapcupsd.git

- fix format string error
- rel 3
---

diff --git a/apcupsd.spec b/apcupsd.spec
index 16f1715..5409d5b 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -11,7 +11,7 @@ Summary:	Power management software for APC UPS hardware
 Summary(pl.UTF-8):	Oprogramowanie do zarządzania energią dla UPS-ów APC
 Name:		apcupsd
 Version:	3.14.10
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
@@ -21,13 +21,14 @@ Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-configure.patch
 Patch1:		%{name}-pcnet-seconds.patch
+Patch2:		format-security.patch
 URL:		http://www.apcupsd.com/
 %{?with_gapcmon:BuildRequires:	GConf2-devel >= 2.0}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gd-devel
 %{?with_gapcmon:BuildRequires:	gtk+2-devel >= 2:2.4.0}
-BuildRequires:	man
+BuildRequires:	man-db
 %{?with_snmp:BuildRequires:	net-snmp-devel}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -89,6 +90,7 @@ serwera NIS. Status każdego UPS-a przedstawia ikona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 for i in configure.in aclocal.m4 config.h.in; do install autoconf/$i .;done
 cp -f %{_datadir}/automake/config.sub autoconf
 
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..569e290
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,19 @@
+--- apcupsd-3.14.10/src/gapcmon/gapcmon.c~	2008-09-16 06:58:20.000000000 +0200
++++ apcupsd-3.14.10/src/gapcmon/gapcmon.c	2013-07-14 20:18:41.520640348 +0200
+@@ -2883,15 +2883,9 @@
+ static void gapc_util_log_app_msg(gchar * pch_func, gchar * pch_topic,
+    gchar * pch_emsg)
+ {
+-   gchar *pch = NULL;
+-
+    g_return_if_fail(pch_func != NULL);
+ 
+-   pch = g_strdup_printf("%s(%s) emsg=%s", pch_func, pch_topic, pch_emsg);
+-
+-   g_message(pch);
+-
+-   g_free(pch);
++   g_message("%s(%s) emsg=%s", pch_func, pch_topic, pch_emsg);
+ 
+    return;
+ }