Update to sblim-gather-2.2.9, Use Pegasus root/interop instead of root/PG_Interop
This commit is contained in:
Vitezslav Crhonek
parent
010b34adf9
commit
26ef4dd55f
1
.gitignore
vendored
1
.gitignore
vendored
@ -7,3 +7,4 @@ sblim-gather-2.2.1.tar.bz2
|
||||
/sblim-gather-2.2.7.tar.bz2
|
||||
/missing-providers.tgz
|
||||
/sblim-gather-2.2.8.tar.bz2
|
||||
/sblim-gather-2.2.9.tar.bz2
|
||||
|
||||
@ -1,59 +0,0 @@
|
||||
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);
|
||||
}
|
||||
12
sblim-gather-2.2.9-pegasus-interop.patch
Normal file
12
sblim-gather-2.2.9-pegasus-interop.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up sblim-gather-2.2.9/provider/provider-register.sh.orig sblim-gather-2.2.9/provider/provider-register.sh
|
||||
--- sblim-gather-2.2.9/provider/provider-register.sh.orig 2014-10-13 11:20:01.000000000 +0200
|
||||
+++ sblim-gather-2.2.9/provider/provider-register.sh 2014-10-13 11:41:55.374300205 +0200
|
||||
@@ -216,7 +216,7 @@ pegasus_install()
|
||||
then
|
||||
chatter Registering providers with $state cimserver
|
||||
$CIMMOF -uc -I $mofpath -n $namespace $mymofs &&
|
||||
- $CIMMOF -uc -n root/PG_Interop $_REGFILENAME
|
||||
+ $CIMMOF -uc -n root/interop $_REGFILENAME
|
||||
else
|
||||
echo "Failed to build pegasus registration MOF." >&2
|
||||
return 1
|
||||
@ -3,8 +3,8 @@
|
||||
%global tog_pegasus_version 2:2.6.1-1
|
||||
|
||||
Name: sblim-gather
|
||||
Version: 2.2.8
|
||||
Release: 9%{?dist}
|
||||
Version: 2.2.9
|
||||
Release: 1%{?dist}
|
||||
Summary: SBLIM Gatherer
|
||||
|
||||
Group: Applications/System
|
||||
@ -31,10 +31,10 @@ Patch2: sblim-gather-2.2.7-typos.patch
|
||||
|
||||
# Patch3: removes version from docdir
|
||||
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
|
||||
# Patch5: fixes multilib conflicts
|
||||
Patch5: sblim-gather-2.2.8-multilib.patch
|
||||
# Patch4: fixes multilib conflicts
|
||||
Patch4: sblim-gather-2.2.8-multilib.patch
|
||||
# Patch5: use Pegasus root/interop instead of root/PG_Interop
|
||||
Patch5: sblim-gather-2.2.9-pegasus-interop.patch
|
||||
|
||||
Requires: tog-pegasus >= %{tog_pegasus_version}
|
||||
Requires(post): systemd
|
||||
@ -92,8 +92,8 @@ tar xfvz %{SOURCE4}
|
||||
%patch1 -p1 -b .missing_providers
|
||||
%patch2 -p1 -b .typos
|
||||
%patch3 -p1 -b .docdir
|
||||
%patch4 -p1 -b .format-security
|
||||
%patch5 -p1 -b .multilib
|
||||
%patch4 -p1 -b .multilib
|
||||
%patch5 -p1 -b .pegasus-interop
|
||||
|
||||
%build
|
||||
%ifarch s390 s390x ppc ppc64
|
||||
@ -246,6 +246,10 @@ fi
|
||||
%postun provider -p /sbin/ldconfig
|
||||
|
||||
%changelog
|
||||
* Mon Oct 13 2014 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.9-1
|
||||
- Update to sblim-gather-2.2.9
|
||||
- Use Pegasus root/interop instead of root/PG_Interop
|
||||
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.8-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user