Fix sblim-gather FTBFS if -Werror=format-security flag is used
This commit is contained in:
parent
b6091f1fa6
commit
f238a86c71
59
sblim-gather-2.2.8-format-security.patch
Normal file
59
sblim-gather-2.2.8-format-security.patch
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
diff -up sblim-gather-2.2.8/comms/rcctest.c.orig sblim-gather-2.2.8/comms/rcctest.c
|
||||||
|
--- sblim-gather-2.2.8/comms/rcctest.c.orig 2014-02-04 12:53:25.036297751 +0100
|
||||||
|
+++ sblim-gather-2.2.8/comms/rcctest.c 2014-02-04 12:53:43.738362560 +0100
|
||||||
|
@@ -42,7 +42,7 @@ int main(int argc, char *argv[])
|
||||||
|
if (argc == 1) {
|
||||||
|
gethostname((char*)&hostname,sizeof(hostname));
|
||||||
|
} else {
|
||||||
|
- sprintf(hostname,argv[1]);
|
||||||
|
+ sprintf(hostname,"%s",argv[1]);
|
||||||
|
}
|
||||||
|
printf("Contacting %s\n",hostname);
|
||||||
|
if (rcc_init(hostname,&port) < 0 ) {
|
||||||
|
diff -up sblim-gather-2.2.8/gatherctl.c.orig sblim-gather-2.2.8/gatherctl.c
|
||||||
|
--- sblim-gather-2.2.8/gatherctl.c.orig 2013-02-12 02:08:25.000000000 +0100
|
||||||
|
+++ sblim-gather-2.2.8/gatherctl.c 2014-02-04 12:53:06.888233912 +0100
|
||||||
|
@@ -146,5 +146,5 @@ static void printhelp()
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i=0;commands[i];i++)
|
||||||
|
- printf(commands[i]);
|
||||||
|
+ printf("%s",commands[i]);
|
||||||
|
}
|
||||||
|
diff -up sblim-gather-2.2.8/reposctl.c.orig sblim-gather-2.2.8/reposctl.c
|
||||||
|
--- sblim-gather-2.2.8/reposctl.c.orig 2013-02-12 02:08:25.000000000 +0100
|
||||||
|
+++ sblim-gather-2.2.8/reposctl.c 2014-02-04 12:53:06.888233912 +0100
|
||||||
|
@@ -271,7 +271,7 @@ static void printhelp()
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i=0;commands[i];i++)
|
||||||
|
- printf(commands[i]);
|
||||||
|
+ printf("%s",commands[i]);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void printvalue(ValueRequest *vr)
|
||||||
|
@@ -317,7 +317,7 @@ static void printvalue(ValueRequest *vr)
|
||||||
|
printf("%f",*(double*)vr->vsValues[i].viValue);
|
||||||
|
break;
|
||||||
|
case MD_STRING:
|
||||||
|
- printf(vr->vsValues[i].viValue);
|
||||||
|
+ printf("%s",vr->vsValues[i].viValue);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
printf("datatype %0x not supported",vr->vsDataType);
|
||||||
|
diff -up sblim-gather-2.2.8/util/mlog.c.orig sblim-gather-2.2.8/util/mlog.c
|
||||||
|
--- sblim-gather-2.2.8/util/mlog.c.orig 2013-02-12 02:08:25.000000000 +0100
|
||||||
|
+++ sblim-gather-2.2.8/util/mlog.c 2014-02-04 12:53:06.888233912 +0100
|
||||||
|
@@ -52,10 +52,10 @@ void m_log(int priority, int errout, con
|
||||||
|
va_start(ap,fmt);
|
||||||
|
|
||||||
|
vsnprintf(buf,4096,fmt,ap);
|
||||||
|
- syslog(priosysl,buf);
|
||||||
|
+ syslog(priosysl,"%s",buf);
|
||||||
|
|
||||||
|
if (errout) {
|
||||||
|
- fprintf(stderr,buf);
|
||||||
|
+ fprintf(stderr,"%s",buf);
|
||||||
|
}
|
||||||
|
va_end(ap);
|
||||||
|
}
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
Name: sblim-gather
|
Name: sblim-gather
|
||||||
Version: 2.2.8
|
Version: 2.2.8
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: SBLIM Gatherer
|
Summary: SBLIM Gatherer
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -31,6 +31,8 @@ Patch2: sblim-gather-2.2.7-typos.patch
|
|||||||
|
|
||||||
# Patch3: removes version from docdir
|
# Patch3: removes version from docdir
|
||||||
Patch3: sblim-gather-2.2.8-docdir.patch
|
Patch3: sblim-gather-2.2.8-docdir.patch
|
||||||
|
# Patch4: fixes build fail if "-Werror=format-security" flag is used
|
||||||
|
Patch4: sblim-gather-2.2.8-format-security.patch
|
||||||
|
|
||||||
Requires: tog-pegasus >= %{tog_pegasus_version}
|
Requires: tog-pegasus >= %{tog_pegasus_version}
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
@ -88,6 +90,7 @@ tar xfvz %{SOURCE4}
|
|||||||
%patch1 -p1 -b .missing_providers
|
%patch1 -p1 -b .missing_providers
|
||||||
%patch2 -p1 -b .typos
|
%patch2 -p1 -b .typos
|
||||||
%patch3 -p1 -b .docdir
|
%patch3 -p1 -b .docdir
|
||||||
|
%patch4 -p1 -b .format-security
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x ppc ppc64
|
%ifarch s390 s390x ppc ppc64
|
||||||
@ -240,6 +243,10 @@ fi
|
|||||||
%postun provider -p /sbin/ldconfig
|
%postun provider -p /sbin/ldconfig
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 04 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-5
|
||||||
|
- Fix sblim-gather FTBFS if "-Werror=format-security" flag is used
|
||||||
|
Resolves: #1037318
|
||||||
|
|
||||||
* Wed Aug 28 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-4
|
* Wed Aug 28 2013 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.8-4
|
||||||
- Fix for unversioned docdir change
|
- Fix for unversioned docdir change
|
||||||
Resolves: #994086
|
Resolves: #994086
|
||||||
|
Loading…
Reference in New Issue
Block a user