diff options
Diffstat (limited to 'meta/recipes-extended/tar')
-rw-r--r-- | meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch | 36 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar_1.26.bb | 1 |
2 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch b/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch deleted file mode 100644 index 6aef096896..0000000000 --- a/meta/recipes-extended/tar/tar-1.26/tar-1.26-fortifysourcessigabrt.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | port fedora patch for fortify sources sigabort. See | ||
2 | https://qa.mandriva.com/show_bug.cgi?id=61419 for details. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | |||
6 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> | ||
7 | Signed-off-by: Fahad Usman <fahad_usman@mentor.com> | ||
8 | |||
9 | --- | ||
10 | src/create.c | 8 ++++---- | ||
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | --- tar-1.26.orig/src/create.c | ||
14 | +++ tar-1.26/src/create.c | ||
15 | @@ -562,8 +562,8 @@ write_gnu_long_link (struct tar_stat_inf | ||
16 | GNAME_TO_CHARS (tmpname, header->header.gname); | ||
17 | free (tmpname); | ||
18 | |||
19 | - strcpy (header->buffer + offsetof (struct posix_header, magic), | ||
20 | - OLDGNU_MAGIC); | ||
21 | + strncpy (header->buffer + offsetof (struct posix_header, magic), | ||
22 | + OLDGNU_MAGIC, sizeof(header->header.magic)); | ||
23 | header->header.typeflag = type; | ||
24 | finish_header (st, header, -1); | ||
25 | |||
26 | @@ -900,8 +900,8 @@ start_header (struct tar_stat_info *st) | ||
27 | case OLDGNU_FORMAT: | ||
28 | case GNU_FORMAT: /*FIXME?*/ | ||
29 | /* Overwrite header->header.magic and header.version in one blow. */ | ||
30 | - strcpy (header->buffer + offsetof (struct posix_header, magic), | ||
31 | - OLDGNU_MAGIC); | ||
32 | + strncpy (header->buffer + offsetof (struct posix_header, magic), | ||
33 | + OLDGNU_MAGIC, sizeof(header->header.magic)); | ||
34 | break; | ||
35 | |||
36 | case POSIX_FORMAT: | ||
diff --git a/meta/recipes-extended/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb index d45c2b14ed..8b774e6821 100644 --- a/meta/recipes-extended/tar/tar_1.26.bb +++ b/meta/recipes-extended/tar/tar_1.26.bb | |||
@@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
6 | PR = "r5" | 6 | PR = "r5" |
7 | 7 | ||
8 | SRC_URI += "file://remove-gets.patch \ | 8 | SRC_URI += "file://remove-gets.patch \ |
9 | file://tar-1.26-fortifysourcessigabrt.patch\ | ||
10 | " | 9 | " |
11 | 10 | ||
12 | SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" | 11 | SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" |