diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2020-01-03 05:01:18 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-03 22:35:48 +0000 |
commit | 4559a048c433497c1ca2531349ed8d1c94737445 (patch) | |
tree | 3eebdf9e94eb2589e7096283696c56a2044eaabf | |
parent | 45eca18948dca89fa4b4dcd94f0c76f55ae2cf94 (diff) | |
download | poky-4559a048c433497c1ca2531349ed8d1c94737445.tar.gz |
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
(From OE-Core rev: 1e6f6d0937f136afb629c9c02036b9ba797f96a7)
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 8 insertions, 98 deletions
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 @@ | |||
1 | From 42325faa88d64cce799977d611b2792beb154643 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 14 Sep 2015 08:36:59 +0000 | ||
4 | Subject: [PATCH] Include needed headers explicitly | ||
5 | |||
6 | on glibc these headers get pulled in indirectly via other .h files | ||
7 | but right fix is to include them directly when used | ||
8 | |||
9 | fixes | ||
10 | |||
11 | error: use of undeclared identifier 'PATH_MAX' | ||
12 | error: called object type 'unsigned int' is not a function or function pointer | ||
13 | dm_major = major(aux.st_rdev); | ||
14 | |||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | Upstream-Status: Pending | ||
18 | |||
19 | common.c | 1 + | ||
20 | ioconf.c | 1 + | ||
21 | sa_common.c | 1 + | ||
22 | 3 files changed, 3 insertions(+) | ||
23 | |||
24 | Index: sysstat-11.7.1/common.c | ||
25 | =================================================================== | ||
26 | --- sysstat-11.7.1.orig/common.c | ||
27 | +++ sysstat-11.7.1/common.c | ||
28 | @@ -20,6 +20,7 @@ | ||
29 | */ | ||
30 | |||
31 | #include <stdio.h> | ||
32 | +#include <limits.h> | ||
33 | #include <string.h> | ||
34 | #include <stdlib.h> | ||
35 | #include <stdarg.h> | ||
36 | Index: sysstat-11.7.1/ioconf.c | ||
37 | =================================================================== | ||
38 | --- sysstat-11.7.1.orig/ioconf.c | ||
39 | +++ sysstat-11.7.1/ioconf.c | ||
40 | @@ -27,6 +27,7 @@ | ||
41 | #include <errno.h> | ||
42 | #include <dirent.h> | ||
43 | #include <sys/stat.h> | ||
44 | +#include <sys/types.h> | ||
45 | |||
46 | #include "ioconf.h" | ||
47 | #include "common.h" | ||
48 | Index: sysstat-11.7.1/sa_common.c | ||
49 | =================================================================== | ||
50 | --- sysstat-11.7.1.orig/sa_common.c | ||
51 | +++ sysstat-11.7.1/sa_common.c | ||
52 | @@ -20,6 +20,7 @@ | ||
53 | */ | ||
54 | |||
55 | #include <stdio.h> | ||
56 | +#include <limits.h> | ||
57 | #include <string.h> | ||
58 | #include <stdlib.h> | ||
59 | #include <stdint.h> | ||
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 @@ | |||
1 | From a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed Mon Sep 17 00:00:00 2001 | ||
2 | From: Sebastien GODARD <sysstat@users.noreply.github.com> | ||
3 | Date: Mon, 9 Dec 2019 17:54:07 +0100 | ||
4 | Subject: [PATCH] Fix #242: Double free in check_file_actlst() | ||
5 | |||
6 | Avoid freeing buffer() twice. | ||
7 | |||
8 | Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com> | ||
9 | |||
10 | Upstream-Status: Backport [https://github.com/sysstat/sysstat/commit/a5c8abd4a481ee6e27a3acf00e6d9b0f023e20ed] | ||
11 | CVE: CVE-2019-19725 | ||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | --- | ||
14 | sa_common.c | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/sa_common.c b/sa_common.c | ||
18 | index cf52aefe..856a3715 100644 | ||
19 | --- a/sa_common.c | ||
20 | +++ b/sa_common.c | ||
21 | @@ -2153,6 +2153,7 @@ void check_file_actlst(int *ifd, char *dfile, struct activity *act[], uint64_t f | ||
22 | } | ||
23 | |||
24 | free(buffer); | ||
25 | + buffer = NULL; | ||
26 | |||
27 | /* Check that at least one activity selected by the user is available in file */ | ||
28 | 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 @@ | |||
1 | require sysstat.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" | ||
4 | |||
5 | SRC_URI += "file://0001-Include-needed-headers-explicitly.patch \ | ||
6 | file://0001-configure.in-remove-check-for-chkconfig.patch \ | ||
7 | file://CVE-2019-19725.patch \ | ||
8 | " | ||
9 | |||
10 | SRC_URI[md5sum] = "7deffb18e7f32a0b74ab81f1f75de9ee" | ||
11 | 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 @@ | |||
1 | require sysstat.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb" | ||
4 | |||
5 | SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch" | ||
6 | |||
7 | SRC_URI[md5sum] = "9dfff5fac24e35bd92fb7896debf2ffb" | ||
8 | SRC_URI[sha256sum] = "8edb0e19b514ac560a098a02933a4735b881296d61014db89bf80f05dd7a4732" | ||