diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-12-28 18:01:27 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-12-28 18:01:27 +0100 |
| commit | 219e0462a6b785ff58607dc0c41a0cf4dcc296fc (patch) | |
| tree | 9a6ac18504b24cf3db787b14b4189c1cc97e63ae | |
| parent | 34e5546917ed72765ae1f464c8bf71558d32409a (diff) | |
| parent | 438ce37d28b4a0ad25eefa5bb88fbadb46fd77b1 (diff) | |
Merge branch 'release/debian/1.8.19-3'debian/1.8.19-3
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/patches/0110-unpdate_IANA_URL.patch | 13 | ||||
| -rw-r--r-- | debian/patches/0115-hurd_PATH_MAX.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 45 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aed4a04..d4d8c39 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +ipmitool (1.8.19-3) unstable; urgency=medium + + * debian/patches/0110-unpdate_IANA_URL.patch: + - Fix file name for local IANA PEN database (Closes: #1023312). + Thanks to Elimar Riesebieter <riesebie@lxtec.de>. + * New debian/patches/0115-hurd_PATH_MAX.patch: + - Add missing PATH_MAX for hurd-i386. + + -- Jörg Frings-Fürst <debian@jff.email> Mon, 26 Dec 2022 10:44:29 +0100 + ipmitool (1.8.19-2) unstable; urgency=medium * New debian/patches/0110-unpdate_IANA_URL.patch (Closes: #1023312): diff --git a/debian/patches/0110-unpdate_IANA_URL.patch b/debian/patches/0110-unpdate_IANA_URL.patch index 2f53e5c..b83b0ba 100644 --- a/debian/patches/0110-unpdate_IANA_URL.patch +++ b/debian/patches/0110-unpdate_IANA_URL.patch @@ -21,3 +21,16 @@ Index: trunk/Makefile.am dist-hook: cp control/ipmitool.spec $(distdir) +Index: trunk/lib/ipmi_strings.c +=================================================================== +--- trunk.orig/lib/ipmi_strings.c ++++ trunk/lib/ipmi_strings.c +@@ -1489,7 +1489,7 @@ size_t count_bytes(const char *s, unsign + * That is, IANA PEN at position 0, enterprise name at position 2. + */ + #define IANA_NAME_OFFSET 2 +-#define IANA_PEN_REGISTRY "enterprise-numbers" ++#define IANA_PEN_REGISTRY "enterprise-numbers.txt" + static + int oem_info_list_load(oem_valstr_list_t **list) + { diff --git a/debian/patches/0115-hurd_PATH_MAX.patch b/debian/patches/0115-hurd_PATH_MAX.patch new file mode 100644 index 0000000..83d30e5 --- /dev/null +++ b/debian/patches/0115-hurd_PATH_MAX.patch @@ -0,0 +1,21 @@ +Description: Add missing PATH_MAX for hurd-i386 +Author: Jörg Frings-Fürst <debian@jff.email> +Forwarded: not-needed +Last-Update: 2022-12-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/include/ipmitool/ipmi_strings.h +=================================================================== +--- trunk.orig/include/ipmitool/ipmi_strings.h ++++ trunk/include/ipmitool/ipmi_strings.h +@@ -36,6 +36,10 @@ + + #define CC_STRING(cc) val2str(cc, completion_code_vals) + ++#ifndef PATH_MAX ++ #define PATH_MAX 1024 ++#endif ++ + extern const struct valstr completion_code_vals[]; + extern const struct valstr entity_id_vals[]; + extern const struct valstr entity_device_type_vals[]; diff --git a/debian/patches/series b/debian/patches/series index 4286537..2af2f95 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ 0100-fix_buf_overflow.patch 0010-utf8.patch 0110-unpdate_IANA_URL.patch +0115-hurd_PATH_MAX.patch |