From a704ffd24425cbcc7b5227cca41d2e8b5f627759 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:00:45 +0100 Subject: New debian/patches/0130-Correct_lanplus_segment_violation.patch --- debian/changelog | 7 ++++++ .../0130-Correct_lanplus_segment_violation.patch | 29 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/0130-Correct_lanplus_segment_violation.patch diff --git a/debian/changelog b/debian/changelog index 4d4749e..f82b225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ipmitool (1.8.18-8) UNRELEASED; urgency=medium + + * New debian/patches/0130-Correct_lanplus_segment_violation.patch: + - Fix lanplus segment violation for truncated response (Closes: #945764). + + -- Jörg Frings-Fürst Sun, 22 Dec 2019 19:29:46 +0100 + ipmitool (1.8.18-7) unstable; urgency=medium * debian/watch: Use tags instead releases to fix the wrong format. 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 -- cgit v1.2.3 From af948960e5c67b599e4f30fd8d237710a81d4346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:02:14 +0100 Subject: Declare compliance with Debian Policy 4.4.1.2 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f82b225..3eb5c20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ipmitool (1.8.18-8) UNRELEASED; 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). -- Jörg Frings-Fürst Sun, 22 Dec 2019 19:29:46 +0100 diff --git a/debian/control b/debian/control index 172d14f..f8519d3 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: libfreeipmi-dev [!hurd-i386], libreadline-dev, libssl-dev -Standards-Version: 4.4.0 +Standards-Version: 4.4.1.2 Vcs-Git: git://jff.email/opt/git/ipmitool.git Vcs-Browser: https://jff.email/cgit/ipmitool.git Homepage: https://github.com/ipmitool/ipmitool -- cgit v1.2.3 From 57cdfd571099fecb6a9cb6920ec58b2a7b99c771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:03:40 +0100 Subject: Switch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 3eb5c20..984b3db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ipmitool (1.8.18-8) UNRELEASED; 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. -- Jörg Frings-Fürst Sun, 22 Dec 2019 19:29:46 +0100 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 f8519d3..018d023 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: utils Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>> 12), + debhelper-compat (= 12), init-system-helpers (>> 1.50), libncurses-dev, libfreeipmi-dev [!hurd-i386], -- cgit v1.2.3 From fb4b0b22a7eb0c3783fb57407fa9d171d21aee45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:42:48 +0100 Subject: d/control: Add Rules-Requires-Root: no --- debian/changelog | 2 ++ debian/control | 1 + 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 984b3db..386a454 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ipmitool (1.8.18-8) UNRELEASED; urgency=medium * Switch to debhelper-compat: - debian/control: change to debhelper-compat (=12). - remove debian/compat. + * debian/control: + - Add Rules-Requires-Root: no. -- Jörg Frings-Fürst Sun, 22 Dec 2019 19:29:46 +0100 diff --git a/debian/control b/debian/control index 018d023..aac2486 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Build-Depends: libreadline-dev, libssl-dev 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 -- cgit v1.2.3 From 27bfad31486b6f20519796dcdd5034c9e30fce20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Dec 2019 20:58:14 +0100 Subject: d/copyright: Add 2019 to debian/*; d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 6 ++++-- debian/copyright | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 386a454..9089710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ipmitool (1.8.18-8) UNRELEASED; urgency=medium +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). @@ -8,8 +8,10 @@ ipmitool (1.8.18-8) UNRELEASED; urgency=medium - remove debian/compat. * debian/control: - Add Rules-Requires-Root: no. + * debian/copyright: + - Add 2019 to debian/*. - -- Jörg Frings-Fürst Sun, 22 Dec 2019 19:29:46 +0100 + -- Jörg Frings-Fürst Sun, 22 Dec 2019 20:55:43 +0100 ipmitool (1.8.18-7) unstable; urgency=medium 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 2011-2013 Luk Claes 2012 Leo Iannacone 2013 Robie Basak - 2014-2018 Jörg Frings-Fürst + 2014-2019 Jörg Frings-Fürst License: BSD-3-clause License: BSD-3-clause -- cgit v1.2.3