From 984b0e58eeb3298794ecd5e76a7ccd5b2650966e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C5=A0afr=C3=A1nek?= Date: Mon, 20 Oct 2008 11:56:31 +0000 Subject: [PATCH] remove obsolete patches --- OpenIPMI-2.0.6-badheader.patch | 20 ---------- ipmitool-1.8.7-peftime.patch | 36 ----------------- ipmitool-1.8.9-open.patch | 72 ---------------------------------- 3 files changed, 128 deletions(-) delete mode 100644 OpenIPMI-2.0.6-badheader.patch delete mode 100644 ipmitool-1.8.7-peftime.patch delete mode 100644 ipmitool-1.8.9-open.patch diff --git a/OpenIPMI-2.0.6-badheader.patch b/OpenIPMI-2.0.6-badheader.patch deleted file mode 100644 index 6db016e..0000000 --- a/OpenIPMI-2.0.6-badheader.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- OpenIPMI-2.0.6/ipmitool-1.8.9/src/plugins/open/open.c.foo 2006-06-16 12:13:58.000000000 -0400 -+++ OpenIPMI-2.0.6/ipmitool-1.8.9/src/plugins/open/open.c 2006-06-16 12:19:09.000000000 -0400 -@@ -50,7 +50,6 @@ - #endif - - #if defined(HAVE_OPENIPMI_H) --# include - # include - #elif defined(HAVE_FREEBSD_IPMI_H) - /* FreeBSD OpenIPMI-compatible header */ ---- OpenIPMI-2.0.6/ipmitool-1.8.9/src/ipmievd.c.foo 2006-06-16 12:14:18.000000000 -0400 -+++ OpenIPMI-2.0.6/ipmitool-1.8.9/src/ipmievd.c 2006-06-16 12:14:22.000000000 -0400 -@@ -54,7 +54,6 @@ - - #ifdef IPMI_INTF_OPEN - # if defined(HAVE_OPENIPMI_H) --# include - # include - # elif defined(HAVE_FREEBSD_IPMI_H) - # include diff --git a/ipmitool-1.8.7-peftime.patch b/ipmitool-1.8.7-peftime.patch deleted file mode 100644 index 140e715..0000000 --- a/ipmitool-1.8.7-peftime.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- ipmitool-1.8.7/lib/ipmi_pef.c.peftime 2006-05-16 11:39:00.000000000 +0200 -+++ ipmitool-1.8.7/lib/ipmi_pef.c 2006-05-16 11:39:19.000000000 +0200 -@@ -731,6 +731,7 @@ - struct pef_cfgparm_selector psel; - char tbuf[40]; - time_t ts; -+ uint32_t timei; - - memset(&req, 0, sizeof(req)); - req.msg.netfn = IPMI_NETFN_SE; -@@ -741,11 +742,11 @@ - "Last S/W processed ID"); - return; - } -+ memcpy(&timei, rsp->data, 4); - #if WORDS_BIGENDIAN -- ts = (time_t)(rsp->data[0]<<24 + rsp->data[1]<<16 + rsp->data[2]<<8 + rsp->data[3]); --#else -- ts = (time_t)(*(long *)rsp->data); -+ timei = BSWAP_32(timei); - #endif -+ ts = (time_t)timei; - strftime(tbuf, sizeof(tbuf), "%m/%d/%Y %H:%M:%S", localtime(&ts)); - - ipmi_pef_print_str("Last SEL addition", tbuf); ---- ipmitool-1.8.7/lib/ipmi_sel.c.peftime 2006-05-16 11:39:06.000000000 +0200 -+++ ipmitool-1.8.7/lib/ipmi_sel.c 2006-05-16 11:39:20.000000000 +0200 -@@ -1501,7 +1501,7 @@ - - memcpy(&timei, rsp->data, 4); - #if WORDS_BIGENDIAN -- timei = BSWAP_32(time); -+ timei = BSWAP_32(timei); - #endif - time = (time_t)timei; - diff --git a/ipmitool-1.8.9-open.patch b/ipmitool-1.8.9-open.patch deleted file mode 100644 index 5bc9e67..0000000 --- a/ipmitool-1.8.9-open.patch +++ /dev/null @@ -1,72 +0,0 @@ -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);