From bba110465cf9c3996ac8ab961c7807e110908a71ace41d17a3453a6e4f9f9814 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 13 Sep 2008 00:28:41 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmitool?expand=0&rev=5 --- compile-fixes | 20 ++++----- ipmitool-1.8.10.tar.bz2 | 3 ++ ipmitool-1.8.9.tar.bz2 | 3 -- ipmitool-POH-scale | 30 -------------- ipmitool-lan-set.patch | 92 ----------------------------------------- ipmitool.changes | 6 +++ ipmitool.spec | 29 ++++++++----- 7 files changed, 37 insertions(+), 146 deletions(-) create mode 100644 ipmitool-1.8.10.tar.bz2 delete mode 100644 ipmitool-1.8.9.tar.bz2 delete mode 100644 ipmitool-POH-scale delete mode 100644 ipmitool-lan-set.patch diff --git a/compile-fixes b/compile-fixes index 534289e..2b350c3 100644 --- a/compile-fixes +++ b/compile-fixes @@ -1,11 +1,11 @@ ---- ipmitool-1.8.9/lib/ipmi_fru.c.orig 2007-03-06 23:15:36.000000000 +0100 -+++ ipmitool-1.8.9/lib/ipmi_fru.c 2007-03-08 13:02:42.000000000 +0100 -@@ -1671,7 +1671,7 @@ ipmi_fru_edit_multirec(struct ipmi_intf - fru_data = malloc(fru.size + 1); - if (fru_data == NULL) { - lprintf(LOG_ERR, " Out of memory!"); -- return; -+ return -1; - } - memset(fru_data, 0, fru.size + 1); +--- ipmitool-1.8.10/lib/ipmi_fru.c.orig 2008-06-10 23:40:47.000000000 +0200 ++++ ipmitool-1.8.10/lib/ipmi_fru.c 2008-09-12 16:34:18.000000000 +0200 +@@ -2353,7 +2353,7 @@ ipmi_fru_edit_multirec(struct ipmi_intf + fru_data = malloc(fru.size + 1); + if (fru_data == NULL) { + lprintf(LOG_ERR, " Out of memory!"); +- return; ++ return -1; + } + memset(fru_data, 0, fru.size + 1); diff --git a/ipmitool-1.8.10.tar.bz2 b/ipmitool-1.8.10.tar.bz2 new file mode 100644 index 0000000..7c3b327 --- /dev/null +++ b/ipmitool-1.8.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01e9b622d0a04159fb4072a63cfc8b23bc01b5afd2972287b437aafd3e4df5c9 +size 566266 diff --git a/ipmitool-1.8.9.tar.bz2 b/ipmitool-1.8.9.tar.bz2 deleted file mode 100644 index 80347b3..0000000 --- a/ipmitool-1.8.9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:174e9ebacc9a63a0758a196532d1d1bc9ba8a3cb150fd66fbc50c5bc746a4845 -size 513004 diff --git a/ipmitool-POH-scale b/ipmitool-POH-scale deleted file mode 100644 index 0d667e9..0000000 --- a/ipmitool-POH-scale +++ /dev/null @@ -1,30 +0,0 @@ ---- ipmitool-1.8.9/lib/ipmi_chassis.c.orig 2007-02-22 09:38:56.000000000 +0100 -+++ ipmitool-1.8.9/lib/ipmi_chassis.c 2008-01-17 15:07:23.000000000 +0100 -@@ -189,6 +189,8 @@ ipmi_chassis_poh(struct ipmi_intf * intf - struct ipmi_rs * rsp; - struct ipmi_rq req; - uint32_t count; -+ unsigned long hcount; -+ unsigned char minutes, scale; - - memset(&req, 0, sizeof(req)); - req.msg.netfn = IPMI_NETFN_CHASSIS; -@@ -206,9 +208,16 @@ ipmi_chassis_poh(struct ipmi_intf * intf - } - - memcpy(&count, rsp->data+1, 4); -+#if WORDS_BIGENDIAN -+ count = BSWAP_32(count); -+#endif -+ scale = rsp->data[0]; -+ hcount = count * scale; -+ minutes = hcount % 60; -+ hcount /= 60; - -- printf("POH Counter : %li hours total (%li days, %li hours)\n", -- (long)count, (long)(count / 24), (long)(count % 24)); -+ printf("POH Counter : %li hours total (%li days, %lih%02d')\n", -+ (long)hcount, (long)(hcount / 24), (long)(hcount % 24), minutes); - - return 0; - } diff --git a/ipmitool-lan-set.patch b/ipmitool-lan-set.patch deleted file mode 100644 index 96d522d..0000000 --- a/ipmitool-lan-set.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- ipmitool-1.8.9/lib/ipmi_lanp.c 2007-07-18 14:47:43.822052004 -0500 -+++ ipmitool-1.8.9/lib/ipmi_lanp.c 2007-07-19 09:56:31.567441299 -0500 -@@ -1489,28 +1489,49 @@ - } - } - /* ip address */ -- else if ((strncmp(argv[1], "ipaddr", 6) == 0) && -- (get_cmdline_ipaddr(argv[2], data) == 0)) { -- printf("Setting LAN %s to %d.%d.%d.%d\n", -- ipmi_lan_params[IPMI_LANP_IP_ADDR].desc, -- data[0], data[1], data[2], data[3]); -- rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4); -+ else if (strncmp(argv[1], "ipaddr", 6) == 0) { -+ if(argc != 3) -+ { -+ ipmi_lan_set_usage(); -+ return -1; -+ } -+ rc = get_cmdline_ipaddr(argv[2], data); -+ if (rc == 0) { -+ printf("Setting LAN %s to %d.%d.%d.%d\n", -+ ipmi_lan_params[IPMI_LANP_IP_ADDR].desc, -+ data[0], data[1], data[2], data[3]); -+ rc = set_lan_param(intf, chan, IPMI_LANP_IP_ADDR, data, 4); -+ } - } - /* network mask */ -- else if ((strncmp(argv[1], "netmask", 7) == 0) && -- (get_cmdline_ipaddr(argv[2], data) == 0)) { -- printf("Setting LAN %s to %d.%d.%d.%d\n", -- ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc, -- data[0], data[1], data[2], data[3]); -- rc = set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4); -+ else if (strncmp(argv[1], "netmask", 7) == 0) { -+ if(argc != 3) -+ { -+ ipmi_lan_set_usage(); -+ return -1; -+ } -+ rc = get_cmdline_ipaddr(argv[2], data); -+ if (rc == 0) { -+ printf("Setting LAN %s to %d.%d.%d.%d\n", -+ ipmi_lan_params[IPMI_LANP_SUBNET_MASK].desc, -+ data[0], data[1], data[2], data[3]); -+ rc = set_lan_param(intf, chan, IPMI_LANP_SUBNET_MASK, data, 4); -+ } - } - /* mac address */ -- else if ((strncmp(argv[1], "macaddr", 7) == 0) && -- (get_cmdline_macaddr(argv[2], data) == 0)) { -- printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n", -- ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc, -- data[0], data[1], data[2], data[3], data[4], data[5]); -- rc = set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6); -+ else if (strncmp(argv[1], "macaddr", 7) == 0) { -+ if(argc != 3) -+ { -+ ipmi_lan_set_usage(); -+ return -1; -+ } -+ rc = get_cmdline_macaddr(argv[2], data); -+ if (rc == 0) { -+ printf("Setting LAN %s to %02x:%02x:%02x:%02x:%02x:%02x\n", -+ ipmi_lan_params[IPMI_LANP_MAC_ADDR].desc, -+ data[0], data[1], data[2], data[3], data[4], data[5]); -+ rc = set_lan_param(intf, chan, IPMI_LANP_MAC_ADDR, data, 6); -+ } - } - /* default gateway settings */ - else if (strncmp(argv[1], "defgw", 5) == 0) { -@@ -1531,6 +1552,10 @@ - data[0], data[1], data[2], data[3], data[4], data[5]); - rc = set_lan_param(intf, chan, IPMI_LANP_DEF_GATEWAY_MAC, data, 6); - } -+ else { -+ ipmi_lan_set_usage(); -+ return -1; -+ } - } - /* backup gateway settings */ - else if (strncmp(argv[1], "bakgw", 5) == 0) { -@@ -1551,6 +1576,10 @@ - data[0], data[1], data[2], data[3], data[4], data[5]); - rc = set_lan_param(intf, chan, IPMI_LANP_BAK_GATEWAY_MAC, data, 6); - } -+ else { -+ ipmi_lan_set_usage(); -+ return -1; -+ } - } - else if (strncasecmp(argv[1], "vlan", 4) == 0) { - if (argc < 4 || strncmp(argv[2], "help", 4) == 0) { diff --git a/ipmitool.changes b/ipmitool.changes index 6c6d22c..d8219ad 100644 --- a/ipmitool.changes +++ b/ipmitool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 12 16:42:17 CEST 2008 - duwe@suse.de + +- update to version 1.8.10 as requested in FATE#304431 + + remove fixes now in mainline + ------------------------------------------------------------------- Thu Jan 17 15:28:30 CET 2008 - duwe@suse.de diff --git a/ipmitool.spec b/ipmitool.spec index 562e367..5256cf8 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -1,27 +1,33 @@ # -# spec file for package ipmitool (Version 1.8.9) +# spec file for package ipmitool (Version 1.8.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: ipmitool BuildRequires: openssl-devel readline-devel Url: http://ipmitool.sourceforge.net/ Summary: Utility for IPMI Control -Version: 1.8.9 -Release: 54 +Version: 1.8.10 +Release: 1 License: BSD 3-Clause Group: System/Management Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 Patch: compile-fixes -Patch1: ipmitool-lan-set.patch -Patch2: ipmitool-POH-scale BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -45,8 +51,6 @@ and setting LAN configuration, and chassis power control. %prep %setup %patch -p1 -%patch1 -p1 -%patch2 -p1 %build CFLAGS="$RPM_OPT_FLAGS" ./configure \ @@ -72,12 +76,15 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING README contrib %{_bindir}/* %{_sbindir}/* -# %dir %{_datadir}/ipmitool +%{_datadir}/ipmitool #%{_datadir}/doc/packages/ipmitool/* %doc %{_mandir}/man1/* %doc %{_mandir}/man8/* %changelog +* Fri Sep 12 2008 duwe@suse.de +- update to version 1.8.10 as requested in FATE#304431 + + remove fixes now in mainline * Thu Jan 17 2008 duwe@suse.de - Fix bugs 298222 and 144023 (arg checking and POH scaling) * Thu Mar 08 2007 duwe@suse.de @@ -137,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT - Many bufxies and patches from contributors * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Fri Jan 20 2006 schwab@suse.de +* Sat Jan 21 2006 schwab@suse.de - Don't strip binaries. * Mon Sep 19 2005 kukuk@suse.de - Fix missing return value