diff --git a/backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch b/backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch deleted file mode 100644 index 4ef2030..0000000 --- a/backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 45817796f6a1825c0cfb565c3e1625f83d6447cd Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Fri, 28 Jan 2022 14:49:12 -0800 -Subject: [PATCH] ipmi-config: fix output corner case due to missing error - handling - ---- - ...i-config-category-core-lan6-conf-section.c | 22 ++++++++++--------- - 1 file changed, 12 insertions(+), 10 deletions(-) - -diff --git a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -index e82ca1c74..6d5e2943b 100644 ---- a/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -+++ b/ipmi-config/ipmi-config-category-core-lan6-conf-section.c -@@ -1800,18 +1800,18 @@ ipv6_static_router_mac_address_checkout (ipmi_config_state_data_t *state_data, - - if (num == 1) - tmp = ipmi_cmd_get_lan_configuration_parameters_ipv6_static_router_1_mac_address (state_data->ipmi_ctx, -- channel_number, -- IPMI_GET_LAN_PARAMETER, -- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR, -- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR, -- obj_cmd_rs); -+ channel_number, -+ IPMI_GET_LAN_PARAMETER, -+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR, -+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR, -+ obj_cmd_rs); - else - tmp = ipmi_cmd_get_lan_configuration_parameters_ipv6_static_router_2_mac_address (state_data->ipmi_ctx, -- channel_number, -- IPMI_GET_LAN_PARAMETER, -- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR, -- IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR, -- obj_cmd_rs); -+ channel_number, -+ IPMI_GET_LAN_PARAMETER, -+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_SET_SELECTOR, -+ IPMI_LAN_CONFIGURATION_PARAMETERS_NO_BLOCK_SELECTOR, -+ obj_cmd_rs); - - if (tmp < 0) - { -@@ -2031,6 +2031,8 @@ ipv6_static_router_prefix_length_checkout (ipmi_config_state_data_t *state_data, - kv, - prefix_length) < 0) - -+ return (IPMI_CONFIG_ERR_FATAL_ERROR); -+ - rv = IPMI_CONFIG_ERR_SUCCESS; - cleanup: - fiid_obj_destroy (obj_cmd_rs); --- -2.21.0 - diff --git a/backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch b/backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch deleted file mode 100644 index 2bc0a9e..0000000 --- a/backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 79553b7b68f2f3b618234b9528f358952ebe61b2 Mon Sep 17 00:00:00 2001 -From: Albert Chu -Date: Fri, 28 Jan 2022 14:58:34 -0800 -Subject: [PATCH] libfreeipmi/cmds: fix invalid template check error - ---- - libfreeipmi/cmds/ipmi-lan-cmds.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfreeipmi/cmds/ipmi-lan-cmds.c b/libfreeipmi/cmds/ipmi-lan-cmds.c -index 959548ca6..365e1771c 100644 ---- a/libfreeipmi/cmds/ipmi-lan-cmds.c -+++ b/libfreeipmi/cmds/ipmi-lan-cmds.c -@@ -2324,7 +2324,7 @@ fill_cmd_set_lan_configuration_parameters_ipv6_static_addresses (uint8_t channel - return (-1); - } - -- if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_header_flow_label_rq) < 0) -+ if (FIID_OBJ_TEMPLATE_COMPARE (obj_cmd_rq, tmpl_cmd_set_lan_configuration_parameters_ipv6_static_addresses_rq) < 0) - { - ERRNO_TRACE (errno); - return (-1); --- -2.21.0 - diff --git a/freeipmi-1.6.10.tar.gz b/freeipmi-1.6.10.tar.gz new file mode 100644 index 0000000..3f28c7c Binary files /dev/null and b/freeipmi-1.6.10.tar.gz differ diff --git a/freeipmi-1.6.8.tar.gz b/freeipmi-1.6.8.tar.gz deleted file mode 100644 index aaae469..0000000 Binary files a/freeipmi-1.6.8.tar.gz and /dev/null differ diff --git a/freeipmi.spec b/freeipmi.spec index 4e32d18..5b9123d 100644 --- a/freeipmi.spec +++ b/freeipmi.spec @@ -1,6 +1,6 @@ Name: freeipmi -Version: 1.6.8 -Release: 4 +Version: 1.6.10 +Release: 1 Summary: IPMI remote console and system management software License: GPLv3+ URL: http://www.gnu.org/software/freeipmi/ @@ -8,9 +8,7 @@ Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz Source1: bmc-watchdog.service Source2: ipmidetectd.service Source3: ipmiseld.service -Patch0: backport-0001-ipmi-config-fix-output-corner-case-due-to-missing-er.patch -Patch1: backport-0001-libfreeipmi-cmds-fix-invalid-template-check-error.patch -Patch2: 0001-fix-illegal-memory-access.patch +Patch1: 0001-fix-illegal-memory-access.patch BuildRequires: libgcrypt-devel texinfo systemd gcc %{?systemd_requires} @@ -140,6 +138,9 @@ install-info %{_infodir}/freeipmi-faq.info.gz %{_infodir}/dir &>/dev/null || : %exclude %{_infodir}/dir %changelog +* Fri Oct 13 2023 xu_ping <707078654@qq.com> - 1.6.10-1 +- Upgrade version to 1.6.10 + * Wed Mar 22 2023 Ge Wang - 1.6.8-4 - fix illegal memory access