diff -Nru sysstat-12.6.1/debian/changelog sysstat-12.6.1/debian/changelog --- sysstat-12.6.1/debian/changelog 2024-04-08 16:20:30.000000000 +0000 +++ sysstat-12.6.1/debian/changelog 2024-01-09 20:31:44.000000000 +0000 @@ -1,17 +1,23 @@ -sysstat (12.6.1-1ubuntu2) noble; urgency=high +sysstat (12.6.1-2) unstable; urgency=medium - * No change rebuild for 64-bit time_t and frame pointers. + * Acknowledge NMU. + * Add debian/patches/CVE-2023-33204.patch from Ubuntu (systat + 12.6.1-1ubuntu1) to fix overflow check logic in check_overflow() + function in common.c reported in CVE-2023-33204 (closes: #1036294). + * Update upstream website URL in debian/control and debian/watch. + * Drop obsolete dependency on lsb-base package. + * Add Romanian translation of debconf templates (closes: #1033722). + * Standards-Version: 4.6.2 (no changes). + + -- Robert Luberda Tue, 09 Jan 2024 21:31:44 +0100 + +sysstat (12.6.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS after systemdsystemunitdir changed in systemd.pc + (Closes: #1057421) - -- Julian Andres Klode Mon, 08 Apr 2024 18:20:30 +0200 - -sysstat (12.6.1-1ubuntu1) mantic; urgency=medium - - * SECURITY UPDATE: overflow in arithmetic multiplication - - debian/patches/CVE-2023-33204.patch: fix overflow check logic in - check_overflow() in common.c. - - CVE-2023-33204 - - -- Rodrigo Figueiredo Zaiden Tue, 06 Jun 2023 14:13:18 -0300 + -- Chris Hofstaedtler Fri, 15 Dec 2023 01:23:13 +0100 sysstat (12.6.1-1) unstable; urgency=medium diff -Nru sysstat-12.6.1/debian/control sysstat-12.6.1/debian/control --- sysstat-12.6.1/debian/control 2023-06-06 17:13:18.000000000 +0000 +++ sysstat-12.6.1/debian/control 2024-01-09 20:31:44.000000000 +0000 @@ -1,23 +1,22 @@ Source: sysstat Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Robert Luberda +Maintainer: Robert Luberda Build-Depends: debhelper-compat (= 13), gettext, libsensors-dev, pkg-config, - systemd -Standards-Version: 4.6.1 + systemd, + systemd-dev +Standards-Version: 4.6.2 Rules-Requires-Root: no -Homepage: http://sebastien.godard.pagesperso-orange.fr/ +Homepage: https://sysstat.github.io/ Vcs-Git: https://salsa.debian.org/debian/sysstat.git Vcs-Browser: https://salsa.debian.org/debian/sysstat Package: sysstat Architecture: linux-any -Depends: lsb-base (>= 3.0-6), - ucf (>= 2.003), +Depends: ucf (>= 2.003), xz-utils, ${misc:Depends}, ${shlibs:Depends} diff -Nru sysstat-12.6.1/debian/patches/CVE-2023-33204.patch sysstat-12.6.1/debian/patches/CVE-2023-33204.patch --- sysstat-12.6.1/debian/patches/CVE-2023-33204.patch 2023-06-06 17:13:18.000000000 +0000 +++ sysstat-12.6.1/debian/patches/CVE-2023-33204.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From 6f8dc568e6ab072bb8205b732f04e685bf9237c0 Mon Sep 17 00:00:00 2001 -From: Sebastien GODARD -Date: Wed, 17 May 2023 21:10:31 +0200 -Subject: [PATCH] Merge branch 'pkopylov-master' - -Signed-off-by: Sebastien GODARD ---- - common.c | 16 +++++++++------- - 1 file changed, 9 insertions(+), 7 deletions(-) - -diff --git a/common.c b/common.c -index 48493b5f..0efe7ee3 100644 ---- a/common.c -+++ b/common.c -@@ -431,15 +431,17 @@ int check_dir(char *dirname) - void check_overflow(unsigned int val1, unsigned int val2, - unsigned int val3) - { -- if ((unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3 > UINT_MAX) { -+ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && -+ (((unsigned long long) UINT_MAX / (unsigned long long) val1 < -+ (unsigned long long) val2) || -+ ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) < -+ (unsigned long long) val3))) { - #ifdef DEBUG -- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", -- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * -- (unsigned long long) val3); -+ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", -+ __FUNCTION__, val1, val2, val3); - #endif -- exit(4); -- } -+ exit(4); -+ } - } - - #ifndef SOURCE_SADC diff -Nru sysstat-12.6.1/debian/patches/CVE-2023-33204.patch.diff sysstat-12.6.1/debian/patches/CVE-2023-33204.patch.diff --- sysstat-12.6.1/debian/patches/CVE-2023-33204.patch.diff 1970-01-01 00:00:00.000000000 +0000 +++ sysstat-12.6.1/debian/patches/CVE-2023-33204.patch.diff 2024-01-09 20:31:44.000000000 +0000 @@ -0,0 +1,39 @@ +From 6f8dc568e6ab072bb8205b732f04e685bf9237c0 Mon Sep 17 00:00:00 2001 +From: Sebastien GODARD +Date: Wed, 17 May 2023 21:10:31 +0200 +Subject: [PATCH] Merge branch 'pkopylov-master' + +Signed-off-by: Sebastien GODARD +--- + common.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) + +diff --git a/common.c b/common.c +index 48493b5f..0efe7ee3 100644 +--- a/common.c ++++ b/common.c +@@ -431,15 +431,17 @@ int check_dir(char *dirname) + void check_overflow(unsigned int val1, unsigned int val2, + unsigned int val3) + { +- if ((unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3 > UINT_MAX) { ++ if ((val1 != 0) && (val2 != 0) && (val3 != 0) && ++ (((unsigned long long) UINT_MAX / (unsigned long long) val1 < ++ (unsigned long long) val2) || ++ ((unsigned long long) UINT_MAX / ((unsigned long long) val1 * (unsigned long long) val2) < ++ (unsigned long long) val3))) { + #ifdef DEBUG +- fprintf(stderr, "%s: Overflow detected (%llu). Aborting...\n", +- __FUNCTION__, (unsigned long long) val1 * (unsigned long long) val2 * +- (unsigned long long) val3); ++ fprintf(stderr, "%s: Overflow detected (%u,%u,%u). Aborting...\n", ++ __FUNCTION__, val1, val2, val3); + #endif +- exit(4); +- } ++ exit(4); ++ } + } + + #ifndef SOURCE_SADC diff -Nru sysstat-12.6.1/debian/patches/series sysstat-12.6.1/debian/patches/series --- sysstat-12.6.1/debian/patches/series 2023-06-06 17:13:18.000000000 +0000 +++ sysstat-12.6.1/debian/patches/series 2024-01-09 20:31:44.000000000 +0000 @@ -10,4 +10,4 @@ 13-irqstat-interpreter.patch 14-simtest-run-all.patch 15-sa2-bash.patch -CVE-2023-33204.patch +CVE-2023-33204.patch.diff diff -Nru sysstat-12.6.1/debian/po/ro.po sysstat-12.6.1/debian/po/ro.po --- sysstat-12.6.1/debian/po/ro.po 1970-01-01 00:00:00.000000000 +0000 +++ sysstat-12.6.1/debian/po/ro.po 2024-01-09 20:31:44.000000000 +0000 @@ -0,0 +1,100 @@ +# Mesajele în limba română pentru pachetul sysstat. +# Romanian translation of sysstat. +# Copyright © 2023 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the sysstat package. +# +# Remus-Gabriel Chelu , 2023. +# +# Cronologia traducerii fișierului „sysstat”: +# Traducerea inițială, făcută de R-GC, pentru versiunea sysstat 12.6.1-1(2009-02-04). +# Actualizare a traducerii pentru versiunea Y, făcută de X, Y(anul). +# +msgid "" +msgstr "" +"Project-Id-Version: sysstat 12.6.1-1\n" +"Report-Msgid-Bugs-To: sysstat@packages.debian.org\n" +"POT-Creation-Date: 2009-02-04 18:52+0100\n" +"PO-Revision-Date: 2023-03-26 16:27+0200\n" +"Last-Translator: Remus-Gabriel Chelu \n" +"Language-Team: Romanian \n" +"Language: ro\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && " +"n%100<=19) ? 1 : 2);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"X-Generator: Poedit 3.2.2\n" + +#. Type: boolean +#. Description +#: ../sysstat.templates:2001 +msgid "Remove old format statistics data files?" +msgstr "Doriți să eliminați fișierele de date cu statistici în format vechi?" + +#. Type: boolean +#. Description +#: ../sysstat.templates:2001 +msgid "" +"The format of daily data statistics files has changed in version ${s_version} " +"of sysstat and is not compatible with the previous one." +msgstr "" +"Formatul fișierelor zilnice cu statistici de date s-a schimbat în versiunea " +"${s_version} a «sysstat» și nu este compatibil cu cea anterioară." + +#. Type: boolean +#. Description +#: ../sysstat.templates:2001 +msgid "" +"If you choose this option, all existing data files in the /var/log/sysstat/ " +"directory will be deleted." +msgstr "" +"Dacă alegeți această opțiune, toate fișierele de date existente în directorul „/" +"var/log/sysstat/” vor fi șterse." + +#. Type: boolean +#. Description +#: ../sysstat.templates:2001 +msgid "" +"If you don't choose this option, the sar(1) command will not work properly " +"until you remove the files manually." +msgstr "" +"Dacă nu alegeți această opțiune, comanda sar(1) nu va funcționa corect până " +"când nu eliminați fișierele manual." + +#. Type: boolean +#. Description +#: ../sysstat.templates:3001 +msgid "Activate sysstat's cron job?" +msgstr "Doriți să activați sarcina «sysstat» în cron?" + +#. Type: boolean +#. Description +#: ../sysstat.templates:3001 +msgid "" +"If this option is enabled the sysstat package will monitor system activities " +"and store the data in log files within /var/log/sysstat/." +msgstr "" +"Dacă această opțiune este activată, pachetul „sysstat” va monitoriza " +"activitățile sistemului și va stoca datele în fișierele jurnal din directorul „/" +"var/log/sysstat/”." + +#. Type: boolean +#. Description +#: ../sysstat.templates:3001 +msgid "" +"This data allows the sar(1) command to display system statistics for the whole " +"day." +msgstr "" +"Aceste date permit comenzii sar(1) să afișeze statisticile sistemului pentru " +"întreaga zi." + +#. Type: boolean +#. Description +#: ../sysstat.templates:3001 +msgid "" +"If you don't enable this option, the sar(1) command will only show the current " +"statistics." +msgstr "" +"Dacă nu activați această opțiune, comanda sar(1) va afișa doar statisticile " +"curente." diff -Nru sysstat-12.6.1/debian/rules sysstat-12.6.1/debian/rules --- sysstat-12.6.1/debian/rules 2022-12-04 21:23:25.000000000 +0000 +++ sysstat-12.6.1/debian/rules 2024-01-09 20:31:44.000000000 +0000 @@ -19,6 +19,8 @@ DFLAGS := +export deb_systemdsystemunitdir=$(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,) + %: dh ${@} diff -Nru sysstat-12.6.1/debian/sysstat.install sysstat-12.6.1/debian/sysstat.install --- sysstat-12.6.1/debian/sysstat.install 2022-12-04 21:23:25.000000000 +0000 +++ sysstat-12.6.1/debian/sysstat.install 2024-01-09 20:31:44.000000000 +0000 @@ -1,5 +1,5 @@ debian/debian-sa1 usr/lib/sysstat debian/tmp/etc/ -debian/tmp/lib/systemd/ +debian/tmp/${env:deb_systemdsystemunitdir} debian/tmp/usr/ debian/tmp/var/ diff -Nru sysstat-12.6.1/debian/watch sysstat-12.6.1/debian/watch --- sysstat-12.6.1/debian/watch 2022-12-04 21:23:25.000000000 +0000 +++ sysstat-12.6.1/debian/watch 2024-01-09 20:31:44.000000000 +0000 @@ -1,4 +1,4 @@ # control file for the uscan(1) tool version=4 -http://sebastien.godard.pagesperso-orange.fr/download.html \ - (?:.*perso.*/)sysstat-([\d\.]+)\.tar\.(?:xz|bz2) +https://sysstat.github.io/versions.html \ + (?:.*github.*/)sysstat-([\d\.]+)\.tar\.(?:xz|bz2)