diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/ipmitool.lintian-overrides | 9 | ||||
| -rw-r--r-- | debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch | 9 | ||||
| -rw-r--r-- | debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch | 87 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
5 files changed, 108 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 48bf6e7..28e4f05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ ipmitool (1.8.19-8) UNRELEASED; urgency=medium + Add download ipmitool_enterprise.txt. * New debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch: - Fix error response from Unsupported Parameter lookup (Closes: #1061770). + * New debian/patches/0125-Do_not_require_IANA_PEN_registry_file.patch: + - Do not require the IANA PEN registry file (Closes: #1040186). -- Jörg Frings-Fürst <debian@jff.email> Fri, 05 Jul 2024 19:23:38 +0200 diff --git a/debian/ipmitool.lintian-overrides b/debian/ipmitool.lintian-overrides new file mode 100644 index 0000000..ac2ff25 --- /dev/null +++ b/debian/ipmitool.lintian-overrides @@ -0,0 +1,9 @@ +# No error found at this position +# +# volatile-bit-rate +# serial, 19.2, 38.4, 57.6, 115.2. Setting this +# value to serial indicates that the BMC should use +#troff:<standard input>:3323: warning: cannot select font 'm' +# the setting used by the IPMI over serial channel. + +groff-message diff --git a/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch b/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch index 6043167..1179a99 100644 --- a/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch +++ b/debian/patches/0120-Fix_Unsupported_Parameter_lookup.patch @@ -1,3 +1,12 @@ +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 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 9d6c787..12d8ff7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ 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 |