diff options
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch | 28 | ||||
| -rw-r--r-- | debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch | 87 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 117 insertions, 0 deletions
diff --git a/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch b/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch new file mode 100644 index 0000000..1179a99 --- /dev/null +++ b/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch @@ -0,0 +1,28 @@ +Description: Fix unsupported LAN parameter lookup command returns an error +Author: Daniel Van Allen <dvanallen@google.com> +Origin: https://github.com/Cray-HPE/ipmitool/commit/b7c0d66cd6b9eaf45648f6b2651b6ef5158de811 +Bug: https://github.com/ipmitool/ipmitool/issues/388 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061770 +Forwarded: not-needed +Last-Update: 2024-07-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_lanp.c +=================================================================== +--- trunk.orig/lib/ipmi_lanp.c ++++ trunk/lib/ipmi_lanp.c +@@ -236,8 +236,12 @@ get_lan_param_select(struct ipmi_intf *i + /* We treat them as valid but empty response */ + p->data = NULL; + p->data_len = 0; +- rc = p; +- /* fall through */ ++ lprintf(LOG_INFO, "Get LAN Parameter '%s' command unsupported: %s", ++ p->desc, ++ specific_val2str(rsp->ccode, ++ get_lan_cc_vals, ++ completion_code_vals)); ++ return p; + default: + /* other completion codes are treated as error */ + lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s", diff --git a/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch b/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch new file mode 100644 index 0000000..9a58fc1 --- /dev/null +++ b/debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch @@ -0,0 +1,87 @@ +Description: Fix IANA PEN registry open failed: No such file or directory +Author: Vincent Fazio <vfazio@gmail.com> +Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present> +Bug: https://github.com/ipmitool/ipmitool/pull/382 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1040186 +Forwarded: not-needed +Last-Update: 2024-07-05 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_main.c +=================================================================== +--- trunk.orig/lib/ipmi_main.c ++++ trunk/lib/ipmi_main.c +@@ -853,10 +853,7 @@ ipmi_main(int argc, char ** argv, + } + + /* load the IANA PEN registry */ +- if (ipmi_oem_info_init()) { +- lprintf(LOG_ERR, "Failed to initialize the OEM info dictionary"); +- goto out_free; +- } ++ ipmi_oem_info_init(); + + /* run OEM setup if found */ + if (oemtype && +Index: trunk/lib/ipmi_strings.c +=================================================================== +--- trunk.orig/lib/ipmi_strings.c ++++ trunk/lib/ipmi_strings.c +@@ -1719,39 +1719,30 @@ out: + return rc; + } + +-int ipmi_oem_info_init() ++void ipmi_oem_info_init() + { + oem_valstr_list_t terminator = { { -1, NULL}, NULL }; /* Terminator */ + oem_valstr_list_t *oemlist = &terminator; + bool free_strings = true; +- size_t count; +- int rc = -4; ++ int count; + + lprintf(LOG_INFO, "Loading IANA PEN Registry..."); + + if (ipmi_oem_info) { + lprintf(LOG_INFO, "IANA PEN Registry is already loaded"); +- rc = 0; + goto out; + } + +- if (!(count = oem_info_list_load(&oemlist))) { +- /* +- * We can't identify OEMs without a loaded registry. +- * Set the pointer to dummy and return. +- */ +- ipmi_oem_info = ipmi_oem_info_dummy; +- goto out; ++ if ((count = oem_info_list_load(&oemlist)) < 1) { ++ lprintf(LOG_WARN, "Failed to load entries from IANA PEN Registry"); ++ count = 0; + } + + /* In the array was allocated, don't free the strings at cleanup */ + free_strings = !oem_info_init_from_list(oemlist, count); + +- rc = IPMI_CC_OK; +- + out: + oem_info_list_free(&oemlist, free_strings); +- return rc; + } + + void ipmi_oem_info_free() +Index: trunk/include/ipmitool/ipmi_strings.h +=================================================================== +--- trunk.orig/include/ipmitool/ipmi_strings.h ++++ trunk/include/ipmitool/ipmi_strings.h +@@ -59,7 +59,7 @@ extern const struct valstr ipmi_integrit + extern const struct valstr ipmi_encryption_algorithms[]; + extern const struct valstr ipmi_user_enable_status_vals[]; + extern const struct valstr *ipmi_oem_info; +-int ipmi_oem_info_init(); ++void ipmi_oem_info_init(); + void ipmi_oem_info_free(); + + extern const struct valstr picmg_frucontrol_vals[]; diff --git a/debian/patches/series b/debian/patches/series index 9d62f03..12d8ff7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,5 @@ 0110-unpdate_IANA_URL.patch 0115-hurd_PATH_MAX.patch 0625-manpage_wrong_time_set.patch +0120-Fix_Unsupported_Parameter_lookup.patch +0125-Do_not_require_IANA_PEN_registry_file.patch |