diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/patches/0130-Correct_lanplus_segment_violation.patch | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
6 files changed, 49 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 4d4749e..9089710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +ipmitool (1.8.18-8) unstable; urgency=medium + + * New debian/patches/0130-Correct_lanplus_segment_violation.patch: + - Fix lanplus segment violation for truncated response (Closes: #945764). + * Declare compliance with Debian Policy 4.4.1.2 (No changes needed). + * Switch to debhelper-compat: + - debian/control: change to debhelper-compat (=12). + - remove debian/compat. + * debian/control: + - Add Rules-Requires-Root: no. + * debian/copyright: + - Add 2019 to debian/*. + + -- Jörg Frings-Fürst <debian@jff.email> Sun, 22 Dec 2019 20:55:43 +0100 + ipmitool (1.8.18-7) unstable; urgency=medium * debian/watch: Use tags instead releases to fix the wrong format. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index 172d14f..aac2486 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,14 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> Build-Depends: - debhelper (>> 12), + debhelper-compat (= 12), init-system-helpers (>> 1.50), libncurses-dev, libfreeipmi-dev [!hurd-i386], libreadline-dev, libssl-dev -Standards-Version: 4.4.0 +Standards-Version: 4.4.1.2 +Rules-Requires-Root: no Vcs-Git: git://jff.email/opt/git/ipmitool.git Vcs-Browser: https://jff.email/cgit/ipmitool.git Homepage: https://github.com/ipmitool/ipmitool diff --git a/debian/copyright b/debian/copyright index fe9f534..9f7f630 100644 --- a/debian/copyright +++ b/debian/copyright @@ -34,7 +34,7 @@ Copyright: 2003-2005 Duncan Laurie <duncan@sun.com> 2011-2013 Luk Claes <luk@debian.org> 2012 Leo Iannacone <l3on@ubuntu.com> 2013 Robie Basak <robie.basak@canonical.com> - 2014-2018 Jörg Frings-Fürst <debian@jff.email> + 2014-2019 Jörg Frings-Fürst <debian@jff.email> License: BSD-3-clause License: BSD-3-clause diff --git a/debian/patches/0130-Correct_lanplus_segment_violation.patch b/debian/patches/0130-Correct_lanplus_segment_violation.patch new file mode 100644 index 0000000..17e8fe5 --- /dev/null +++ b/debian/patches/0130-Correct_lanplus_segment_violation.patch @@ -0,0 +1,29 @@ +Description: Fix lanplus segment violation for truncated response +Origin: upstream, https://github.com/pjdhpe/ipmitool/commit/815aae70cf8dc9f0e1ba1923fc4ec3cc16d0d2f1?diff=unified +Bug: https://github.com/ipmitool/ipmitool/issues/72 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=945764 +Last-Update: 2019-12-22 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/src/plugins/lanplus/lanplus.c +=================================================================== +--- trunk.orig/src/plugins/lanplus/lanplus.c ++++ trunk/src/plugins/lanplus/lanplus.c +@@ -819,7 +819,7 @@ ipmi_lan_poll_single(struct ipmi_intf * + * rsp->data_len becomes the length of that data + */ + extra_data_length = payload_size - (offset - payload_start) - 1; +- if (extra_data_length) { ++ if (extra_data_length > 0) { + rsp->data_len = extra_data_length; + memmove(rsp->data, rsp->data + offset, extra_data_length); + } else { +@@ -873,7 +873,7 @@ ipmi_lan_poll_single(struct ipmi_intf * + } + read_sol_packet(rsp, &offset); + extra_data_length = payload_size - (offset - payload_start); +- if (rsp && extra_data_length) { ++ if (rsp && extra_data_length > 0) { + rsp->data_len = extra_data_length; + memmove(rsp->data, rsp->data + offset, extra_data_length); + } else { diff --git a/debian/patches/series b/debian/patches/series index d9b084c..95205ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ 0115-typo.patch 0125-nvidia-iana.patch 0615-manpage_typo.patch +0130-Correct_lanplus_segment_violation.patch |