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 @@ -port fedora patch for fortify sources sigabort. See -https://qa.mandriva.com/show_bug.cgi?id=61419 for details. - -Upstream-Status: Pending - -Signed-off-by: Christopher Larson -Signed-off-by: Fahad Usman - ---- - src/create.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- tar-1.26.orig/src/create.c -+++ tar-1.26/src/create.c -@@ -562,8 +562,8 @@ write_gnu_long_link (struct tar_stat_inf - GNAME_TO_CHARS (tmpname, header->header.gname); - free (tmpname); - -- strcpy (header->buffer + offsetof (struct posix_header, magic), -- OLDGNU_MAGIC); -+ strncpy (header->buffer + offsetof (struct posix_header, magic), -+ OLDGNU_MAGIC, sizeof(header->header.magic)); - header->header.typeflag = type; - finish_header (st, header, -1); - -@@ -900,8 +900,8 @@ start_header (struct tar_stat_info *st) - case OLDGNU_FORMAT: - case GNU_FORMAT: /*FIXME?*/ - /* Overwrite header->header.magic and header.version in one blow. */ -- strcpy (header->buffer + offsetof (struct posix_header, magic), -- OLDGNU_MAGIC); -+ strncpy (header->buffer + offsetof (struct posix_header, magic), -+ OLDGNU_MAGIC, sizeof(header->header.magic)); - break; - - 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" PR = "r5" SRC_URI += "file://remove-gets.patch \ - file://tar-1.26-fortifysourcessigabrt.patch\ " SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"