rpms/openhpi/devel openhpi-2.0.3-gcc4.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 openhpi.spec, 1.14, 1.15 sources, 1.4, 1.5 openhpi-1.9.2-gcc4.patch, 1.6, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Mar 30 13:42:32 UTC 2005
Update of /cvs/dist/rpms/openhpi/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29401
Modified Files:
.cvsignore openhpi.spec sources
Added Files:
openhpi-2.0.3-gcc4.patch
Removed Files:
openhpi-1.9.2-gcc4.patch
Log Message:
- Moved the pkgconfig files to the devel package (#152507)
- Update to openhpi-2.0.3
- Had to manually disable ipmi support for now until openhpi builds correctly
against it again
- Dropped net-snmp-config patch, not needed anymore
openhpi-2.0.3-gcc4.patch:
hpi_shell/commands.c | 6 +++---
hpi_ui_lib/service.c | 10 +++++-----
hpi_ui_lib/show.c | 8 ++++----
plugins/ipmi/t/ipmi_thres_test.c | 2 +-
plugins/sysfs/sysfs2hpi.c | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
--- NEW FILE openhpi-2.0.3-gcc4.patch ---
--- openhpi-2.0.3/hpi_ui_lib/service.c.gcc4 2005-03-30 15:14:07.000000000 +0200
+++ openhpi-2.0.3/hpi_ui_lib/service.c 2005-03-30 15:22:17.000000000 +0200
@@ -136,7 +136,7 @@
if (rv != SA_OK) return(-1);
break;
};
- strncpy(buf, tmpbuf.Data, bufsize);
+ strncpy(buf, (const char *)tmpbuf.Data, bufsize);
return(SA_OK);
}
@@ -228,7 +228,7 @@
oh_range_mask(val, buf, bufsize);
return(SA_OK);
};
- strncpy(buf, tbuf.Data, bufsize);
+ strncpy(buf, (const char *)tbuf.Data, bufsize);
return(SA_OK);
}
@@ -308,7 +308,7 @@
att[i++].value.i = obj->ResourceFailed;
len = obj->ResourceTag.DataLength;
if (len > 0) {
- att[i++].value.s = obj->ResourceTag.Data;
+ att[i++].value.s = (char *)obj->ResourceTag.Data;
obj->ResourceTag.Data[len] = 0;
att[i++].value.i = len;
att[i++].value.i = obj->ResourceTag.DataType;
@@ -562,7 +562,7 @@
at2->Attrs = att2;
att2[0].value.i = stream->Default.Repeat;
att2[1].value.i = stream->Default.StreamLength;
- att2[2].value.s = stream->Default.Stream;
+ att2[2].value.s = (char *)stream->Default.Stream;
att1[3].value.a = at2;
break;
case SAHPI_CTRL_TYPE_TEXT:
@@ -697,7 +697,7 @@
};
len = obj->IdString.DataLength;
if (len > 0) {
- att[i++].value.s = obj->IdString.Data;
+ att[i++].value.s = (char *)obj->IdString.Data;
obj->IdString.Data[len] = 0;
att[i++].value.i = len;
att[i++].value.i = obj->IdString.DataType;
--- openhpi-2.0.3/hpi_ui_lib/show.c.gcc4 2005-03-30 15:22:44.000000000 +0200
+++ openhpi-2.0.3/hpi_ui_lib/show.c 2005-03-30 15:24:07.000000000 +0200
@@ -369,7 +369,7 @@
if (len > 0) {
rdr.IdString.Data[len] = 0;
strcat(buf, " Tag: ");
- strcat(buf, rdr.IdString.Data);
+ strcat(buf, (const char *)rdr.IdString.Data);
};
strcat(buf, "\n");
if (proc(buf) != 0)
@@ -489,7 +489,7 @@
len = rpt_entry.ResourceTag.DataLength;
if (len > 0) {
rpt_entry.ResourceTag.Data[len] = 0;
- strcat(buf, rpt_entry.ResourceTag.Data);
+ strcat(buf, (const char *)rpt_entry.ResourceTag.Data);
strcat(buf, ":");
};
strcat(buf, "{");
@@ -636,7 +636,7 @@
snprintf(buf1, 32, "STATE(%4.4x)", sen->EventState);
str1 = buf1;
} else
- str1 = tmbuf.Data;
+ str1 = (char *)tmbuf.Data;
snprintf(buf, SHOW_BUF_SZ, "%s %d/%d %s %s %s:%s",
oh_lookup_sensortype(sen->SensorType),
event->Source, sen->SensorNum,
@@ -757,7 +757,7 @@
};
str = oh_lookup_idrfieldtype(field.Type);
if (str == NULL) str = "Unknown";
- if (field.Field.DataLength > 0) str1 = field.Field.Data;
+ if (field.Field.DataLength > 0) str1 = (char *)field.Field.Data;
else str1 = "";
snprintf(buf, SHOW_BUF_SZ, " Field: %d Type: %s Read Only: %d (%s)\n",
field.FieldId, str, field.ReadOnly, str1);
--- openhpi-2.0.3/plugins/ipmi/t/ipmi_thres_test.c.gcc4 2005-03-30 15:25:09.000000000 +0200
+++ openhpi-2.0.3/plugins/ipmi/t/ipmi_thres_test.c 2005-03-30 15:25:28.000000000 +0200
@@ -80,7 +80,7 @@
printf("%s %10.3f\n", mes, item->Value.SensorFloat64);
return;
case SAHPI_SENSOR_READING_TYPE_BUFFER:
- val = item->Value.SensorBuffer;
+ val = (char *)item->Value.SensorBuffer;
if (val != NULL)
printf("%s %s\n", mes, val);
return;
--- openhpi-2.0.3/plugins/sysfs/sysfs2hpi.c.gcc4 2005-03-30 15:29:04.000000000 +0200
+++ openhpi-2.0.3/plugins/sysfs/sysfs2hpi.c 2005-03-30 15:32:30.000000000 +0200
@@ -213,7 +213,7 @@
{
struct sensor *s;
struct oh_event *e;
- unsigned char strinput[SYSFS_NAME_LEN];
+ char strinput[SYSFS_NAME_LEN];
int puid;
SaHpiSensorDataFormatT *frmt;
@@ -526,7 +526,7 @@
e->u.res_event.entry.ResourceTag.DataType = SAHPI_TL_TYPE_ASCII6;
e->u.res_event.entry.ResourceTag.Language = SAHPI_LANG_ENGLISH;
e->u.res_event.entry.ResourceTag.DataLength = strlen(r->name);
- strcpy(e->u.res_event.entry.ResourceTag.Data, r->name);
+ strcpy((char *)e->u.res_event.entry.ResourceTag.Data, r->name);
/* add resource */
if (0 != oh_add_resource(inst->rptcache, &(e->u.res_event.entry), NULL, 0)) {
--- openhpi-2.0.3/hpi_shell/commands.c.gcc4 2005-03-30 15:37:19.000000000 +0200
+++ openhpi-2.0.3/hpi_shell/commands.c 2005-03-30 15:37:56.000000000 +0200
@@ -552,7 +552,7 @@
printf("Invalid tag: %s\n", buf);
return(-1);
};
- strcpy(tbuf.Data, str);
+ strcpy((char *)tbuf.Data, str);
tbuf.DataType = SAHPI_TL_TYPE_TEXT;
tbuf.Language = SAHPI_LANG_ENGLISH;
tbuf.DataLength = i;
@@ -1393,7 +1393,7 @@
field.Field.Language = SAHPI_LANG_ENGLISH;
field.Field.DataLength = i;
if (i > 0)
- strcpy(field.Field.Data, buf);
+ strcpy((char *)field.Field.Data, buf);
rv = saHpiIdrFieldAdd(sessionId, rptid, rdrnum, &field);
if (rv != SA_OK) {
printf("ERROR!!! saHpiIdrFieldAdd: %s\n", oh_lookup_error(rv));
@@ -1465,7 +1465,7 @@
field.Field.DataType = SAHPI_TL_TYPE_TEXT;
field.Field.Language = SAHPI_LANG_ENGLISH;
field.Field.DataLength = i;
- strcpy(field.Field.Data, buf);
+ strcpy((char *)field.Field.Data, buf);
};
rv = saHpiIdrFieldSet(sessionId, rptid, rdrnum, &field);
if (rv != SA_OK) {
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 14 Feb 2005 11:12:17 -0000 1.4
+++ .cvsignore 30 Mar 2005 13:42:30 -0000 1.5
@@ -1,2 +1 @@
-openhpi-1.9.2.tar.gz
-openhpi-2.0.0.tar.gz
+openhpi-2.0.3.tar.gz
Index: openhpi.spec
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/openhpi.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openhpi.spec 17 Mar 2005 14:22:38 -0000 1.14
+++ openhpi.spec 30 Mar 2005 13:42:30 -0000 1.15
@@ -1,17 +1,16 @@
Summary: openhpi Hardware Platform Interface (HPI) library and tools
Name: openhpi
-Version: 1.9.2
-Release: 5
+Version: 2.0.3
+Release: 1
License: BSD
Group: System Environment/Base
Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
Patch1: openhpi-1.9.2-rebuild.patch
-Patch2: openhpi-1.9.2-net_snmp_config.patch
-Patch3: openhpi-1.9.2-overflow.patch
-Patch4: openhpi-1.9.2-werror.patch
-Patch5: openhpi-1.9.2-gcc4.patch
+Patch2: openhpi-1.9.2-overflow.patch
+Patch3: openhpi-1.9.2-werror.patch
+Patch4: openhpi-2.0.3-gcc4.patch
BuildRoot: /var/tmp/%{name}-root
-BuildRequires: sysfsutils-devel, net-snmp-devel, OpenIPMI-devel, elfutils-devel
+BuildRequires: sysfsutils-devel, net-snmp-devel, OpenIPMI-devel, elfutils-devel, rpm-devel
ExcludeArch: ia64
%description
@@ -40,13 +39,12 @@
%prep
%setup -q
%patch1 -p1 -b .rebuild
-%patch2 -p1 -b .net_snmp_config
-%patch3 -p1 -b .overflow
-%patch4 -p1 -b .werror
-%patch5 -p1 -b .gcc4
+%patch2 -p1 -b .overflow
+%patch3 -p1 -b .werror
+%patch4 -p1 -b .gcc4
%build
-%configure --disable-dummy
+%configure --disable-dummy --disable-ipmi
make
%install
@@ -66,16 +64,23 @@
%{_bindir}/*
%{_libdir}/*.so
%{_libdir}/openhpi
-%{_libdir}/pkgconfig/*
%files devel
%defattr(-,root,root)
%{_libdir}/*.so.*
%{_libdir}/*.a
%{_includedir}/openhpi
+%{_libdir}/pkgconfig/*
%changelog
+* Wed Mar 30 2005 Phil Knirsch <pknirsch at redhat.com> 2.0.3-1
+- Moved the pkgconfig files to the devel package (#152507)
+- Update to openhpi-2.0.3
+- Had to manually disable ipmi support for now until openhpi builds correctly
+ against it again
+- Dropped net-snmp-config patch, not needed anymore
+
* Thu Mar 17 2005 Phil Knirsch <pknirsch at redhat.com> 1.9.2-5
- Fixed gcc4 rebuild problems
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/openhpi/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 14 Feb 2005 11:12:17 -0000 1.4
+++ sources 30 Mar 2005 13:42:30 -0000 1.5
@@ -1,2 +1 @@
-5830e88f321bc8eb72fa0b2584364c67 openhpi-1.9.2.tar.gz
-68c185cb4c6258cf81d1b80ed1e5452d openhpi-2.0.0.tar.gz
+c2160d02241b1d2f03c91586bbb44128 openhpi-2.0.3.tar.gz
--- openhpi-1.9.2-gcc4.patch DELETED ---
More information about the fedora-cvs-commits
mailing list