rpms/OpenIPMI/devel ipmitool-1.8.9-open.patch, NONE, 1.1 OpenIPMI.spec, 1.42, 1.43

[Phil Knirsch (pknirsch)]

Author: pknirsch

Update of /cvs/pkgs/rpms/OpenIPMI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21337

Modified Files:
	OpenIPMI.spec 
Added Files:
	ipmitool-1.8.9-open.patch 
Log Message:
- Fix rebuild problems due to glibc change
- License review and fixes


ipmitool-1.8.9-open.patch:

--- NEW FILE ipmitool-1.8.9-open.patch ---
diff -up ipmitool-1.8.9/src/ipmievd.c.open ipmitool-1.8.9/src/ipmievd.c
--- ipmitool-1.8.9/src/ipmievd.c.open	2007-08-17 16:27:37.000000000 +0200
+++ ipmitool-1.8.9/src/ipmievd.c	2007-08-17 16:27:52.000000000 +0200
@@ -661,7 +661,7 @@ ipmievd_main(struct ipmi_event_intf * ei
 	 * so error messages are not lost to syslog and
 	 * return code is successfully returned to initscript
 	 */
-	if (eintf->intf->open(eintf->intf) < 0) {
+	if ((eintf->intf->open)(eintf->intf) < 0) {
 		lprintf(LOG_ERR, "Unable to open interface");
 		return -1;
 	}
diff -up ipmitool-1.8.9/src/plugins/lanplus/lanplus.c.open ipmitool-1.8.9/src/plugins/lanplus/lanplus.c
--- ipmitool-1.8.9/src/plugins/lanplus/lanplus.c.open	2007-08-17 16:26:09.000000000 +0200
+++ ipmitool-1.8.9/src/plugins/lanplus/lanplus.c	2007-08-17 16:26:35.000000000 +0200
@@ -2016,7 +2016,7 @@ ipmi_lanplus_send_payload(
 	int                   xmit = 1;
 	time_t                ltime;
 
-	if (!intf->opened && intf->open && intf->open(intf) < 0)
+	if (!intf->opened && intf->open && (intf->open)(intf) < 0)
 		return NULL;
 
 	while (try < session->retry) {
diff -up ipmitool-1.8.9/src/plugins/open/open.c.open ipmitool-1.8.9/src/plugins/open/open.c
--- ipmitool-1.8.9/src/plugins/open/open.c.open	2007-08-17 16:26:58.000000000 +0200
+++ ipmitool-1.8.9/src/plugins/open/open.c	2007-08-17 16:27:10.000000000 +0200
@@ -174,7 +174,7 @@ ipmi_openipmi_send_cmd(struct ipmi_intf 
 	if (intf == NULL || req == NULL)
 		return NULL;
 	if (intf->opened == 0 && intf->open != NULL)
-		if (intf->open(intf) < 0)
+		if ((intf->open)(intf) < 0)
 			return NULL;
 
 	if (verbose > 2)
diff -up ipmitool-1.8.9/src/plugins/lan/lan.c.open ipmitool-1.8.9/src/plugins/lan/lan.c
--- ipmitool-1.8.9/src/plugins/lan/lan.c.open	2007-08-17 16:25:31.000000000 +0200
+++ ipmitool-1.8.9/src/plugins/lan/lan.c	2007-08-17 16:25:46.000000000 +0200
@@ -743,7 +743,7 @@ ipmi_lan_send_cmd(struct ipmi_intf * int
 		intf->opened, intf->open);
 
 	if (intf->opened == 0 && intf->open != NULL) {
-		if (intf->open(intf) < 0) {
+		if ((intf->open)(intf) < 0) {
 			lprintf(LOG_DEBUG, "Failed to open LAN interface");
 			return NULL;
 		}
diff -up ipmitool-1.8.9/lib/ipmi_tsol.c.open ipmitool-1.8.9/lib/ipmi_tsol.c
--- ipmitool-1.8.9/lib/ipmi_tsol.c.open	2007-08-17 16:24:34.000000000 +0200
+++ ipmitool-1.8.9/lib/ipmi_tsol.c	2007-08-17 16:24:47.000000000 +0200
@@ -452,7 +452,7 @@ ipmi_tsol_main(struct ipmi_intf * intf, 
 	 * retrieve local IP address if not supplied on command line
 	 */
 	if (recvip == NULL) {
-		result = intf->open(intf);	/* must connect first */
+		result = (intf->open)(intf);	/* must connect first */
 		if (result < 0)
 			return -1;
 
diff -up ipmitool-1.8.9/lib/ipmi_main.c.open ipmitool-1.8.9/lib/ipmi_main.c
--- ipmitool-1.8.9/lib/ipmi_main.c.open	2007-08-16 18:08:54.000000000 +0200
+++ ipmitool-1.8.9/lib/ipmi_main.c	2007-08-17 16:24:12.000000000 +0200
@@ -594,7 +594,7 @@ ipmi_main(int argc, char ** argv,
 	if (target_addr > 0) {
 		/* need to open the interface first */
 		if (intf->open != NULL)
-			intf->open(intf);
+			(intf->open)(intf);
 		intf->target_addr = target_addr;
 		/* must be admin level to do this over lan */
 		ipmi_intf_session_set_privlvl(intf, IPMI_SESSION_PRIV_ADMIN);


Index: OpenIPMI.spec
===================================================================
RCS file: /cvs/pkgs/rpms/OpenIPMI/devel/OpenIPMI.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- OpenIPMI.spec	24 Apr 2007 14:43:23 -0000	1.42
+++ OpenIPMI.spec	17 Aug 2007 15:42:26 -0000	1.43
@@ -3,14 +3,15 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.11
-Release: 1%{?dist}
-License: GPL
+Release: 2%{?dist}
+License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
 Source: http://prdownloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
 Source2: http://prdownloads.sourceforge.net/ipmitool/ipmitool-%{ipmitoolver}.tar.gz
 Source3: openipmi.sysconf
 Source4: openipmi.initscript
+Patch100: ipmitool-1.8.9-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 PreReq: chkconfig
 BuildPrereq: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
@@ -62,6 +63,8 @@
 
 %prep
 %setup -q -a 2
+pushd ipmitool-%{ipmitoolver}
+%patch100 -p1 -b .open
 
 %build
 %configure --with-pythoninstall=%{python_sitearch}
@@ -160,6 +163,10 @@
 %{_libdir}/*.a
 
 %changelog
+* Fri Aug 17 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-2
+- Fix rebuild problems due to glibc change
+- License review and fixes
+
 * Tue Apr 24 2007 Phil Knirsch <pknirsch at redhat.com> - 2.0.11-1
 - Update to OpenIPMI-2.0.11