From 1e6f6d0937f136afb629c9c02036b9ba797f96a7 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Fri, 3 Jan 2020 05:01:18 -0800 Subject: sysstat: 12.2.0 -> 12.2.1 0001-Include-needed-headers-explicitly.patch and CVE-2019-19725.patch Removed since they are included in 12.2.1 Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../0001-Include-needed-headers-explicitly.patch | 59 ---------------------- .../sysstat/sysstat/CVE-2019-19725.patch | 28 ---------- meta/recipes-extended/sysstat/sysstat_12.2.0.bb | 11 ---- meta/recipes-extended/sysstat/sysstat_12.2.1.bb | 8 +++ 4 files changed, 8 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch delete mode 100644 meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch delete mode 100644 meta/recipes-extended/sysstat/sysstat_12.2.0.bb create mode 100644 meta/recipes-extended/sysstat/sysstat_12.2.1.bb diff --git a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch deleted file mode 100644 index 1b63299aae..0000000000 --- a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 42325faa88d64cce799977d611b2792beb154643 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 14 Sep 2015 08:36:59 +0000 -Subject: [PATCH] Include needed headers explicitly - -on glibc these headers get pulled in indirectly via other .h files -but right fix is to include them directly when used - -fixes - -error: use of undeclared identifier 'PATH_MAX' -error: called object type 'unsigned int' is not a function or function pointer -dm_major = major(aux.st_rdev); - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - common.c | 1 + - ioconf.c | 1 + - sa_common.c | 1 + - 3 files changed, 3 insertions(+) - -Index: sysstat-11.7.1/common.c -=================================================================== ---- sysstat-11.7.1.orig/common.c -+++ sysstat-11.7.1/common.c -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include - #include - #include -Index: sysstat-11.7.1/ioconf.c -=================================================================== ---- sysstat-11.7.1.orig/ioconf.c -+++ sysstat-11.7.1/ioconf.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - #include "ioconf.h" - #include "common.h" -Index: sysstat-11.7.1/sa_common.c -=================================================================== ---- sysstat-11.7.1.orig/sa_common.c -+++ sysstat-11.7.1/sa_common.c -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include - #include - #include diff --git a/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch b/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch deleted file mode 100644 index 2aa12724f8..0000000000 --- a/meta/recipes-extended/sysstat/sysstat/CVE-2019-19725.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001 -From: Sebastien GODARD -Date: Mon, 9 Dec 2019 17:54:07 +0100 -Subject: [PATCH] Fix #242: Double free in check_file_actlst() - -Avoid freeing buffer() twice. - -Signed-off-by: Sebastien GODARD - -Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed] -CVE: CVE-2019-19725 -Signed-off-by: Anuj Mittal ---- - sa_common.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sa_common.c b/sa_common.c -index cf52aefe..856a3715 100644 ---- a/sa_common.c -+++ b/sa_common.c -@@ -2153,6 +2153,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f - } - - free(buffer); -+ buffer = NULL; - - /* Check that at least one activity selected by the user is available in file */ - for (i = 0; i < NR_ACT; i++) { diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.0.bb b/meta/recipes-extended/sysstat/sysstat_12.2.0.bb deleted file mode 100644 index f7a1a35975..0000000000 --- a/meta/recipes-extended/sysstat/sysstat_12.2.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require sysstat.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" - -SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ - file://0001-configure.in-remove-check-for-chkconfig.patch \ - file://CVE-2019-19725.patch \ -" - -SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee" -SRC_URI[sha256sum] = "61aa98eb8b38542eb97defcc2472adee1a24df8252f41b96e20d64c6064a8375" diff --git a/meta/recipes-extended/sysstat/sysstat_12.2.1.bb b/meta/recipes-extended/sysstat/sysstat_12.2.1.bb new file mode 100644 index 0000000000..2a90f89d25 --- /dev/null +++ b/meta/recipes-extended/sysstat/sysstat_12.2.1.bb @@ -0,0 +1,8 @@ +require sysstat.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" + +SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" + +SRC_URI[md5sum] = "9dfff5fac24e35bd92fb7896debf2ffb" +SRC_URI[sha256sum] = "8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732" -- cgit 1.2.3-korg