diff options
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r-- | meta/recipes-extended/stat/stat-3.3/fix-error-return.patch | 16 | ||||
-rw-r--r-- | meta/recipes-extended/stat/stat-3.3/fix-security-format.patch | 68 | ||||
-rw-r--r-- | meta/recipes-extended/stat/stat_3.3.bb | 35 |
3 files changed, 0 insertions, 119 deletions
diff --git a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch b/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch deleted file mode 100644 index 032995db8f..0000000000 --- a/meta/recipes-extended/stat/stat-3.3/fix-error-return.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | This patch fixies the wrong return code of stat -h. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | Signed-off-by: Zhangle Yang <zhangle.yang@windriver.com> | ||
5 | |||
6 | --- stat-3.3/stat.c.orig 2013-08-22 10:49:45.000000000 +0800 | ||
7 | +++ stat-3.3/stat.c 2013-08-22 10:50:31.000000000 +0800 | ||
8 | @@ -845,7 +845,7 @@ | ||
9 | fprintf(stderr, "\t\t%%S - Security ID in SE-Linux\n"); | ||
10 | fprintf(stderr, "\t\t%%C - Security context in SE-Linux\n"); | ||
11 | fprintf(stderr, "\t\t%%d - Free file nodes in file system\n"); | ||
12 | - exit(1); | ||
13 | + exit(0); | ||
14 | } | ||
15 | |||
16 | |||
diff --git a/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch b/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch deleted file mode 100644 index 0c01ed0383..0000000000 --- a/meta/recipes-extended/stat/stat-3.3/fix-security-format.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | stat: Fixing security formatting issues | ||
2 | |||
3 | Fix security formatting issues related to printf without NULL argument | ||
4 | |||
5 | stat.c: In function 'print_human_access': | ||
6 | stat.c:292:13: error: format not a string literal and no format arguments [-Werror=format-security] | ||
7 | printf (access); | ||
8 | ^ | ||
9 | stat.c: In function 'print_human_time': | ||
10 | stat.c:299:57: error: format not a string literal and no format arguments [-Werror=format-security] | ||
11 | if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str); | ||
12 | ^ | ||
13 | stat.c: In function 'print_it': | ||
14 | stat.c:613:6: error: format not a string literal and no format arguments [-Werror=format-security] | ||
15 | printf(b); | ||
16 | ^ | ||
17 | stat.c:642:6: error: format not a string literal and no format arguments [-Werror=format-security] | ||
18 | printf(b); | ||
19 | ^ | ||
20 | |||
21 | [YOCTO #9550] | ||
22 | [https://bugzilla.yoctoproject.org/show_bug.cgi?id=9550] | ||
23 | |||
24 | Upstream-Status: Pending | ||
25 | |||
26 | Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com> | ||
27 | |||
28 | diff --git a/stat.c b/stat.c | ||
29 | index 1ed07a9..2be6f62 100644 | ||
30 | --- a/stat.c | ||
31 | +++ b/stat.c | ||
32 | @@ -289,15 +289,15 @@ void print_human_access(struct stat *statbuf) | ||
33 | default: | ||
34 | access[0] = '?'; | ||
35 | } | ||
36 | - printf (access); | ||
37 | + fputs(access,stdout); | ||
38 | } | ||
39 | |||
40 | void print_human_time(time_t *t) | ||
41 | { | ||
42 | char str[40]; | ||
43 | |||
44 | - if (strftime(str, 40, "%c", localtime(t)) > 0) printf(str); | ||
45 | - else printf("Cannot calculate human readable time, sorry"); | ||
46 | + if (strftime(str, 40, "%c", localtime(t)) > 0) fputs(str,stdout); | ||
47 | + else fputs("Cannot calculate human readable time, sorry",stdout); | ||
48 | } | ||
49 | |||
50 | /* print statfs info */ | ||
51 | @@ -610,7 +610,7 @@ void print_it(char *masterformat, char *filename, | ||
52 | { | ||
53 | strcpy (pformat, "%"); | ||
54 | *m++ = '\0'; | ||
55 | - printf(b); | ||
56 | + fputs(b,stdout); | ||
57 | |||
58 | /* copy all format specifiers to our format string */ | ||
59 | while (isdigit(*m) || strchr("#0-+. I", *m)) | ||
60 | @@ -639,7 +639,7 @@ void print_it(char *masterformat, char *filename, | ||
61 | } | ||
62 | else | ||
63 | { | ||
64 | - printf(b); | ||
65 | + fputs(b,stdout); | ||
66 | b = NULL; | ||
67 | } | ||
68 | } | ||
diff --git a/meta/recipes-extended/stat/stat_3.3.bb b/meta/recipes-extended/stat/stat_3.3.bb deleted file mode 100644 index 8ac8e89a22..0000000000 --- a/meta/recipes-extended/stat/stat_3.3.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "Command line file status display utility" | ||
2 | HOMEPAGE = "http://www.ibiblio.org/pub/Linux/utils/file/" | ||
3 | DESCRIPTION = "Displays all information about a file that the stat() call provides and all information about a filesystem that statfs() provides." | ||
4 | SECTION = "console/utils" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=39886b077fd072e876e5c4c16310b631 \ | ||
7 | file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
8 | |||
9 | SRC_URI = "http://www.ibiblio.org/pub/Linux/utils/file/${BP}.tar.gz \ | ||
10 | file://fix-security-format.patch \ | ||
11 | file://fix-error-return.patch" | ||
12 | |||
13 | SRC_URI[md5sum] = "37e247e8e400ad9205f1b0500b728fd3" | ||
14 | SRC_URI[sha256sum] = "7071f0384a423a938dd542c1f08547a02824f6359acd3ef3f944b2c4c2d1ee09" | ||
15 | |||
16 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${base_bindir} ${D}${mandir}/man1 | ||
20 | install -m 755 stat ${D}${base_bindir}/stat.stat | ||
21 | install -m 644 stat.1 ${D}${mandir}/man1 | ||
22 | } | ||
23 | |||
24 | inherit update-alternatives | ||
25 | |||
26 | ALTERNATIVE_${PN} = "stat" | ||
27 | ALTERNATIVE_PRIORITY[stat] = "200" | ||
28 | ALTERNATIVE_LINK_NAME[stat] = "${base_bindir}/stat" | ||
29 | ALTERNATIVE_TARGET[stat] = "${base_bindir}/stat.stat" | ||
30 | |||
31 | ALTERNATIVE_${PN}-doc = "stat.1" | ||
32 | ALTERNATIVE_LINK_NAME[stat.1] = "${mandir}/man1/stat.1" | ||
33 | |||
34 | BBCLASSEXTEND = "native" | ||
35 | |||