rpms/openhpi-subagent/devel openhpi-subagent-2.3.4-format.patch, 1.1, 1.2 openhpi-subagent.spec, 1.7, 1.8

Dan Horák sharkcz at fedoraproject.org
Mon Oct 26 10:15:16 UTC 2009


Author: sharkcz

Update of /cvs/pkgs/rpms/openhpi-subagent/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22455

Modified Files:
	openhpi-subagent-2.3.4-format.patch openhpi-subagent.spec 
Log Message:
* Mon Oct 26 2009 Dan Horák <dan[at]danny.cz> - 2.3.4-9
- little update to the format patch for i386


openhpi-subagent-2.3.4-format.patch:
 saHpiAnnouncementTable.c      |    4 ++--
 saHpiAreaTable.c              |    2 +-
 saHpiAutoInsertTimeoutTable.c |    2 +-
 saHpiDomainInfoTable.c        |    2 +-
 saHpiDomainReferenceTable.c   |    2 +-
 saHpiEventLogInfoTable.c      |    2 +-
 saHpiFieldTable.c             |    2 +-
 saHpiHotSwapTable.c           |    2 +-
 saHpiRdrTable.c               |    6 +++---
 saHpiResourceTable.c          |   10 +++++-----
 saHpiUserEventLogTable.c      |    2 +-
 saHpiUserEventTable.c         |    2 +-
 12 files changed, 19 insertions(+), 19 deletions(-)

Index: openhpi-subagent-2.3.4-format.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent-2.3.4-format.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openhpi-subagent-2.3.4-format.patch	23 Oct 2009 12:35:42 -0000	1.1
+++ openhpi-subagent-2.3.4-format.patch	26 Oct 2009 10:15:15 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAnnouncementTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAnnouncementTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -429,7 +429,7 @@ int announcement_add (saHpiAnnouncementT
                  if (rc != SA_OK) {
                          DEBUGMSGTL ((AGENT, 
@@ -21,7 +21,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                  }
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c openhpi-subagent-2.3.4/src/saHpiAreaTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAreaTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAreaTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1111,7 +1111,7 @@ void saHpiAreaTable_set_reserve1( netsnm
                                          dri_entry->entry_id++;
                                  } else {
@@ -33,7 +33,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                          rc = SNMP_ERR_WRONGVALUE;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiAutoInsertTimeoutTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiAutoInsertTimeoutTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -587,7 +587,7 @@ void saHpiAutoInsertTimeoutTable_set_res
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -45,7 +45,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
          break;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiDomainInfoTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c	2009-10-23 13:33:55.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainInfoTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -350,7 +350,7 @@ int handle_saHpiDomainInfoActiveEntries(
                            netsnmp_agent_request_info   *reqinfo,
                            netsnmp_request_info         *requests)
@@ -57,7 +57,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
      /* We are never called for a GETNEXT if it's registered as a
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiDomainReferenceTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiDomainReferenceTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -220,7 +220,7 @@ handle_saHpiDomainReferenceActiveEntries
                            netsnmp_request_info         *requests)
  {
@@ -69,7 +69,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
      domain_reference_entry_count = CONTAINER_SIZE (cb.container);
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiEventLogInfoTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiEventLogInfoTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1184,7 +1184,7 @@ void saHpiEventLogInfoTable_set_reserve1
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -81,7 +81,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
  
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c openhpi-subagent-2.3.4/src/saHpiFieldTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiFieldTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiFieldTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1409,7 +1409,7 @@ void saHpiFieldTable_set_reserve1( netsn
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));
@@ -93,7 +93,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                           "ERROR: saHpiFieldTable_set_reserve1() User specified FieldId invalid!!!\n"));
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiHotSwapTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiHotSwapTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -997,7 +997,7 @@ void saHpiHotSwapTable_set_reserve1( net
                              rc = SNMP_ERR_WRONGLENGTH;
                              DEBUGMSGTL ((AGENT, 
@@ -105,7 +105,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
              break;
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c openhpi-subagent-2.3.4/src/saHpiRdrTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiRdrTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiRdrTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -492,7 +492,7 @@ int populate_saHpiRdrTable(SaHpiSessionI
  	
  	rdr_entry_count = CONTAINER_SIZE (cb.container);
@@ -128,16 +128,18 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                          row_idx = CONTAINER_NEXT(cb.container, row_idx);
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c openhpi-subagent-2.3.4/src/saHpiResourceTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiResourceTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c	2009-10-23 13:34:12.000000000 +0200
-@@ -254,7 +254,7 @@ int populate_saHpiResourceTable(SaHpiSes
++++ openhpi-subagent-2.3.4/src/saHpiResourceTable.c	2009-10-26 11:04:07.000000000 +0100
+@@ -254,8 +254,8 @@ int populate_saHpiResourceTable(SaHpiSes
  
  		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable RptEntry.ResourceTag.DataLength rv = %d\n", 
                               RptEntry.ResourceTag.DataLength));
 -		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %d\n", 
+-                             strlen((const char *)RptEntry.ResourceTag.Data))); 
 +		DEBUGMSGTL ((AGENT, "populate_saHpiResourceTable strlen(RptEntry.ResourceTag.Data) rv = %ld\n", 
-                              strlen((const char *)RptEntry.ResourceTag.Data))); 
++                             (long)strlen((const char *)RptEntry.ResourceTag.Data))); 
  
  
+ 		/** INTEGER = ASN_INTEGER */
 @@ -322,7 +322,7 @@ int populate_saHpiResourceTable(SaHpiSes
  
  	resource_entry_count = CONTAINER_SIZE (cb.container);
@@ -167,7 +169,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
  	/* We are never called for a GETNEXT if it's registered as a
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiUserEventLogTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventLogTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1076,7 +1076,7 @@ void saHpiUserEventLogTable_set_reserve1
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));
@@ -179,7 +181,7 @@ diff -Nrup openhpi-subagent-2.3.4.orig/s
                                           "ERROR: saHpiUserEventLogTable_set_reserve1() "
 diff -Nrup openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c openhpi-subagent-2.3.4/src/saHpiUserEventTable.c
 --- openhpi-subagent-2.3.4.orig/src/saHpiUserEventTable.c	2006-09-13 17:41:26.000000000 +0200
-+++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c	2009-10-23 13:34:12.000000000 +0200
++++ openhpi-subagent-2.3.4/src/saHpiUserEventTable.c	2009-10-26 11:04:01.000000000 +0100
 @@ -1158,7 +1158,7 @@ void saHpiUserEventTable_set_reserve1( n
                      } else {
                              DEBUGMSGTL ((AGENT,"***********************************************\n"));


Index: openhpi-subagent.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openhpi-subagent/devel/openhpi-subagent.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- openhpi-subagent.spec	23 Oct 2009 12:35:42 -0000	1.7
+++ openhpi-subagent.spec	26 Oct 2009 10:15:15 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           openhpi-subagent
 Version:        2.3.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        NetSNMP subagent for OpenHPI
 
 Group:          System Environment/Base
@@ -69,6 +69,9 @@ fi
 %{_datadir}/snmp/mibs/*.mib
 
 %changelog
+* Mon Oct 26 2009 Dan Horák <dan[at]danny.cz> - 2.3.4-9
+- little update to the format patch for i386
+
 * Fri Oct 23 2009 Dan Horák <dan[at]danny.cz> - 2.3.4-8
 - fix build with net-snmp >= 5.5 (#524263)
 




More information about the fedora-extras-commits mailing list