diff -Nru sysstat-12.2.0/debian/changelog sysstat-12.2.0/debian/changelog --- sysstat-12.2.0/debian/changelog 2021-08-09 14:08:06.000000000 +0000 +++ sysstat-12.2.0/debian/changelog 2019-12-23 19:11:03.000000000 +0000 @@ -1,12 +1,3 @@ -sysstat (12.2.0-2ubuntu0.1) focal; urgency=medium - - * d/p/12-fix-wMB-json-output.patch: Correct values for the number of - megabytes written to the device per second when using JSON output. - Thanks to Sebastien GODARD #264 - on upstream (LP: #1888345). - - -- Miriam España Acebal Mon, 09 Aug 2021 16:08:06 +0200 - sysstat (12.2.0-2) unstable; urgency=medium * Add 11-Double-free-in-check_file_actlst.patch, taken from upstream, diff -Nru sysstat-12.2.0/debian/control sysstat-12.2.0/debian/control --- sysstat-12.2.0/debian/control 2021-08-09 14:08:06.000000000 +0000 +++ sysstat-12.2.0/debian/control 2019-12-23 19:11:03.000000000 +0000 @@ -1,8 +1,7 @@ Source: sysstat Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Robert Luberda +Maintainer: Robert Luberda Build-Depends: debhelper-compat (= 12), gettext, libsensors-dev, pkg-config Standards-Version: 4.4.1 Rules-Requires-Root: no diff -Nru sysstat-12.2.0/debian/patches/12-fix-wMB-json-output.patch sysstat-12.2.0/debian/patches/12-fix-wMB-json-output.patch --- sysstat-12.2.0/debian/patches/12-fix-wMB-json-output.patch 2021-08-09 14:08:06.000000000 +0000 +++ sysstat-12.2.0/debian/patches/12-fix-wMB-json-output.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -From: Sebastien GODARD -Date: Sun Nov 24 08:55:40 2019 +0100 -Description: iostat: Fix wrong unit used in JSON output - -The values for the amount of data read/written or discarded were always -expressed in blocks/s in the JSON output generated by iostat. It should -take into account the unit (blocks, kB, MB) selected by the user. - -Signed-off-by: Sebastien GODARD - -Author: Miriam España Acebal -Origin: upstream, https://github.com/sysstat/sysstat/commit/404eee1417dad8abe6ef49ea6e1469fe6cfdddbe -Bug: https://github.com/sysstat/sysstat/issues/264 -Bug-Ubuntu:https://bugs.launchpad.net/ubuntu/+source/sysstat/+bug/1888345 -Forwarded: not-needed -Applied-Upstream: Fixed in version 12.3.1, 404eee1417dad8abe6ef49ea6e1469fe6cfdddbe -Last-Update: 2021-08-10 - ---- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/iostat.c b/iostat.c -index 5aa7a062..41a1dbd5 100644 ---- a/iostat.c -+++ b/iostat.c -@@ -857,11 +857,6 @@ void write_disk_stat_header(int *fctr, int *tab, int hpart) - { - char *units, *spc; - -- if (DISPLAY_JSON_OUTPUT(flags)) { -- xprintf((*tab)++, "\"disk\": ["); -- return; -- } -- - if (DISPLAY_KILOBYTES(flags)) { - *fctr = 2; - units = "kB"; -@@ -881,6 +876,11 @@ void write_disk_stat_header(int *fctr, int *tab, int hpart) - spc = ""; - } - -+ if (DISPLAY_JSON_OUTPUT(flags)) { -+ xprintf((*tab)++, "\"disk\": ["); -+ return; -+ } -+ - if (!DISPLAY_HUMAN_READ(flags)) { - printf("Device "); - } diff -Nru sysstat-12.2.0/debian/patches/series sysstat-12.2.0/debian/patches/series --- sysstat-12.2.0/debian/patches/series 2021-08-09 14:08:06.000000000 +0000 +++ sysstat-12.2.0/debian/patches/series 2019-12-23 19:11:03.000000000 +0000 @@ -8,4 +8,3 @@ 09-enable-colors.patch 10-ignore-ut-failures.patch 11-Double-free-in-check_file_actlst.patch -12-fix-wMB-json-output.patch