diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-07-28 15:49:01 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-07-28 15:49:01 +0200 |
| commit | c58c010b6d41c7f11843c2d7435102650ff4f5db (patch) | |
| tree | a5a712280b7ee68164cce2218820a614894aba4e | |
| parent | 2231ef8c0c4e678468a6f031a972ab9a25334e3f (diff) | |
Fix ftbfs with gcc-10
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/0005-gcc10.patch | 63 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 71 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 329ae8b..00bf20d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ipmitool (1.8.18-10) UNRELEASED; urgency=medium + + * New debian/patches/0005-gcc10.patch: Fix ftbfs with gcc-10 + (Closes: #957371). + + -- Jörg Frings-Fürst <debian@jff.email> Tue, 28 Jul 2020 15:42:13 +0200 + ipmitool (1.8.18-9) unstable; urgency=medium * debian/ipmitool.maintscript: diff --git a/debian/patches/0005-gcc10.patch b/debian/patches/0005-gcc10.patch new file mode 100644 index 0000000..a4e5d8a --- /dev/null +++ b/debian/patches/0005-gcc10.patch @@ -0,0 +1,63 @@ +Description: Fix ftbfs with gcc-10 +Author: Jörg Frings-Fürst <debian@jff.email> +Bug: https://github.com/ipmitool/ipmitool/issues/220 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957371 +Last-Update: 2020-07-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/include/ipmitool/ipmi_hpmfwupg.h +=================================================================== +--- trunk.orig/include/ipmitool/ipmi_hpmfwupg.h ++++ trunk/include/ipmitool/ipmi_hpmfwupg.h +@@ -30,9 +30,22 @@ + * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + */ + ++ + #ifndef IPMI_HPMFWUPG_H + #define IPMI_HPMFWUPG_H + ++ ++#ifdef IPMI_HPMFWUPG_MOD ++ ++ #define EXTERN ++ ++#else ++ ++ #define EXTERN extern ++ ++#endif ++ ++ + #include <inttypes.h> + #include <ipmitool/ipmi.h> + +@@ -800,10 +813,12 @@ typedef struct _VERSIONINFO { + char descString[HPMFWUPG_DESC_STRING_LENGTH + 1]; + }VERSIONINFO, *PVERSIONINFO; + +-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; ++EXTERN VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX]; + + #define TARGET_VER (0x01) + #define ROLLBACK_VER (0x02) + #define IMAGE_VER (0x04) + + #endif /* IPMI_KFWUM_H */ ++ ++#undef EXTERN +Index: trunk/lib/ipmi_hpmfwupg.c +=================================================================== +--- trunk.orig/lib/ipmi_hpmfwupg.c ++++ trunk/lib/ipmi_hpmfwupg.c +@@ -37,7 +37,10 @@ + + #include <ipmitool/ipmi_intf.h> + #include <ipmitool/ipmi_mc.h> ++ ++#define IPMI_HPMFWUPG_MOD + #include <ipmitool/ipmi_hpmfwupg.h> ++ + #include <ipmitool/helper.h> + #include <ipmitool/ipmi_strings.h> + #include <ipmitool/log.h> diff --git a/debian/patches/series b/debian/patches/series index 95205ad..321f62c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 0125-nvidia-iana.patch 0615-manpage_typo.patch 0130-Correct_lanplus_segment_violation.patch +0005-gcc10.patch |